add new line

README.md

@@ -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.0alpha6
+2.0.0beta2

bin/php/php.ini

@@ -5,3 +5,7 @@ extension=php_sqlite3.dll
 extension=php_openssl.dll
 extension=php_mbstring.dll
 memory_limit=1G
+
+error_reporting=-1
+display_errors=1
+display_startup_errors=1

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,17 +45,23 @@ 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
+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
+	)
+	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 (
-	set TMPKEY=HKLM\SOFTWARE\Microsoft\VisualStudio\%PHP_SDK_VC:~2%.0\Setup\VC
+	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
 )
-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
@@ -75,9 +83,17 @@ 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%

phpsdk-starter.bat

@@ -48,7 +48,7 @@ if "%TASK%" neq "" (
 		exit /b
 	) else (
 		echo could not find the task file
-		exit 3
+		exit /b 3
 	)
 )
 

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
+