Prepare 2.2.0beta4

We update all existing packages right away.

README.md

@@ -12,15 +12,13 @@ The PHP SDK 2.0+ is compatible with PHP 7.0 and above. The compatibility with [o
 
 # Requirements
 
-- `Visual C++ 2015` or `Visual C++ 2017` must be installed prior SDK usage (be sure to install both the C++ and the Windows SDK components)
+- A 64-bit build host
+- `Visual C++ 2015` or `Visual C++ 2017` must be installed prior SDK usage (be sure to install the C++ dev, .NET dev and the Windows SDK components)
 - if `Cygwin`, `MingW` or any other cross solution is installed, please read notes in the pitfalls section
-- if a 64-bit build is intended, a 64-bit system is required. Cross compilation of 64-bit on 32-bit system is not supported at the moment
 - The PHP SDK was successfully tested on Windows 7 or later, earlier versions might work but are not recommended
 
 # Tools
 
-All the tools included are either scripts or 32-bit binaries. They are therefore runable on any of x86 or x64 supported Windows system.
-
 ## SDK
 
 - starter scripts, named phpsdk-<crt>-<arch>.bat

VERSION

@@ -1 +1 @@
-2.2.0beta3
+2.2.0beta4

bin/phpsdk_buildtree.bat

@@ -10,11 +10,11 @@ rem otherwise - retain the old behavior, create structs for all the known build
 cmd /c "exit /b 0"
 
 if "%PHP_SDK_ARCH%" NEQ "" (
-	if "%PHP_SDK_VC%" NEQ "" (
-		MD %_%\%PHP_SDK_VC%\%PHP_SDK_ARCH%\deps\bin
-		MD %_%\%PHP_SDK_VC%\%PHP_SDK_ARCH%\deps\lib
-		MD %_%\%PHP_SDK_VC%\%PHP_SDK_ARCH%\deps\include
-		cd %_%\%PHP_SDK_VC%\%PHP_SDK_ARCH%
+	if "%PHP_SDK_VS%" NEQ "" (
+		MD %_%\%PHP_SDK_VS%\%PHP_SDK_ARCH%\deps\bin
+		MD %_%\%PHP_SDK_VS%\%PHP_SDK_ARCH%\deps\lib
+		MD %_%\%PHP_SDK_VS%\%PHP_SDK_ARCH%\deps\include
+		cd %_%\%PHP_SDK_VS%\%PHP_SDK_ARCH%
 		goto exit
 	)
 	goto create_all

bin/phpsdk_deps.php

@@ -126,19 +126,11 @@ try {
 		usage(3);
 	}
 	/* The current CRT needs to match the config one. */
-	$active_crt = getenv("PHP_SDK_VC");
+	$active_crt = getenv("PHP_SDK_VS");
 	if (Config::getCurrentCrtName() != $active_crt && !$force) {
 		throw new Exception("Active CRT '$active_crt' differs from the branch CRT '" . Config::getCurrentCrtName() . "'.");
 	}
 
-	if (NULL === Config::getCurrentStabilityName()) {
-		if ("master" == Config::getCurrentBranchName()) {
-			Config::setCurrentStabilityName("staging");
-		} else {
-			Config::setCurrentStabilityName("stable");
-		}
-	}
-
 	$branch_data = Config::getCurrentBranchData();
 	echo "\nConfiguration: " . Config::getCurrentBranchName() . "-$branch_data[crt]-$branch_data[arch]-$branch_data[stability]\n\n";
 

bin/phpsdk_dumpenv.bat

@@ -24,7 +24,7 @@ if "%PHP_SDK_ARCH%"=="x64" (
 	echo Build architecture: 32-bit 
 )
 
-echo Visual C++:         %PHP_SDK_VC_NUM%
+echo Visual C++:         %PHP_SDK_VC_TOOLSET_VER%
 echo PHP-SDK path:       %PHP_SDK_ROOT_PATH%
 
 

bin/phpsdk_pgo.bat

@@ -1,14 +1,14 @@
-@echo off
-
-if "%PHP_SDK_PHP_CMD%"=="" (
-	call %~dp0phpsdk_setvars.bat
-	if "!PHP_SDK_PHP_CMD!"=="" (
-		echo PHP SDK is not setup
-		exit /b 3
-	)
-)
-
-cmd /c %PHP_SDK_PHP_CMD% %PHP_SDK_BIN_PATH%\phpsdk_pgo.php %*
-
-exit /b %errorlevel%
-
+@echo off
+
+if "%PHP_SDK_PHP_CMD%"=="" (
+	call %~dp0phpsdk_setvars.bat
+	if "!PHP_SDK_PHP_CMD!"=="" (
+		echo PHP SDK is not setup
+		exit /b 3
+	)
+)
+
+cmd /c %PHP_SDK_PHP_CMD% %PHP_SDK_BIN_PATH%\phpsdk_pgo.php %*
+
+exit /b %errorlevel%
+

bin/phpsdk_rebase_msys2.cmd

@@ -2,7 +2,7 @@
 
 setlocal enableextensions enabledelayedexpansion
 
-set PHPSDK_MSYS2_BASE_ADDR=0x70000000
+set PHPSDK_MSYS2_BASE_ADDR=0x100400000
 set PHPSDK_MSYS2_BASE_DYNAMIC=0
 
 :getopt
@@ -33,7 +33,7 @@ GOTO EXIT
 
 :help
 echo phpsdk_rebase_msys2 ^<address^>
-echo Rebase MSYS2 DLLs to the given address. If ommited, default is 0x70000000.
+echo Rebase MSYS2 DLLs to the given address. If ommited, default is 0x100400000.
 
 :EXIT
 exit /b %errorlevel%

bin/phpsdk_setshell.bat

@@ -15,31 +15,33 @@ if "%2"=="" goto :help
 
 cmd /c "exit /b 0"
 
-set PHP_SDK_VC=%1
-if /i not "%PHP_SDK_VC:~0,2%"=="vc" (
+set PHP_SDK_VS=%1
+if /i not "%PHP_SDK_VS:~0,2%"=="vc" (
+	if /i not "%PHP_SDK_VS:~0,2%"=="vs" (
 :malformed_vc_string
-	echo Malformed CRT string "%1"
-	set PHP_SDK_VC=
-	goto out_error
+		echo Malformed CRT string "%1"
+		set PHP_SDK_VS=
+		goto out_error
+	)
 )
-if ""=="%PHP_SDK_VC:~2%" (
+if ""=="%PHP_SDK_VS:~2%" (
 	goto malformed_vc_string
 )
-set /a TMP_CHK=%PHP_SDK_VC:~2%
+set /a TMP_CHK=%PHP_SDK_VS:~2%
 if 14 gtr %TMP_CHK% (
 	if "0"=="%TMP_CHK%" (
-		if not "0"=="%PHP_SDK_VC:~2%" (
+		if not "0"=="%PHP_SDK_VS:~2%" (
 			set TMP_CHK=
 			goto malformed_vc_string
 		)
 	)
 
 	echo At least vc14 is required
-	set PHP_SDK_VC=
+	set PHP_SDK_VS=
 	set TMP_CHK=
 	goto out_error
 )
-set PHP_SDK_VC_NUM=%TMP_CHK%
+set PHP_SDK_VS_NUM=%TMP_CHK%
 set TMP_CHK=
 
 if /i not "%2"=="x64" (
@@ -66,28 +68,37 @@ if not errorlevel 1 (
 set TMPKEY=
 
 rem get vc base dir
-if 15 gtr %PHP_SDK_VC_NUM% (
+if 15 gtr %PHP_SDK_VS_NUM% (
 	if /i "%PHP_SDK_OS_ARCH%"=="x64" (
-		set TMPKEY=HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\%PHP_SDK_VC:~2%.0\Setup\VC
+		set TMPKEY=HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\%PHP_SDK_VS:~2%.0\Setup\VC
 	) else (
-		set TMPKEY=HKLM\SOFTWARE\Microsoft\VisualStudio\%PHP_SDK_VC:~2%.0\Setup\VC
+		set TMPKEY=HKLM\SOFTWARE\Microsoft\VisualStudio\%PHP_SDK_VS:~2%.0\Setup\VC
 	)
 	reg query !TMPKEY! /v ProductDir >nul 2>&1
 	if errorlevel 1 (
-		echo Couldn't determine VC%PHP_SDK_VC:~2% directory
+		echo Couldn't determine VC%PHP_SDK_VS:~2% directory
 		goto out_error;
 	)
 	for /f "tokens=2*" %%a in ('reg query !TMPKEY! /v ProductDir') do set PHP_SDK_VC_DIR=%%b
 ) else (
-	rem vc15 support only for now, could parse out and pass on later
-	for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version %PHP_SDK_VC_NUM% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC
+	rem build the version range, e.g. "[15,16)"
+	set /a PHP_SDK_VS_RANGE=PHP_SDK_VS_NUM + 1
+	set PHP_SDK_VS_RANGE="[%PHP_SDK_VS_NUM%,!PHP_SDK_VS_RANGE%!)"
+
+	for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version !PHP_SDK_VS_RANGE! -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do (
+		set PHP_SDK_VC_DIR=%%b\VC
+	)
 	if not exist "!PHP_SDK_VC_DIR!" (
-		for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version %PHP_SDK_VC_NUM% -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC
+		for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version !PHP_SDK_VS_RANGE! -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do (
+			set PHP_SDK_VC_DIR=%%b\VC
+		)
 		if not exist "!PHP_SDK_VC_DIR!" (
 			rem check for a preview release
-			for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version %PHP_SDK_VC_NUM% -prerelease -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC
+			for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version !PHP_SDK_VS_RANGE! -prerelease -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do (
+				set PHP_SDK_VC_DIR=%%b\VC
+			)
 			if not exist "!PHP_SDK_VC_DIR!" (
-				echo Could not determine '%PHP_SDK_VC%' directory
+				echo Could not determine '%PHP_SDK_VS%' directory
 				goto out_error;
 			)
 		)
@@ -95,8 +106,9 @@ if 15 gtr %PHP_SDK_VC_NUM% (
 	set VSCMD_ARG_no_logo=nologo
 )
 set TMPKEY=
+set PHP_SDK_VS_RANGE=
 
-if 15 gtr %PHP_SDK_VC_NUM% (
+if 15 gtr %PHP_SDK_VS_NUM% (
 	rem get sdk dir
 	rem if 10.0 is available, it's ok
 	if /i "%PHP_SDK_OS_ARCH%"=="x64" (
@@ -131,20 +143,20 @@ if 15 gtr %PHP_SDK_VC_NUM% (
 )
 
 if /i "%PHP_SDK_ARCH%"=="x64" (
-	if 15 gtr %PHP_SDK_VC_NUM% (
-		set PHP_SDK_VC_SHELL_CMD="!PHP_SDK_VC_DIR!\vcvarsall.bat" amd64
+	if 15 gtr %PHP_SDK_VS_NUM% (
+		set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\vcvarsall.bat" amd64
 	) else (
-		set PHP_SDK_VC_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" amd64
+		set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" amd64
 	)
 ) else (
-	if 15 gtr %PHP_SDK_VC_NUM% (
-		set PHP_SDK_VC_SHELL_CMD="!PHP_SDK_VC_DIR!\vcvarsall.bat" x86
+	if 15 gtr %PHP_SDK_VS_NUM% (
+		set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\vcvarsall.bat" x86
 	) else (
-		set PHP_SDK_VC_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" x86
+		set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" x86
 	)
 )
 
-rem echo Visual Studio path %PHP_SDK_VC_DIR%
+rem echo Visual Studio VC path %PHP_SDK_VC_DIR%
 rem echo Windows SDK path %PHP_SDK_WIN_SDK_DIR%
 
 

bin/phpsdk_setvars.bat

@@ -17,5 +17,12 @@ set PHP_SDK_PHP_CMD=%PHP_SDK_BIN_PATH%\php\do_php.bat
 
 set PATH=%PHP_SDK_BIN_PATH%;%PHP_SDK_MSYS2_PATH%;%PATH%
 
+for /f "tokens=1* delims=: " %%a in ('link /?') do ( 
+	set PHP_SDK_VC_TOOLSET_VER=%%b
+	goto break0
+)
+:break0
+set PHP_SDK_VC_TOOLSET_VER=%PHP_SDK_VC_TOOLSET_VER:~-13%
+
 exit /b %errorlevel%
 

lib/php/libsdk/SDK/Config.php

@@ -138,7 +138,8 @@ class Config
 			$tmp = $fetcher->getByUri(self::$depsBaseUri . "/series/");
 			if (false !== $tmp) {
 				$data = array();
-				if (preg_match_all(",/packages-(.+)-(vc\d+)-(x86|x64)-(stable|staging)\.txt,U", $tmp, $m, PREG_SET_ORDER)) {
+				if (preg_match_all(",/packages-(.+)-(vc\d+)-(x86|x64)-(stable|staging)\.txt,U", $tmp, $m, PREG_SET_ORDER)
+					|| preg_match_all(",/packages-(.+)-(vs\d+)-(x86|x64)-(stable|staging)\.txt,U", $tmp, $m, PREG_SET_ORDER)) {
 					foreach ($m as $b) {
 						if (!isset($data[$b[1]])) {
 							$data[$b[1]] = array();
@@ -293,10 +294,13 @@ class Config
 			}
 		}
 
-		if (!@$ret["stability"]) {
+		if (!isset($ret["arch"]) || !$ret["arch"]) {
+			throw new Exception("Failed to find config with arch '" . self::getCurrentArchName() . "'");
+		}
+		if (!isset($ret["stability"]) || !$ret["stability"]) {
 			throw new Exception("Failed to find config with stability '" . self::getCurrentStabilityName() . "'");
 		}
-		if (!@$ret["crt"]) {
+		if (!isset($ret["crt"]) || !$ret["crt"]) {
 			throw new Exception("Failed to find config with arch '" . self::getCurrentArchName() . "'");
 		}
 

msys2/usr/share/awk/bits2str.awk

@@ -1,4 +1,4 @@
-# bits2str --- turn a byte into readable ones and zeros
+# bits2str --- turn an integer into readable ones and zeros
 
 function bits2str(bits,        data, mask)
 {

msys2/usr/share/awk/group.awk

@@ -38,7 +38,7 @@ function _gr_init(    oldfs, oldrs, olddol0, grcat,
         n = split($4, a, "[ \t]*,[ \t]*")
         for (i = 1; i <= n; i++)
             if (a[i] in _gr_groupsbyuser)
-                _gr_groupsbyuser[a[i]] = gr_groupsbyuser[a[i]] " " $1
+                _gr_groupsbyuser[a[i]] = _gr_groupsbyuser[a[i]] " " $1
             else
                 _gr_groupsbyuser[a[i]] = $1
 

msys2/usr/share/awk/inplace.awk

@@ -1,4 +1,26 @@
 # inplace --- load and invoke the inplace extension.
+# 
+# Copyright (C) 2013, 2017 the Free Software Foundation, Inc.
+# 
+# This file is part of GAWK, the GNU implementation of the
+# AWK Programming Language.
+# 
+# GAWK is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# GAWK is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+#
+# Andrew J. Schorr, aschorr@telemetry-investments.com
+# January 2013
 
 @load "inplace"
 
@@ -15,7 +37,7 @@
 # actions in an ENDFILE rule will be redirected as expected.
 
 BEGIN {
-    inplace = 1		# enabled by default
+    inplace = 1         # enabled by default
 }
 
 BEGINFILE {

pgo/cases/pgo01org/TrainingCaseHandler.php

@@ -90,6 +90,13 @@ class TrainingCaseHandler extends Abstracts\TrainingCase implements Interfaces\T
 		$constants = preg_replace(",define\('DB_HOST'.+,", "define('DB_HOST', '$db_host:$db_port');", $constants);
 		file_put_contents($fl, $constants);
 
+		// work around <https://github.com/Microsoft/php-sdk-binary-tools/issues/51>
+		$fl = $htdocs . DIRECTORY_SEPARATOR . "class.php";
+		$class = file_get_contents($fl);
+		$class = preg_replace(",function Student,", "function __construct", $class);
+		$class = preg_replace(",function Faculty,", "function __construct", $class);
+		file_put_contents($fl, $class);
+
 		//$php->exec($cmd, NULL, $env);
 		/* TODO check status or switch to cli. */
 		$out = file_get_contents("http://$http_host:$http_port/init.php");

pgo/tpl/php/php-8.0-pgo-nts-cache.ini

@@ -987,6 +987,7 @@ zend_extension=php_opcache.dll
 opcache.memory_consumption=PHP_SDK_PGO_PHP_OPCACHE_MEMORY_CONSUMPTION
 opcache.interned_strings_buffer=PHP_SDK_PGO_PHP_OPCACHE_INTERNED_STRINGS_BUFFER
 opcache.max_accelerated_files=PHP_SDK_PGO_PHP_OPCACHE_MAX_ACCELERATED_FILES
+opcache.jit_buffer_size=PHP_SDK_PGO_PHP_OPCACHE_JIT_BUFFER_SIZE
 opcache.revalidate_freq=60
 opcache.fast_shutdown=1
 opcache.enable=1

pgo/tpl/php/php-8.0-pgo-ts-cache.ini

@@ -987,6 +987,7 @@ zend_extension=php_opcache.dll
 opcache.memory_consumption=PHP_SDK_PGO_PHP_OPCACHE_MEMORY_CONSUMPTION
 opcache.interned_strings_buffer=PHP_SDK_PGO_PHP_OPCACHE_INTERNED_STRINGS_BUFFER
 opcache.max_accelerated_files=PHP_SDK_PGO_PHP_OPCACHE_MAX_ACCELERATED_FILES
+opcache.jit_buffer_size=PHP_SDK_PGO_PHP_OPCACHE_JIT_BUFFER_SIZE
 opcache.revalidate_freq=60
 opcache.fast_shutdown=1
 opcache.enable=1

pgo/tpl/php/phpsdk_pgo.json

@@ -17,12 +17,14 @@
 				"x64": {
 					"opcache.memory_consumption": 256,
 					"opcache.interned_strings_buffer": 16,
-					"opcache.max_accelerated_files": 8000
+					"opcache.max_accelerated_files": 8000,
+					"opcache.jit_buffer_size": "32M"
 				},
 				"x86": {
 					"opcache.memory_consumption": 64,
 					"opcache.interned_strings_buffer": 8,
-					"opcache.max_accelerated_files": 4000
+					"opcache.max_accelerated_files": 4000,
+					"opcache.jit_buffer_size": "16M"
 				}
 			}
 		}

phpsdk-starter.bat

@@ -52,9 +52,9 @@ if "%TASK%" neq "" (
 		set TASK_ARGS=%TASK_ARGS:"=%
 
 		if exist "%PHP_SDK_ROOT_PATH%\phpsdk-local.bat" (
-			cmd /c "!PHP_SDK_VC_SHELL_CMD! && %PHP_SDK_ROOT_PATH%\bin\phpsdk_setvars.bat && %PHP_SDK_ROOT_PATH%\phpsdk-local.bat && %TASK% !TASK_ARGS!"
+			cmd /c "!PHP_SDK_VS_SHELL_CMD! && %PHP_SDK_ROOT_PATH%\bin\phpsdk_setvars.bat && %PHP_SDK_ROOT_PATH%\phpsdk-local.bat && %TASK% !TASK_ARGS!"
 		) else (
-			cmd /c "!PHP_SDK_VC_SHELL_CMD! && %PHP_SDK_ROOT_PATH%\bin\phpsdk_setvars.bat && %TASK% !TASK_ARGS!"
+			cmd /c "!PHP_SDK_VS_SHELL_CMD! && %PHP_SDK_ROOT_PATH%\bin\phpsdk_setvars.bat && %TASK% !TASK_ARGS!"
 		)
 		set TASK=
 		exit /b !ERRORLEVEL!
@@ -66,9 +66,9 @@ if "%TASK%" neq "" (
 )
 
 if exist "%PHP_SDK_ROOT_PATH%\phpsdk-local.bat" (
-	cmd /k "!PHP_SDK_VC_SHELL_CMD! && set __VSCMD_ARG_NO_LOGO=&& set VSCMD_START_DIR=&& %PHP_SDK_ROOT_PATH%\bin\phpsdk_setvars.bat && %PHP_SDK_ROOT_PATH%\bin\phpsdk_dumpenv.bat && %PHP_SDK_ROOT_PATH%\phpsdk-local.bat && echo. && set prompt=$P$_$+$$$S"
+	cmd /k "!PHP_SDK_VS_SHELL_CMD! && set __VSCMD_ARG_NO_LOGO=&& set VSCMD_START_DIR=&& %PHP_SDK_ROOT_PATH%\bin\phpsdk_setvars.bat && %PHP_SDK_ROOT_PATH%\bin\phpsdk_dumpenv.bat && %PHP_SDK_ROOT_PATH%\phpsdk-local.bat && echo. && set prompt=$P$_$+$$$S"
 ) else (
-	cmd /k "!PHP_SDK_VC_SHELL_CMD! && set __VSCMD_ARG_NO_LOGO=&& set VSCMD_START_DIR=&& %PHP_SDK_ROOT_PATH%\bin\phpsdk_setvars.bat && %PHP_SDK_ROOT_PATH%\bin\phpsdk_dumpenv.bat && set prompt=$P$_$+$$$S"
+	cmd /k "!PHP_SDK_VS_SHELL_CMD! && set __VSCMD_ARG_NO_LOGO=&& set VSCMD_START_DIR=&& %PHP_SDK_ROOT_PATH%\bin\phpsdk_setvars.bat && %PHP_SDK_ROOT_PATH%\bin\phpsdk_dumpenv.bat && set prompt=$P$_$+$$$S"
 )
 
 exit /b !ERRORLEVEL!

phpsdk-vs16-x64.bat

@@ -0,0 +1,6 @@
+@echo off
+
+call %~dp0phpsdk-starter.bat -c vs16 -a x64 %*
+
+exit /b %ERRORLEVEL%
+

phpsdk-vs16-x86.bat

@@ -0,0 +1,6 @@
+@echo off
+
+call %~dp0phpsdk-starter.bat -c vs16 -a x86 %*
+
+exit /b %ERRORLEVEL%
+