prepare 2.0.4

This reverts commit 010ae42362.

.gitignore

@@ -18,3 +18,5 @@ oracle
 # either these two become submodules, or uncomment them
 #pgo-build
 #rmtools*
+pgo
+phpsdk-local.bat

README.md

@@ -15,10 +15,11 @@ The PHP SDK 2.0 is compatible with PHP 7.0 and above. The compatibility with [ol
 - `Visual C++ 2015` or `Visual C++ 2017` must be installed prior SDK usage
 - if `Cygwin` 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 Windows system.
+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
 
@@ -59,14 +60,14 @@ It is not required to hold the source in the PHP SDK directory. It could be usef
 
 - `git clone https://github.com/OSTC/php-sdk-binary-tools.git c:\php-sdk`
 - `cd c:\php-sdk`
-- `git checkout new_binary_tools`
-- invoke `phpsdk-vc14-x64.bat`
+- `git checkout php-sdk-2.0.0` 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
 - `phpsdk_deps --update --branch master`
 - do the build, eg. `buildconf && configure --enable-cli && nmake`
 
-TODO more extensive documentation on the wiki.
+More extensive documentation can be found on the [wiki](https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2 "PHP wiki page").
 
 ## The old way
 
@@ -77,7 +78,7 @@ TODO more extensive documentation on the wiki.
 
 ## Custom environment setup
 
-A sript called phpsdk-local.bat has to be put into the PHP SDK root. If present, it will be automatically picked up by the starter script. A template for such a script is included with the PHP SDK. This allows to automatically meet any required preparations, that are not foreseen by the standard PHP SDK startup. Be careful while creating your own phpsdk-local. It's your responsibility to ensure the regular PHP SDK startup isn't broken after phpsdk-local was injected into the startup sequence.
+A sript called phpsdk-local.bat has to be put into the PHP SDK root. If present, it will be automatically picked up by the starter script. A template for such a script is included with the PHP SDK. This allows to automatically meet any required preparations, that are not foreseen by the standard PHP SDK startup. Be careful while creating your own phpsdk-local. It's your responsibility to ensure the regular PHP SDK startup isn't broken after phpsdk-local.bat was injected into the startup sequence.
 
 ## Console emulator integration
 
@@ -92,10 +93,12 @@ An elementary functionality to run unattended builds is included. See an example
 # Upgrading
 
 - backup phpsdk-local.bat
-- backup the source trees and any other custom files in the PHP SDK root
+- backup the source trees and any other custom files in the PHP SDK root, if any present
 - move the PHP SDK folder into trash
 - download, unpack and the new PHP SDK version under the same path
-- move the custom files back into their respective places
+- move the custom files back in their respective places
+
+If the PHP SDK is kept as a git checkout, merely what is needed instead is to git fetch and to checkout an updated git tag.
 
 # Extending
 
@@ -107,4 +110,6 @@ The SDK tools are based on the KISS principle and should be kept so. Basic tools
 - SDK or PHP sources put into too long paths, will cause an issue.
 - If Cygwin is installed, it might cause issues. If it's unavoidable, to have Cygwin on the same machine, ensure SDK preceeds it on the PATH.
 - Tools, based on MSYS2, only accept paths with forward slashes.
+- Both Visual C++ toolset and the Windows SDK components have to be installed for the PHP SDK to work properly. 
+- The VC++ toolset is still requried, even if another compiler, fe. clang, is intended to be used.
 

VERSION

@@ -1 +1 @@
-2.0.1
+2.0.4

bin/php/do_php.bat

@@ -1,3 +1,3 @@
 @echo ofF
 
-%~dp0php.exe -c %~dp0php.ini -d extension_dir=%~dp0ext %*
+%~dp0php.exe -c %~dp0php.ini -d curl.cainfo=%PHP_SDK_ROOT_PATH%\msys2\usr\ssl\cert.pem -d extension_dir=%~dp0ext %*

bin/php/php.ini

@@ -4,6 +4,7 @@ extension=php_ftp.dll
 extension=php_sqlite3.dll
 extension=php_openssl.dll
 extension=php_mbstring.dll
+extension=php_mysqli.dll
 memory_limit=1G
 
 error_reporting=-1

bin/phpsdk_deps.php

@@ -169,6 +169,11 @@ try {
 			Config::setCurrentCrtName(array_keys($branch)[0]);
 		}
 	}
