improve crt usability check with multiple choices

README.md

@@ -12,7 +12,7 @@ The PHP SDK 2.0 is compatible with PHP 7.0 and above. The compatibility with old
 
 # Requirements
 
-- `Visual C++ 2015` must be installed prior SDK usage
+- `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
 
@@ -31,7 +31,7 @@ All the tools included are either scripts or 32-bit binaries. They are therefore
 
 ## Other tools
 
-- `bison` 3.0.2, `re2c` 0.15.3
+- `bison` 3.0.2, `re2c` 0.15.3, `lemon`
 - `awk`, `gawk`, `sed`, `grep`
 - `diff`, `diff3`, `patch`
 - `md5sum`, `sha1sum`, `sha224sum`, `sha256sum`, `sha384sum`, `sha512sum`

VERSION

@@ -1 +1 @@
-2.0.0beta1
+2.0.0beta3

bin/phpsdk_dumpenv.bat

@@ -5,6 +5,8 @@ if "%PHP_SDK_OS_ARCH%"=="" (
 	exit /b 3
 )
 
+echo.
+
 call %PHP_SDK_BIN_PATH%\phpsdk_version.bat
 echo.
 

bin/phpsdk_setshell.bat

@@ -14,8 +14,10 @@ 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
+	)
 )
 
 if /i not "%2"=="x64" (
@@ -43,41 +45,56 @@ if not errorlevel 1 (
 set TMPKEY=
 
 rem get vc base dir
-if /i "%PHP_SDK_OS_ARCH%"=="x64" (
-	set TMPKEY=HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\%PHP_SDK_VC:~2%.0\Setup\VC
-) else (
-	set TMPKEY=HKLM\SOFTWARE\Microsoft\VisualStudio\%PHP_SDK_VC:~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
-	goto out_error;
-)
-for /f "tokens=2*" %%a in ('reg query !TMPKEY! /v ProductDir') do set PHP_SDK_VC_DIR=%%b
-set TMPKEY=
-
-rem get sdk dir
-if /i "%PHP_SDK_OS_ARCH%"=="x64" (
-	set TMPKEY=HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v8.1
-) else (
-	set TMPKEY=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.1
-)
-for /f "tokens=2*" %%a in ('reg query "!TMPKEY!" /v InstallationFolder') do (
-	if exist "%%b\Include\um\Windows.h" (
-		set PHP_SDK_WIN_SDK_DIR=%%b
+if /i "%1"=="vc14" (
+	if /i "%PHP_SDK_OS_ARCH%"=="x64" (
+		set TMPKEY=HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\%PHP_SDK_VC:~2%.0\Setup\VC
+	) else (
+		set TMPKEY=HKLM\SOFTWARE\Microsoft\VisualStudio\%PHP_SDK_VC:~2%.0\Setup\VC
 	)
-)
-if not defined PHP_SDK_WIN_SDK_DIR (
-	echo Windows SDK not found.
-	goto out_error;
+	reg query !TMPKEY! /v ProductDir >nul 2>&1
+	if errorlevel 1 (
+		echo Couldn't determine VC%PHP_SDK_VC:~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 15 -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
 )
 set TMPKEY=
 
+if /i "%PHP_SDK_VC%"=="vc14" (
+	rem get sdk dir
+	if /i "%PHP_SDK_OS_ARCH%"=="x64" (
+		set TMPKEY=HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v8.1
+	) else (
+		set TMPKEY=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.1
+	)
+	for /f "tokens=2*" %%a in ('reg query "!TMPKEY!" /v InstallationFolder') do (
+		if exist "%%b\Include\um\Windows.h" (
+			set PHP_SDK_WIN_SDK_DIR=%%b
+		)
+	)
+	if not defined PHP_SDK_WIN_SDK_DIR (
+		echo Windows SDK not found.
+		goto out_error;
+	)
+	set TMPKEY=
+)
 
 if /i "%PHP_SDK_ARCH%"=="x64" (
-	set PHP_SDK_VC_SHELL_CMD="!PHP_SDK_VC_DIR!\vcvarsall.bat" amd64
+	if /i "%1"=="vc14" (
+		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 (
-	set PHP_SDK_VC_SHELL_CMD="!PHP_SDK_VC_DIR!\vcvarsall.bat" x86
+	if /i "%1"=="vc14" (
+		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
+	)
 )
 
 rem echo Visual Studio path %PHP_SDK_VC_DIR%

lib/php/libsdk/SDK/Config.php

@@ -134,8 +134,14 @@ class Config
 				throw new Exception("More than one CRT is available for branch '" . self::$currentBranchName . "', pass one explicitly.");
 			}
 
-			$crt = array_keys($branches[self::$currentBranchName])[0];
-			if ($cur_crt != $crt) {
+			$cur_crt_usable = false;
+			foreach (array_keys($branches[self::$currentBranchName]) as $crt) {
+				if ($cur_crt == $crt) {
+					$cur_crt_usable = true;
+					break;
+				}
+			}
+			if (!$cur_crt_usable) {
 				throw new Exception("The passed CRT '$cur_crt' doesn't match any availbale for branch '" . self::$currentBranchName . "'");
 			}
 			$data = $branches[self::$currentBranchName][$cur_crt];

phpsdk-vc15-x64.bat

@@ -0,0 +1,6 @@
+@echo off
+
+call %~dp0phpsdk-starter.bat -c vc15 -a x64 %*
+
+exit /b
+

phpsdk-vc15-x86.bat

@@ -0,0 +1,6 @@
+@echo off
+
+call %~dp0phpsdk-starter.bat -c vc15 -a x86 %*
+
+exit /b
+