Skip to content

Commit

Permalink
Merge pull request #30
Browse files Browse the repository at this point in the history
june updates
  • Loading branch information
N6REJ authored Jun 27, 2024
2 parents 9325acc + 410b2a7 commit 55f4e88
Show file tree
Hide file tree
Showing 74 changed files with 5,345 additions and 94 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@

# ignore "current" directories
/**/current
.codiumai
4 changes: 2 additions & 2 deletions build/build-commons.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ antcontrib.url = https://repo1.maven.org/maven2/ant-contrib/ant-contrib/1.0b3/an
innoextract.url = https://github.com/dscharrer/innoextract/releases/download/1.9/innoextract-1.9-windows.zip
innosetup.url = http://files.jrsoftware.org/is/6/innosetup-6.2.1.exe
hashmyfiles.url = https://www.nirsoft.net/utils/hashmyfiles-x64.zip
composer.url = https://github.com/composer/composer/releases/download/2.4.2/composer.phar
lessmsi.url = https://github.com/activescott/lessmsi/releases/download/v1.10.0/lessmsi-v1.10.0.zip
composer.url = https://github.com/composer/composer/releases/download/2.7.7/composer.phar
lessmsi.url = https://github.com/activescott/lessmsi/releases/download/v2.0.1/lessmsi-v2.0.1.zip

# The build path (was default C:/bearsampp-build)
build.path = ${root.dir}\\bearsampp-build
Expand Down
2 changes: 2 additions & 0 deletions build/build-release.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ release.format = 7z
# Binaries
bin.apache.url = https://raw.githubusercontent.com/bearsampp/module-apache/main/releases.properties
bin.filezilla.url = https://raw.githubusercontent.com/bearsampp/module-filezilla/main/releases.properties
bin.xlight.url = https://raw.githubusercontent.com/bearsampp/module-xlight/main/releases.properties
bin.mailhog.url = https://raw.githubusercontent.com/bearsampp/module-mailhog/main/releases.properties
bin.mailpit.url = https://raw.githubusercontent.com/bearsampp/module-mailpit/main/releases.properties
bin.maria.url = https://raw.githubusercontent.com/bearsampp/module-mariadb/main/releases.properties
bin.memcached.url = https://raw.githubusercontent.com/bearsampp/module-memcached/main/releases.properties
bin.mysql.url = https://raw.githubusercontent.com/bearsampp/module-mysql/main/releases.properties
Expand Down
122 changes: 64 additions & 58 deletions build/build-release.xml
Original file line number Diff line number Diff line change
@@ -1,70 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="dev-release" basedir=".">

<fail unless="project.basedir" message="Property 'project.basedir' must be set before loading build-bundle.xml"/>
<fail unless="dev.path" message="Property 'dev.path' must be set before loading build-bundle.xml"/>
<fail unless="project.basedir" message="Property 'project.basedir' must be set before loading build-bundle.xml"/>
<fail unless="dev.path" message="Property 'dev.path' must be set before loading build-bundle.xml"/>

<property name="build-release.properties" value="${dev.path}\build\build-release.properties"/>
<echo message="Load build-release.properties: ${dev.path}\build\build-release.properties" level="debug"/>
<property file="${build-release.properties}"/>
<property name="build-release.properties" value="${dev.path}\build\build-release.properties"/>
<echo message="Load build-release.properties: ${dev.path}\build\build-release.properties" level="debug"/>
<property file="${build-release.properties}"/>

<!-- Import build-commons.xml -->
<import file="build-commons.xml"/>
<!-- Import build-commons.xml -->
<import file="build-commons.xml"/>

<!-- Properties -->
<property name="build.release.path" value="${build.path}\releases"/>
<!-- Properties -->
<property name="build.release.path" value="${build.path}\releases"/>