+	/* The current CRT needs to match the config one. */
+	$active_crt = getenv("PHP_SDK_VC");
+	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()) {
@@ -182,7 +187,7 @@ try {
 	echo "\nConfiguration: " . Config::getCurrentBranchName() . "-$branch_data[crt]-$branch_data[arch]-$branch_data[stability]\n\n";
 
 	/* Let the dep manager to run the command. */
-	$dm = new SDK\Dependency\Manager(Config::getDepsLocalPath(), $branch_data["stability"], $branch_data["arch"]);
+	$dm = new SDK\Build\Dependency\Manager(Config::getDepsLocalPath(), $branch_data["stability"], $branch_data["arch"]);
 	switch ($cmd) {
 		default:
 			throw new Exception("Unknown command '$cmd'");

bin/phpsdk_dumpenv.bat

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

bin/phpsdk_setshell.bat

@@ -13,12 +13,32 @@ if "%1"=="-h" goto :help
 if "%1"=="--help" goto :help
 if "%2"=="" goto :help
 
-if /i not "%1"=="vc14" (
-	if /i not "%1"=="vc15" (
-		echo Unsupported runtime "%1"
-		goto out_error
-	)
+set PHP_SDK_VC=%1
+if /i not "%PHP_SDK_VC:~0,2%"=="vc" (
+:malformed_vc_string
+	echo Malformed CRT string "%1"
+	set PHP_SDK_VC=
+	goto out_error
 )
+if ""=="%PHP_SDK_VC:~2%" (
+	goto malformed_vc_string
+)
+set /a TMP_CHK=%PHP_SDK_VC:~2%
+if 14 gtr %TMP_CHK% (
+	if "0"=="%TMP_CHK%" (
+		if not "0"=="%PHP_SDK_VC:~2%" (
+			set TMP_CHK=
+			goto malformed_vc_string
+		)
+	)
+
+	echo At least vc14 is required
+	set PHP_SDK_VC=
+	set TMP_CHK=
+	goto out_error
+)
+set PHP_SDK_VC_NUM=%TMP_CHK%
+set TMP_CHK=
 
 if /i not "%2"=="x64" (
 	if /i not "%2"=="x86" (
@@ -27,7 +47,6 @@ if /i not "%2"=="x64" (
 	)
 )
 
-set PHP_SDK_VC=%1
 set PHP_SDK_ARCH=%2
 
 rem check OS arch
@@ -45,7 +64,7 @@ if not errorlevel 1 (
 set TMPKEY=
 
 rem get vc base dir
-if /i "%1"=="vc14" (
+if 15 gtr %PHP_SDK_VC_NUM% (
 	if /i "%PHP_SDK_OS_ARCH%"=="x64" (
 		set TMPKEY=HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\%PHP_SDK_VC:~2%.0\Setup\VC
 	) else (
@@ -59,12 +78,19 @@ if /i "%1"=="vc14" (
 	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 15 -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_VC_NUM% -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
+            if not exist "!PHP_SDK_VC_DIR!" (
+		echo Could not determine '%PHP_SDK_VC%' directory
+		goto out_error;
+            )
+	)
 	set VSCMD_ARG_no_logo=nologo
 )
 set TMPKEY=
 
-if /i "%PHP_SDK_VC%"=="vc14" (
+if 15 gtr %PHP_SDK_VC_NUM% (
 	rem get sdk dir
 	if /i "%PHP_SDK_OS_ARCH%"=="x64" (
 		set TMPKEY=HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v8.1
@@ -84,13 +110,13 @@ if /i "%PHP_SDK_VC%"=="vc14" (
 )
 
 if /i "%PHP_SDK_ARCH%"=="x64" (
-	if /i "%1"=="vc14" (
+	if 15 gtr %PHP_SDK_VC_NUM% (
 		set PHP_SDK_VC_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
 	)
 ) else (
-	if /i "%1"=="vc14" (
+	if 15 gtr %PHP_SDK_VC_NUM% (
 		set PHP_SDK_VC_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

doc/phpsdk-local.bat.example

@@ -1,5 +1,9 @@
 @echo off
 
+rem edit if PGO scripts are present and are to be used
+rem set PHP_SDK_PGO_TOOLS_ROOT_PATH=%PHP_SDK_ROOT_PATH%\pgo
+rem set PATH=%PHP_SDK_PGO_TOOLS_ROOT_PATH%\bin;%PATH%
+
 set PGSQL_TEST_CONNSTR=host=127.0.0.1 dbname=test port=5432 user=test password=test
 set PDO_PGSQL_TEST_DSN=pgsql:host=127.0.0.1 port=5432 dbname=test user=test password=test
 

lib/php/libsdk/SDK/Build/Dependency/Fetcher.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SDK\Dependency;
+namespace SDK\Build\Dependency;
 
 use SDK\Config;
 use SDK\Exception;

lib/php/libsdk/SDK/Build/Dependency/Manager.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SDK\Dependency;
+namespace SDK\Build\Dependency;
 
 use SDK\Config;
 use SDK\Cache;
@@ -116,7 +116,9 @@ class Manager
 		/* save new series file, move the updated deps and backup the old ones, cleanup.*/
 		$msg .= "Updates performed successfully. " . PHP_EOL;
 		if ($backup) {
-			$msg .= "Old dependencies backed up into '$new_path'.";
+			if (isset($new_path)) {
+				$msg .= "Old dependencies backed up into '$new_path'.";
+			}
 		} else {
 			$msg .= "No backup was created.";
 		}

lib/php/libsdk/SDK/Build/Dependency/Package.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SDK\Dependency;
+namespace SDK\Build\Dependency;
 
 use SDK\Config;
 use SDK\Exception;

lib/php/libsdk/SDK/Build/Dependency/Series.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SDK\Dependency;
+namespace SDK\Build\Dependency;
 
 use SDK\Config;
 use SDK\Cache;

lib/php/libsdk/SDK/Config.php

@@ -2,7 +2,7 @@
 
 namespace SDK;
 
-use SDK\Dependency\Fetcher;
+use SDK\Build\Dependency\Fetcher;
 use SDK\Cache;
 use SDK\Exception;
 

phpsdk-starter.bat

@@ -2,7 +2,9 @@
 
 setlocal enableextensions enabledelayedexpansion
 
-set IMHERE=%~dp0
+rem this will be eventually overridden by phpsdk_setvars, but nothing wrong to use the same name here
+set PHP_SDK_ROOT_PATH=%~dp0
+set PHP_SDK_ROOT_PATH=%PHP_SDK_ROOT_PATH:~0,-1%
 
 :getopt
 if /i "%1" equ "-h" goto help
@@ -18,7 +20,7 @@ if "%ARCH%" equ "" goto help
 goto skip_help
 
 :help
-	echo Usage: phpsdk-starter -c ^<crt^> -a ^<arch^> [-t ^<task_script.bat^>]
+	echo Usage: phpsdk-starter -c ^<crt^> -a ^<arch^> [-t ^<task_script.bat^> [task script args]]
 	exit /b 0
 
 :skip_help
@@ -28,9 +30,14 @@ set ARCH=%ARCH: =%
 
 set PHP_SDK_RUN_FROM_ROOT=1
 
+
 title PHP SDK
 
-call %IMHERE%bin\phpsdk_setshell.bat %CRT% %ARCH%
+call %PHP_SDK_ROOT_PATH%\bin\phpsdk_setshell.bat %CRT% %ARCH%
+
+set PHP_SDK_RUN_FROM_ROOT=
+set CRT=
+set ARCH=
 
 if errorlevel 3 (
 	exit /b %errorlevel%
@@ -40,25 +47,25 @@ if "%TASK%" neq "" (
 	if exist "%TASK%" (
 		set TASK_ARGS=%TASK_ARGS:"=%
 
-		if exist "%IMHERE%phpsdk-local.bat" (
-			cmd /c "!PHP_SDK_VC_SHELL_CMD! && %IMHERE%\bin\phpsdk_setvars.bat && %IMHERE%\phpsdk-local.bat && %TASK% !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!"
 		) else (
-			cmd /c "!PHP_SDK_VC_SHELL_CMD! && %IMHERE%\bin\phpsdk_setvars.bat && %TASK% !TASK_ARGS!"
+			cmd /c "!PHP_SDK_VC_SHELL_CMD! && %PHP_SDK_ROOT_PATH%\bin\phpsdk_setvars.bat && %TASK% !TASK_ARGS!"
 		)
+		set TASK=
 		exit /b
 	) else (
 		echo could not find the task file
+		set TASK=
 		exit /b 3
 	)
 )
 
-if exist "%IMHERE%phpsdk-local.bat" (
-	cmd /k "!PHP_SDK_VC_SHELL_CMD! && %IMHERE%\bin\phpsdk_setvars.bat && %IMHERE%\bin\phpsdk_dumpenv.bat && %IMHERE%\phpsdk-local.bat && echo. && set prompt=$P$_$+$$$S"
+if exist "%PHP_SDK_ROOT_PATH%\phpsdk-local.bat" (
+	cmd /k "!PHP_SDK_VC_SHELL_CMD! && %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! && %IMHERE%\bin\phpsdk_setvars.bat && %IMHERE%\bin\phpsdk_dumpenv.bat && set prompt=$P$_$+$$$S"
+	cmd /k "!PHP_SDK_VC_SHELL_CMD! && %PHP_SDK_ROOT_PATH%\bin\phpsdk_setvars.bat && %PHP_SDK_ROOT_PATH%\bin\phpsdk_dumpenv.bat && set prompt=$P$_$+$$$S"
 )
 
-set PHP_SDK_RUN_FROM_ROOT=
-
 exit /b