2.0.10

.gitignore

@@ -4,6 +4,7 @@ php55
 php56
 php70
 php71
+php72
 phpmaster
 php
 !lib/php

VERSION

@@ -1 +1 @@
-2.0.9
+2.0.10

bin/phpsdk_buildtree.bat

@@ -7,6 +7,8 @@ IF "%2" EQU ""   SET _=%CD%\%1
 rem if we're in the starter script shell, create the only struct that corresponds to the current env
 rem otherwise - retain the old behavior, create structs for all the known build combinations and don't cd
 
+cmd /c "exit /b 0"
+
 if "%PHP_SDK_ARCH%" NEQ "" (
 	if "%PHP_SDK_VC%" NEQ "" (
 		MD %_%\%PHP_SDK_VC%\%PHP_SDK_ARCH%\deps\bin
@@ -35,3 +37,5 @@ echo phpsdk_buildtree ^<nameofthetree^> [PATH]
 echo  Create the common directory structure used by the PHP SDK
 
 :EXIT
+exit /b %errorlevel%
+

bin/phpsdk_deps.bat

@@ -1,5 +1,7 @@
 @echo off
 
+cmd /c "exit /b 0"
+
 if "%PHP_SDK_PHP_CMD%"=="" (
 	call %~dp0phpsdk_setvars.bat
 	if "!PHP_SDK_PHP_CMD!"=="" (
@@ -10,5 +12,5 @@ if "%PHP_SDK_PHP_CMD%"=="" (
 
 call %PHP_SDK_PHP_CMD% %PHP_SDK_BIN_PATH%\phpsdk_deps.php %*
 
-exit /b
+exit /b %errorlevel%
 

bin/phpsdk_deps.php

@@ -4,7 +4,7 @@ include dirname(__FILE__) . "/../lib/php/libsdk/autoload.php";
 
 use SDK\{Config, Exception};
 
-$sopt = "s:cuhb:a:d:t:fn";
+$sopt = "s:cuhb:a:d:t:fnp";
 $lopt = array(
 	"branch:",
 	"update",
@@ -16,6 +16,7 @@ $lopt = array(
 	"deps:",
 	"force",
 	"no-backup",
+	"pack",
 );
 
 $cmd = NULL;
@@ -87,6 +88,11 @@ try {
 			case "no-backup":
 				$backup = false;
 				break;
+
+			case "p":
+			case "pack":
+				$cmd = "pack";
+				break;
 		}
 	}
 
@@ -157,6 +163,16 @@ try {
 			$dm->performUpdate($msg, $force, $backup);
 			msg($msg);
 			break;
+		case "pack":
+			$path_to_pack = Config::getDepsLocalPath();
+			$pack_path = dirname($path_to_pack) . DIRECTORY_SEPARATOR . "deps-$branch-$branch_data[crt]-$branch_data[arch].7z";
+			print "Packaging '$path_to_pack' as '$pack_path'.\n\n";
+			if ($force && is_file($pack_path)) {
+				unlink($pack_path);
+			}
+			system("7za a $pack_path $path_to_pack", $st);
+			exit((int)$st);
+			break;
 	}
 
 } catch (Throwable $e) {
@@ -177,7 +193,8 @@ function usage(int $code = -1)
 	echo "  -s --stability One of stable or staging.", PHP_EOL, PHP_EOL;
 	echo "Commands:", PHP_EOL;
 	echo "  -c --check     Check for dependency updates. If updates are available, the exit code is set to 7.", PHP_EOL;
-	echo "  -u --update    Update dependencies. If deps directory already exists, backup copy is created automatically.", PHP_EOL, PHP_EOL;
+	echo "  -u --update    Update dependencies. If deps directory already exists, backup copy is created automatically.", PHP_EOL;
+	echo "  -p --pack      Archive the dependency directory.", PHP_EOL, PHP_EOL;
 	echo "Misc:", PHP_EOL;
 	echo "  -d --deps      Path to the dependencies directory. If omited, CWD is used to guess.", PHP_EOL;
 	echo "  -f --force     Force the operation even if there are no upgrades available.", PHP_EOL;

bin/phpsdk_dllmap.bat

@@ -1,5 +1,7 @@
 @echo off
 
+cmd /c "exit /b 0"
+
 if "%PHP_SDK_PHP_CMD%"=="" (
 	call %~dp0phpsdk_setvars.bat
 	if "!PHP_SDK_PHP_CMD!"=="" (
@@ -10,5 +12,5 @@ if "%PHP_SDK_PHP_CMD%"=="" (
 
 call %PHP_SDK_PHP_CMD% %PHP_SDK_BIN_PATH%\phpsdk_dllmap.php %*
 
-exit /b
+exit /b %errorlevel%
 

bin/phpsdk_dumpenv.bat

@@ -5,6 +5,8 @@ if "%PHP_SDK_OS_ARCH%"=="" (
 	exit /b 3
 )
 
+cmd /c "exit /b 0"
+
 echo.
 
 call %PHP_SDK_BIN_PATH%\phpsdk_version.bat
@@ -26,5 +28,5 @@ echo Visual C++:         %PHP_SDK_VC_NUM%
 echo PHP-SDK path:       %PHP_SDK_ROOT_PATH%
 
 
-exit /b
+exit /b %errorlevel%
 

bin/phpsdk_setshell.bat

@@ -13,6 +13,8 @@ if "%1"=="-h" goto :help
 if "%1"=="--help" goto :help
 if "%2"=="" goto :help
 
+cmd /c "exit /b 0"
+
 set PHP_SDK_VC=%1
 if /i not "%PHP_SDK_VC:~0,2%"=="vc" (
 :malformed_vc_string

bin/phpsdk_setvars.bat

@@ -1,5 +1,7 @@
 @echo off
 
+cmd /c "exit /b 0"
+
 rem Add necessary dirs to the path 
 
 set PHP_SDK_BIN_PATH=%~dp0
@@ -15,5 +17,5 @@ set PHP_SDK_PHP_CMD=%PHP_SDK_BIN_PATH%\php\do_php.bat
 
 set PATH=%PHP_SDK_BIN_PATH%;%PHP_SDK_MSYS2_PATH%;%PATH%
 
-exit /b
+exit /b %errorlevel%
 

bin/phpsdk_version.bat

@@ -1,5 +1,7 @@
 @echo off
 
+cmd /c "exit /b 0"
+
 if "%PHP_SDK_PHP_CMD%"=="" (
 	call %~dp0phpsdk_setvars.bat
 	if "!PHP_SDK_PHP_CMD!"=="" (
@@ -10,5 +12,5 @@ if "%PHP_SDK_PHP_CMD%"=="" (
 
 %PHP_SDK_PHP_CMD% -r "echo 'PHP SDK ' . file_get_contents(getenv('PHP_SDK_ROOT_PATH') . '\\VERSION');"
 
-exit /b
+exit /b %errorlevel%
 

lib/php/libsdk/SDK/Config.php

@@ -297,9 +297,33 @@ class Config
 	public static function getDepsLocalPath() : ?string
 	{/*{{{*/
 		if (NULL == self::$depsLocalPath) {
-			if (file_exists("../deps")) {
-				self::setDepsLocalPath(realpath("../deps"));
-			} else if (file_exists("main/php_version.h")) {
+			if (file_exists("Makefile")) {
+				$s = file_get_contents("Makefile");
+
+				if (preg_match(",PHP_BUILD=(.+),", $s, $m)) {
+					if (isset($m[1])) {
+						self::setDepsLocalPath(trim($m[1]));
+					}
+				}
+			}
+		}
+
+		if (NULL == self::$depsLocalPath) {
+			$tmp = dirname(getcwd()) . DIRECTORY_SEPARATOR . "deps";
+			if (is_dir($tmp)) {
+				self::setDepsLocalPath($tmp);
+			}
+		}
+		
+		if (NULL == self::$depsLocalPath) {
+			$tmp = realpath("../deps");
+			if (is_dir($tmp)) {
+				self::setDepsLocalPath($tmp);
+			}
+		}
+
+		if (NULL == self::$depsLocalPath) {
+			if (file_exists("main/php_version.h")) {
 				/* Deps dir might not exist. */
 				self::setDepsLocalPath(realpath("..") . DIRECTORY_SEPARATOR . "deps");
 			}