<!-- Check bins version -->
<assertproperty property="bin.apache.version"/>
<assertproperty property="bin.filezilla.version"/>
<assertproperty property="bin.mailhog.version"/>
<assertproperty property="bin.maria.version"/>
<assertproperty property="bin.memcached.version"/>
<assertproperty property="bin.mysql.version"/>
<assertproperty property="bin.nodejs.version"/>
<assertproperty property="bin.php.version"/>
<assertproperty property="bin.postgresql.version"/>
<!-- Check bins version -->
<assertproperty property="bin.apache.version"/>
<assertproperty property="bin.filezilla.version"/>
<assertproperty property="bin.xlight.version"/>
<assertproperty property="bin.mailhog.version"/>
<assertproperty property="bin.mailpit.version"/>
<assertproperty property="bin.maria.version"/>
<assertproperty property="bin.memcached.version"/>
<assertproperty property="bin.mysql.version"/>
<assertproperty property="bin.nodejs.version"/>
<assertproperty property="bin.php.version"/>
<assertproperty property="bin.postgresql.version"/>

<!-- Check apps version -->
<assertproperty property="app.adminer.version"/>
<assertproperty property="app.phpmyadmin.version"/>
<assertproperty property="app.phppgadmin.version"/>
<assertproperty property="app.webgrind.version"/>
<!-- Check apps version -->
<assertproperty property="app.adminer.version"/>
<assertproperty property="app.phpmyadmin.version"/>
<assertproperty property="app.phppgadmin.version"/>
<assertproperty property="app.webgrind.version"/>

<!-- Check tools version -->
<assertproperty property="tool.composer.version"/>
<assertproperty property="tool.consolez.version"/>
<assertproperty property="tool.ghostscript.version"/>
<assertproperty property="tool.git.version"/>
<assertproperty property="tool.ngrok.version"/>
<assertproperty property="tool.perl.version"/>
<assertproperty property="tool.python.version"/>
<assertproperty property="tool.ruby.version"/>
<assertproperty property="tool.xdc.version"/>
<assertproperty property="tool.yarn.version"/>
<!-- Check tools version -->
<assertproperty property="tool.composer.version"/>
<assertproperty property="tool.consolez.version"/>
<assertproperty property="tool.ghostscript.version"/>
<assertproperty property="tool.git.version"/>
<assertproperty property="tool.ngrok.version"/>
<assertproperty property="tool.perl.version"/>
<assertproperty property="tool.python.version"/>
<assertproperty property="tool.ruby.version"/>
<assertproperty property="tool.xdc.version"/>
<assertproperty property="tool.yarn.version"/>

<!-- Version -->
<condition property="release.version" value="${env.GITHUB_TAGNAME}">
<and>
<isset property="env.GITHUB_TAGNAME"/>
<not><equals arg1="${env.GITHUB_TAGNAME}" arg2=""/></not>
</and>
</condition>
<condition property="release.version" value="${release.default.version}.${env.GITHUB_RUN_NUMBER}">
<and>
<isset property="env.GITHUB_RUN_NUMBER"/>
<not><equals arg1="${env.GITHUB_RUN_NUMBER}" arg2=""/></not>
</and>
</condition>
<property name="release.version" value="${release.default.version}${release.release.type}"/>
<loadresource property="release.fullversion">
<propertyresource name="release.version"/>
<filterchain>
<tokenfilter>
<filetokenizer/>
<replacestring from="v" to=""/>
</tokenfilter>
</filterchain>
</loadresource>
<!-- Version -->
<condition property="release.version" value="${env.GITHUB_TAGNAME}">
<and>
<isset property="env.GITHUB_TAGNAME"/>
<not>
<equals arg1="${env.GITHUB_TAGNAME}" arg2=""/>
</not>
</and>
</condition>
<condition property="release.version" value="${release.default.version}.${env.GITHUB_RUN_NUMBER}">
<and>
<isset property="env.GITHUB_RUN_NUMBER"/>
<not>
<equals arg1="${env.GITHUB_RUN_NUMBER}" arg2=""/>
</not>
</and>
</condition>
<property name="release.version" value="${release.default.version}${release.release.type}"/>
<loadresource property="release.fullversion">
<propertyresource name="release.version"/>
<filterchain>
<tokenfilter>
<filetokenizer/>
<replacestring from="v" to=""/>
</tokenfilter>
</filterchain>
</loadresource>

