prepare 2.0.4

This reverts commit 010ae42362.

.gitignore

@@ -19,3 +19,4 @@ oracle
 #pgo-build
 #rmtools*
 pgo
+phpsdk-local.bat

VERSION

@@ -1 +1 @@
-2.0.3
+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

@@ -187,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_setshell.bat

@@ -24,7 +24,7 @@ if ""=="%PHP_SDK_VC:~2%" (
 	goto malformed_vc_string
 )
 set /a TMP_CHK=%PHP_SDK_VC:~2%
-if 11 gtr %TMP_CHK% (
+if 14 gtr %TMP_CHK% (
 	if "0"=="%TMP_CHK%" (
 		if not "0"=="%PHP_SDK_VC:~2%" (
 			set TMP_CHK=
@@ -79,11 +79,14 @@ if 15 gtr %PHP_SDK_VC_NUM% (
 ) 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
-	set VSCMD_ARG_no_logo=nologo
 	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=
 

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

@@ -20,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