Skip to content

Commit

Permalink
Merge branch 'php/8.0' into php/8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
dktapps committed Mar 13, 2023
2 parents aaf285b + a3d38e6 commit 3cbae63
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 15 deletions.
18 changes: 9 additions & 9 deletions compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@

ZLIB_VERSION="1.2.13"
GMP_VERSION="6.2.1"
CURL_VERSION="curl-7_88_0"
CURL_VERSION="curl-7_88_1"
YAML_VERSION="0.2.5"
LEVELDB_VERSION="1c7564468b41610da4f498430e795ca4de0931ff"
LIBXML_VERSION="2.10.1" #2.10.2 requires automake 1.16.3, which isn't easily available on Ubuntu 20.04
LIBPNG_VERSION="1.6.39"
LIBJPEG_VERSION="9e"
OPENSSL_VERSION="1.1.1t"
LIBZIP_VERSION="1.9.2"
SQLITE3_YEAR="2022"
SQLITE3_VERSION="3400100" #3.40.0
SQLITE3_YEAR="2023"
SQLITE3_VERSION="3410100" #3.41.1
LIBDEFLATE_VERSION="0d1779a071bcc636e5156ddb7538434da7acad22" #1.14

EXT_PTHREADS_VERSION_PM4="4.2.1"
EXT_PTHREADS_VERSION_PM5="5.2.4"
EXT_PTHREADS_VERSION_PM5="5.3.0"
EXT_PTHREADS_VERSION="$EXT_PTHREADS_VERSION_PM4"
EXT_YAML_VERSION="2.2.2"
EXT_YAML_VERSION="2.2.3"
EXT_LEVELDB_VERSION="317fdcd8415e1566fc2835ce2bdb8e19b890f9f3"
EXT_CHUNKUTILS2_VERSION="0.3.3"
EXT_XDEBUG_VERSION="3.2.0"
EXT_IGBINARY_VERSION="3.2.13"
EXT_CHUNKUTILS2_VERSION="0.3.5"
EXT_XDEBUG_VERSION="fbd5d9cb9e18502992e017925a34b7232755f34f" #fork of xdebug used to work around https://github.com/xdebug/xdebug/pull/878
EXT_IGBINARY_VERSION="3.2.14"
EXT_CRYPTO_VERSION="0.3.2"
EXT_RECURSIONGUARD_VERSION="0.1.0"
EXT_LIBDEFLATE_VERSION="0.1.0"
Expand Down Expand Up @@ -1258,7 +1258,7 @@ fi
echo " done!"

if [[ "$HAVE_XDEBUG" == "yes" ]]; then
get_pecl_extension "xdebug" "$EXT_XDEBUG_VERSION"
get_github_extension "xdebug" "$EXT_XDEBUG_VERSION" "dktapps" "xdebug"
echo -n "[xdebug] checking..."
cd "$BUILD_DIR/php/ext/xdebug"
"$INSTALL_DIR/bin/phpize" >> "$DIR/install.log" 2>&1
Expand Down
13 changes: 7 additions & 6 deletions windows-compile-vs.bat
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,19 @@ set LEVELDB_MCPE_VER=1c7564468b41610da4f498430e795ca4de0931ff
set LIBDEFLATE_VER=0d1779a071bcc636e5156ddb7538434da7acad22

set PHP_PTHREADS_VER_PM4=4.2.1
set PHP_PTHREADS_VER_PM5=5.2.4
set PHP_PTHREADS_VER_PM5=5.3.0
set PHP_PTHREADS_VER=
set PHP_YAML_VER=2.2.2
set PHP_CHUNKUTILS2_VER=0.3.3
set PHP_IGBINARY_VER=3.2.13
set PHP_YAML_VER=2.2.3
set PHP_CHUNKUTILS2_VER=0.3.5
set PHP_IGBINARY_VER=3.2.14
set PHP_LEVELDB_VER=317fdcd8415e1566fc2835ce2bdb8e19b890f9f3
set PHP_CRYPTO_VER=0.3.2
set PHP_RECURSIONGUARD_VER=0.1.0
set PHP_MORTON_VER=0.1.2
set PHP_LIBDEFLATE_VER=0.1.0
set PHP_XXHASH_VER=0.1.1
set PHP_XDEBUG_VER=3.2.0
REM fork of xdebug to work around https://github.com/xdebug/xdebug/pull/878
set PHP_XDEBUG_VER=fbd5d9cb9e18502992e017925a34b7232755f34f

set script_path=%~dp0
set log_file=%script_path%compile.log
Expand Down Expand Up @@ -216,7 +217,7 @@ call :get-extension-zip-from-github "recursionguard" "%PHP_RECURSIONGUARD
call :get-extension-zip-from-github "morton" "%PHP_MORTON_VER%" "pmmp" "ext-morton" || exit 1
call :get-extension-zip-from-github "libdeflate" "%PHP_LIBDEFLATE_VER%" "pmmp" "ext-libdeflate" || exit 1
call :get-extension-zip-from-github "xxhash" "%PHP_XXHASH_VER%" "pmmp" "ext-xxhash" || exit 1
call :get-extension-zip-from-github "xdebug" "%PHP_XDEBUG_VER%" "xdebug" "xdebug" || exit 1
call :get-extension-zip-from-github "xdebug" "%PHP_XDEBUG_VER%" "dktapps" "xdebug" || exit 1

call :pm-echo " - crypto: downloading %PHP_CRYPTO_VER%..."
git clone https://github.com/bukka/php-crypto.git crypto >>"%log_file%" 2>&1 || exit 1
Expand Down

0 comments on commit 3cbae63

Please sign in to comment.