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
@@ -33,7 +31,7 @@ All the tools included are either scripts or 32-bit binaries. They are therefore
 
 ## Other tools
 
-- `bison` 3.0.5, `re2c` 1.0.3, `lemon`
+- `bison` 3.2.4, `re2c` 1.1.1, `lemon`
 - `awk`, `gawk`, `sed`, `grep`
 - `diff`, `diff3`, `patch`
 - `md5sum`, `sha1sum`, `sha224sum`, `sha256sum`, `sha384sum`, `sha512sum`
@@ -62,7 +60,7 @@ It is not required to hold the source in the PHP SDK directory. It could be usef
 
 - `git clone https://github.com/Microsoft/php-sdk-binary-tools.git c:\php-sdk`
 - `cd c:\php-sdk`
-- `git checkout php-sdk-2.0.12` or later
+- `git checkout php-sdk-2.1.9` or later
 - invoke `phpsdk-vc15-x64.bat`
 - `phpsdk_buildtree phpmaster`
 - `git clone https://github.com/php/php-src.git && cd php-src`, or fetch a zipball

VERSION

@@ -1 +1 @@
-2.1.9beta1
+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%
 

doc/task.c

@@ -1,72 +1,72 @@
-/**
- * Run the passed command line hidden, suitable for a scheduled task.
- * Author: Anatol Belski <ab@php.net>
- * License: BSD 2-Clause
- */
-
-#include <windows.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#define CMD_PRE "cmd.exe /c "
-#define CMD_PRE_LEN (sizeof(CMD_PRE)-1)
-
-#ifdef DEBUG
-int
-main(int argc, char **argv)
-#else
-int
-APIENTRY WinMain(HINSTANCE inst, HINSTANCE prev_inst, LPTSTR in_cmd, int show)
-#endif
-{
-	STARTUPINFO si;
-	PROCESS_INFORMATION pi;
-	DWORD exit_code;
-
-	char *cmd = NULL;
-	size_t cmd_len = 0, arg_len = 0;
-	char *arg = strchr(GetCommandLine(), ' ');
-
-	if (!arg) {
-		return 3;
-	}
-#ifdef DEBUG
-	printf("passed cmd: '%s'\n", arg);
-#endif
-
-	arg_len = strlen(arg);
-	cmd_len = CMD_PRE_LEN + arg_len + 1;
-
-	cmd = malloc(cmd_len * sizeof(char));
-	memmove(cmd, CMD_PRE, CMD_PRE_LEN);
-	memmove(cmd + CMD_PRE_LEN, arg, arg_len);
-	cmd[cmd_len-1] = '\0';
-#ifdef DEBUG
-	printf("constructed cmd: '%s'\n", cmd);
-#endif
-
-	ZeroMemory( &si, sizeof(si) );
-	si.cb = sizeof(si);
-	si.dwFlags = STARTF_USESHOWWINDOW;
-	si.wShowWindow = SW_HIDE;
-	ZeroMemory( &pi, sizeof(pi) );
-
-	if (CreateProcess(NULL, cmd, NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &si, &pi)) {
-		CloseHandle( pi.hThread );
-	} else {
-		free(cmd);
-		printf( "Error: CreatePracess 0x%08lx \n", GetLastError() );
-		return 3;
-	}
-
-	WaitForSingleObject( pi.hProcess, INFINITE );
-
-	GetExitCodeProcess(pi.hProcess, &exit_code);
-
-	CloseHandle( pi.hProcess );
-
-	free(cmd);
-
-	return exit_code;
-}
-
+/**
+ * Run the passed command line hidden, suitable for a scheduled task.
+ * Author: Anatol Belski <ab@php.net>
+ * License: BSD 2-Clause
+ */
+
+#include <windows.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define CMD_PRE "cmd.exe /c "
+#define CMD_PRE_LEN (sizeof(CMD_PRE)-1)
+
+#ifdef DEBUG
+int
+main(int argc, char **argv)
+#else
+int
+APIENTRY WinMain(HINSTANCE inst, HINSTANCE prev_inst, LPTSTR in_cmd, int show)
+#endif
+{
+	STARTUPINFO si;
+	PROCESS_INFORMATION pi;
+	DWORD exit_code;
+
+	char *cmd = NULL;
+	size_t cmd_len = 0, arg_len = 0;
+	char *arg = strchr(GetCommandLine(), ' ');
+
+	if (!arg) {
+		return 3;
+	}
+#ifdef DEBUG
+	printf("passed cmd: '%s'\n", arg);
+#endif
+
+	arg_len = strlen(arg);
+	cmd_len = CMD_PRE_LEN + arg_len + 1;
+
+	cmd = malloc(cmd_len * sizeof(char));
+	memmove(cmd, CMD_PRE, CMD_PRE_LEN);
+	memmove(cmd + CMD_PRE_LEN, arg, arg_len);
+	cmd[cmd_len-1] = '\0';
+#ifdef DEBUG
+	printf("constructed cmd: '%s'\n", cmd);
+#endif
+
+	ZeroMemory( &si, sizeof(si) );
+	si.cb = sizeof(si);
+	si.dwFlags = STARTF_USESHOWWINDOW;
+	si.wShowWindow = SW_HIDE;
+	ZeroMemory( &pi, sizeof(pi) );
+
+	if (CreateProcess(NULL, cmd, NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &si, &pi)) {
+		CloseHandle( pi.hThread );
+	} else {
+		free(cmd);
+		printf( "Error: CreatePracess 0x%08lx \n", GetLastError() );
+		return 3;
+	}
+
+	WaitForSingleObject( pi.hProcess, INFINITE );
+
+	GetExitCodeProcess(pi.hProcess, &exit_code);
+
+	CloseHandle( pi.hProcess );
+
+	free(cmd);
+
+	return exit_code;
+}
+

lib/php/libsdk/SDK/Build/PGO/Tool/PGO.php

@@ -41,7 +41,7 @@ class PGO
 		$dll = array_merge($dll, glob($this->php->getExtRootDir() . DIRECTORY_SEPARATOR . "php*.dll"));
 
 		/* find out next index */
-		$tpl = glob($this->php->getRootDir() . DIRECTORY_SEPARATOR . "php7{ts,}.dll", GLOB_BRACE)[0];
+		$tpl = glob($this->php->getRootDir() . DIRECTORY_SEPARATOR . "php{7,8,}{ts,}.dll", GLOB_BRACE)[0];
 		if (!$tpl) {
 			throw new Exception("Couldn't find php7[ts].dll in the PHP root dir.");
 		}

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() . "'");
 		}
 

lib/php/libsdk/SDK/Lock.php

@@ -66,6 +66,9 @@ class Lock
 		} else {
 			$this->fd = fopen($this->fn, "wb");
 		}
+		if (false === $this->fd) {
+			throw new Exception("Failed to open lock under '$this->fn'");
+		}
 		$this->locked = flock($this->fd, $flags, $this->wouldBlock);	
 		return $this->locked;
 	}/*}}}*/

msys2/usr/share/aclocal/bison-i18n.m4

@@ -1,7 +1,7 @@
 # bison-i18n.m4 serial 2
 
-dnl Copyright (C) 2005-2006, 2009-2015, 2018 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 2005-2006, 2009-2015, 2018-2019 Free Software
+dnl Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,

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