prepare 2.0.8

But for now - only as a fallback if no other VS install could be found.

README.md

@@ -64,7 +64,7 @@ It is not required to hold the source in the PHP SDK directory. It could be usef
 - 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`
+- `phpsdk_deps --update --branch master`, use PHP-X.Y for a non master branch
 - do the build, eg. `buildconf && configure --enable-cli && nmake`
 
 More extensive documentation can be found on the [wiki](https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2 "PHP wiki page").
@@ -112,4 +112,6 @@ The SDK tools are based on the KISS principle and should be kept so. Basic tools
 - 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.
+- task.exe is not a console application, some systems might not propagate exit code except the batch is explicitly run from `cmd /c`, etc.
+
 

VERSION

@@ -1 +1 @@
-2.0.6
+2.0.8

bin/phpsdk_deps.php

@@ -28,6 +28,8 @@ $backup = true;
 
 try {
 
+	$branch = NULL;
+
 	$opt = getopt($sopt, $lopt);
 	foreach ($opt as $name => $val) {
 		switch ($name) {
@@ -42,7 +44,9 @@ try {
 
 			case "b":
 			case "branch":
-				Config::setCurrentBranchName($val);
+				/* Branch config depends on other information. We can set it
+					right away, because the option order can't be  guaranteed. */
+				$branch = $val;
 				break;
 
 			case "s":
@@ -86,6 +90,14 @@ try {
 		}
 	}
 
+	if (NULL == $branch) {
+		$branch = Config::guessCurrentBranchName();
+		if (NULL == $branch) {
+			throw new Exception("Couldn't determine current branch name, expect an explicit input.");
+		}
+	}
+	Config::setCurrentBranchName($branch);
+
 	if (NULL === $cmd) {
 		usage();
 	}

bin/phpsdk_setshell.bat

@@ -80,11 +80,15 @@ if 15 gtr %PHP_SDK_VC_NUM% (
 	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
 	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;
-            )
+		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!" (
+			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
+			if not exist "!PHP_SDK_VC_DIR!" (
+				echo Could not determine '%PHP_SDK_VC%' directory
+				goto out_error;
+			)
+		)
 	)
 	set VSCMD_ARG_no_logo=nologo
 )

lib/php/libsdk/SDK/Config.php

@@ -169,26 +169,36 @@ class Config
 		self::$currentBranchName = $name;
 	}/*}}}*/
 
-	public static function getCurrentBranchName() : ?string
+	public static function guessCurrentBranchName() : ?string
+	{/*{{{*/
+		$branch = NULL;
+
+		/* Try to figure out the branch. For now it only works if CWD is in php-src. */
+		$fl = "main/php_version.h";
+		if (file_exists($fl)) {
+			$s = file_get_contents($fl);
+			$major = $minor = NULL;
+
+			if (preg_match(",PHP_MAJOR_VERSION (\d+),", $s, $m)) {
+				$major = $m[1];
+			}
+			if (preg_match(",PHP_MINOR_VERSION (\d+),", $s, $m)) {
+				$minor = $m[1];
+			}
+
+			if (is_numeric($major) && is_numeric($minor)) {
+				$branch = "$major.$minor";
+			}
+		}
+
+		return $branch;
+	}/*}}}*/
+
+	public static function getCurrentBranchName() : string
 	{/*{{{*/
 		if (NULL == self::$currentBranchName) {
-			/* Try to figure out the branch. For now it only works if CWD is in php-src. */
-			$fl = "main/php_version.h";
-			if (file_exists($fl)) {
-				$s = file_get_contents($fl);
-				$major = $minor = NULL;
-
-				if (preg_match(",PHP_MAJOR_VERSION (\d+),", $s, $m)) {
-					$major = $m[1];
-				}
-				if (preg_match(",PHP_MINOR_VERSION (\d+),", $s, $m)) {
-					$minor = $m[1];
-				}
-
-				if (is_numeric($major) && is_numeric($minor)) {
-					self::setCurrentBranchName("$major.$minor");
-				}
-			}
+			$branch = self::guessCurrentBranchName();
+			self::setCurrentBranchName($branch);
 		}
 	
 		return self::$currentBranchName;