</project>
Binary file modified tools/7zip/7za.dll
Binary file not shown.
Binary file modified tools/7zip/7za.exe
Binary file not shown.
Binary file modified tools/7zip/7zxa.dll
Binary file not shown.
34 changes: 0 additions & 34 deletions tools/7zip/License.txt

This file was deleted.

140 changes: 140 additions & 0 deletions tools/php/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
<div align="center">
<a href="https://php.net">
<img
alt="PHP"
src="https://www.php.net/images/logos/new-php-logo.svg"
width="150">
</a>
</div>

# The PHP Interpreter

PHP is a popular general-purpose scripting language that is especially suited to
web development. Fast, flexible and pragmatic, PHP powers everything from your
blog to the most popular websites in the world. PHP is distributed under the
[PHP License v3.01](LICENSE).

[![Push](https://github.com/php/php-src/actions/workflows/push.yml/badge.svg)](https://github.com/php/php-src/actions/workflows/push.yml)
[![Build status](https://travis-ci.com/php/php-src.svg?branch=master)](https://travis-ci.com/github/php/php-src)
[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/php.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:php)

## Documentation

The PHP manual is available at [php.net/docs](https://php.net/docs).

## Installation

### Prebuilt packages and binaries

Prebuilt packages and binaries can be used to get up and running fast with PHP.

For Windows, the PHP binaries can be obtained from
[windows.php.net](https://windows.php.net). After extracting the archive the
`*.exe` files are ready to use.

For other systems, see the [installation chapter](https://php.net/install).

### Building PHP source code

*For Windows, see [Build your own PHP on Windows](https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2).*

For a minimal PHP build from Git, you will need autoconf, bison, and re2c. For
a default build, you will additionally need libxml2 and libsqlite3.

On Ubuntu, you can install these using:

sudo apt install -y pkg-config build-essential autoconf bison re2c \
libxml2-dev libsqlite3-dev

On Fedora, you can install these using:

sudo dnf install re2c bison autoconf make libtool ccache libxml2-devel sqlite-devel

Generate configure:

./buildconf

Configure your build. `--enable-debug` is recommended for development, see
`./configure --help` for a full list of options.

# For development
./configure --enable-debug
# For production
./configure

Build PHP. To speed up the build, specify the maximum number of jobs using `-j`:

make -j4

The number of jobs should usually match the number of available cores, which
can be determined using `nproc`.

## Testing PHP source code

PHP ships with an extensive test suite, the command `make test` is used after
successful compilation of the sources to run this test suite.

It is possible to run tests using multiple cores by setting `-jN` in
`TEST_PHP_ARGS`:

make TEST_PHP_ARGS=-j4 test

Shall run `make test` with a maximum of 4 concurrent jobs: Generally the maximum
number of jobs should not exceed the number of cores available.

The [qa.php.net](https://qa.php.net) site provides more detailed info about
testing and quality assurance.

## Installing PHP built from source

After a successful build (and test), PHP may be installed with:

make install

Depending on your permissions and prefix, `make install` may need super user
permissions.

## PHP extensions

Extensions provide additional functionality on top of PHP. PHP consists of many
essential bundled extensions. Additional extensions can be found in the PHP
Extension Community Library - [PECL](https://pecl.php.net).

## Contributing

The PHP source code is located in the Git repository at
[github.com/php/php-src](https://github.com/php/php-src). Contributions are most
welcome by forking the repository and sending a pull request.

Discussions are done on GitHub, but depending on the topic can also be relayed
to the official PHP developer mailing list [email protected].

New features require an RFC and must be accepted by the developers. See
[Request for comments - RFC](https://wiki.php.net/rfc) and
[Voting on PHP features](https://wiki.php.net/rfc/voting) for more information
on the process.

Bug fixes don't require an RFC. If the bug has a GitHub issue, reference it in
the commit message using `GH-NNNNNN`. Use `#NNNNNN` for tickets in the old
[bugs.php.net](https://bugs.php.net) bug tracker.

Fix GH-7815: php_uname doesn't recognise latest Windows versions
Fix #55371: get_magic_quotes_gpc() throws deprecation warning

See [Git workflow](https://wiki.php.net/vcs/gitworkflow) for details on how pull
requests are merged.

### Guidelines for contributors

See further documents in the repository for more information on how to
contribute:

- [Contributing to PHP](/CONTRIBUTING.md)
- [PHP coding standards](/CODING_STANDARDS.md)
- [Mailing list rules](/docs/mailinglist-rules.md)
- [PHP release process](/docs/release-process.md)

## Credits

For the list of people who've put work into PHP, please see the
[PHP credits page](https://php.net/credits.php).
Binary file added tools/php/deplister.exe
Binary file not shown.
Binary file added tools/php/dev/php8ts.lib
Binary file not shown.
Binary file added tools/php/ext/php_bz2.dll
Binary file not shown.
Binary file added tools/php/ext/php_com_dotnet.dll
Binary file not shown.
Binary file added tools/php/ext/php_dba.dll
Binary file not shown.
Binary file added tools/php/ext/php_dl_test.dll
Binary file not shown.
Binary file added tools/php/ext/php_enchant.dll
Binary file not shown.
Binary file added tools/php/ext/php_exif.dll
Binary file not shown.
Binary file added tools/php/ext/php_ffi.dll
Binary file not shown.
Binary file added tools/php/ext/php_fileinfo.dll
Binary file not shown.
Binary file added tools/php/ext/php_ftp.dll
Binary file not shown.
Binary file added tools/php/ext/php_gd.dll
Binary file not shown.
Binary file added tools/php/ext/php_gettext.dll
Binary file not shown.
Binary file added tools/php/ext/php_gmp.dll
Binary file not shown.
Binary file added tools/php/ext/php_imap.dll
Binary file not shown.
Binary file added tools/php/ext/php_intl.dll
Binary file not shown.
Binary file added tools/php/ext/php_ldap.dll
Binary file not shown.
Binary file added tools/php/ext/php_oci8_19.dll
Binary file not shown.
Binary file added tools/php/ext/php_odbc.dll
Binary file not shown.
Binary file added tools/php/ext/php_opcache.dll
Binary file not shown.
Binary file added tools/php/ext/php_pdo_firebird.dll
Binary file not shown.
Binary file added tools/php/ext/php_pdo_mysql.dll
Binary file not shown.
Binary file added tools/php/ext/php_pdo_oci.dll
Binary file not shown.
Binary file added tools/php/ext/php_pdo_odbc.dll
Binary file not shown.
Binary file added tools/php/ext/php_pdo_pgsql.dll
Binary file not shown.
Binary file added tools/php/ext/php_pdo_sqlite.dll
Binary file not shown.
Binary file added tools/php/ext/php_pgsql.dll
Binary file not shown.
Binary file added tools/php/ext/php_shmop.dll
Binary file not shown.
Binary file added tools/php/ext/php_snmp.dll
Binary file not shown.
Binary file added tools/php/ext/php_soap.dll
Binary file not shown.
Binary file added tools/php/ext/php_sodium.dll
Binary file not shown.
Binary file added tools/php/ext/php_sqlite3.dll
Binary file not shown.
Binary file added tools/php/ext/php_sysvshm.dll
Binary file not shown.
Binary file added tools/php/ext/php_tidy.dll
Binary file not shown.
Binary file added tools/php/ext/php_xsl.dll
Binary file not shown.
Binary file added tools/php/ext/php_zend_test.dll
Binary file not shown.
Binary file added tools/php/ext/php_zip.dll
Binary file not shown.
Binary file added tools/php/extras/ssl/legacy.dll
Binary file not shown.
Loading

0 comments on commit 55f4e88

Please sign in to comment.