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`
@@ -60,8 +60,7 @@ It is not required to hold the source in the PHP SDK directory. It could be usef
 - `git clone https://github.com/OSTC/php-sdk-binary-tools.git c:\php-sdk`
 - `cd c:\php-sdk`
 - `git checkout new_binary_tools`
-- either run or click on `phpsdk-vc14-x64.bat` in the PHP SDK root
-- `cd` to c:\php-sdk and click on `phpsdk-vc14-x64.bat` in the PHP SDK root
+- invoke `phpsdk-vc14-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`
@@ -78,7 +77,7 @@ TODO more extensive documentation on the wiki.
 
 ## Custom environment setup
 
-A sript called phpsdk-local.bat has to be put into the PHP SDK root. If present, it will be automatically picked up by the starter script. A template for such a script is included with the PHP SDK. This allows to meet any required preparations, that are not foreseen by the standard PHP SDK startup. Be careful while creating your own phpsdk-local. It's your responsibility to ensure the regular PHP SDK startup isn't broken after phpsdk-local was injected into the startup process.
+A sript called phpsdk-local.bat has to be put into the PHP SDK root. If present, it will be automatically picked up by the starter script. A template for such a script is included with the PHP SDK. This allows to automatically meet any required preparations, that are not foreseen by the standard PHP SDK startup. Be careful while creating your own phpsdk-local. It's your responsibility to ensure the regular PHP SDK startup isn't broken after phpsdk-local was injected into the startup sequence.
 
 ## Console emulator integration
 
@@ -96,6 +95,7 @@ An elementary functionality to run unattended builds is included. See an example
 - backup the source trees and any other custom files in the PHP SDK root
 - move the PHP SDK folder into trash
 - download, unpack and the new PHP SDK version under the same path
+- move the custom files back into their respective places
 
 # Extending
 

VERSION

@@ -1 +1 @@
-2.0.0alpha5
+2.0.0beta2

bin/php/php.ini

@@ -3,4 +3,9 @@ extension=php_curl.dll
 extension=php_ftp.dll
 extension=php_sqlite3.dll
 extension=php_openssl.dll
-memory_limit=1G
+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.
 
@@ -21,7 +23,7 @@ if "%PHP_SDK_ARCH%"=="x64" (
 )
 
 echo Visual C++:         %PHP_SDK_VC:~2%
-echo PHP-SDK path:       %PHP_SDK_PATH%
+echo PHP-SDK path:       %PHP_SDK_ROOT_PATH%
 
 
 exit /b

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%

bin/phpsdk_setvars.bat

@@ -6,11 +6,11 @@ set PHP_SDK_BIN_PATH=%~dp0
 rem remove trailing slash
 set PHP_SDK_BIN_PATH=%PHP_SDK_BIN_PATH:~0,-1%
 
-for %%a in ("%PHP_SDK_BIN_PATH%") do set PHP_SDK_PATH=%%~dpa
+for %%a in ("%PHP_SDK_BIN_PATH%") do set PHP_SDK_ROOT_PATH=%%~dpa
 rem remove trailing slash
-set PHP_SDK_PATH=%PHP_SDK_PATH:~0,-1%
+set PHP_SDK_ROOT_PATH=%PHP_SDK_ROOT_PATH:~0,-1%
 
-set PHP_SDK_MSYS2_PATH=%PHP_SDK_PATH%\msys2\usr\bin
+set PHP_SDK_MSYS2_PATH=%PHP_SDK_ROOT_PATH%\msys2\usr\bin
 set PHP_SDK_PHP_CMD=%PHP_SDK_BIN_PATH%\php\do_php.bat
 
 set PATH=%PHP_SDK_BIN_PATH%;%PHP_SDK_MSYS2_PATH%;%PATH%

bin/phpsdk_version.bat

@@ -8,7 +8,7 @@ if "%PHP_SDK_PHP_CMD%"=="" (
 	)
 )
 
-%PHP_SDK_PHP_CMD% -r "echo 'PHP SDK ' . file_get_contents(getenv('PHP_SDK_PATH') . '\\VERSION');"
+%PHP_SDK_PHP_CMD% -r "echo 'PHP SDK ' . file_get_contents(getenv('PHP_SDK_ROOT_PATH') . '\\VERSION');"
 
 exit /b
 

doc/unattended-build-task.bat.example

@@ -6,12 +6,19 @@ rem Program/script: C:\php-sdk\bin\task.exe
 rem Add arguments: "C:\php-sdk\phpsdk-starter.bat -c vc14 -a x64 -t C:\php-sdk\unattended-build-task.bat"
 rem Run the task
 
+set LOG_NAME=%PHP_SDK_VC%-%PHP_SDK_ARCH%-task.log
+
 pushd C:\php-sdk\php70\vc14\x64\php-src
 
-git pull --rebase
+git pull --rebase > %LOG_NAME% 2>&1
 
-nmake clean
-nmake > vs.log 2>&1
+call phpsdk_deps -u -s staging >> %LOG_NAME% 2>&1
+
+call buildconf >> %LOG_NAME% 2>&1
+call configure --enable-snapshot-build --enable-debug-pack >> %LOG_NAME% 2>&1
+
+nmake clean >> %LOG_NAME% 2>&1
+nmake >> %LOG_NAME% 2>&1
 
 popd
 

lib/php/libsdk/SDK/Config.php

@@ -177,10 +177,10 @@ class Config
 
 	public static function getSdkPath()
 	{/*{{{*/
-		$path = getenv("PHP_SDK_PATH");
+		$path = getenv("PHP_SDK_ROOT_PATH");
 
 		if (!$path) {
-			throw new Exception("PHP_SDK_PATH isn't set!");
+			throw new Exception("PHP_SDK_ROOT_PATH isn't set!");
 		}
 
 		$path = realpath($path);

phpsdk-starter.bat

@@ -6,9 +6,10 @@ set IMHERE=%~dp0
 
 :getopt
 if /i "%1" equ "-h" goto help
-if /i "%1" equ "-c" set CRT=%2& shift
-if /i "%1" equ "-a" set ARCH=%2& shift
-if /i "%1" equ "-t" set TASK=%2& shift
+if /i "%1" equ "-c" set CRT=%2 & shift
+if /i "%1" equ "-a" set ARCH=%2 & shift
+if /i "%1" equ "-t" set TASK=%2 & shift
+if /i "%1" equ "--task-args" set TASK_ARGS=%2 & shift
 shift
 if not (%1)==() goto getopt
 
@@ -22,6 +23,9 @@ goto skip_help
 
 :skip_help
 
+set CRT=%CRT: =%
+set ARCH=%ARCH: =%
+
 set PHP_SDK_RUN_FROM_ROOT=1
 
 title PHP SDK
@@ -34,12 +38,17 @@ if errorlevel 3 (
 
 if "%TASK%" neq "" (
 	if exist "%TASK%" (
-		cmd /c "!PHP_SDK_VC_SHELL_CMD! && %IMHERE%\bin\phpsdk_setvars.bat && %IMHERE%\bin\phpsdk_dumpenv.bat && %IMHERE%\phpsdk-local.bat && %TASK%"
-		rem exit 0
+		set TASK_ARGS=%TASK_ARGS:"=%
+
+		if exist "%IMHERE%phpsdk-local.bat" (
+			cmd /c "!PHP_SDK_VC_SHELL_CMD! && %IMHERE%\bin\phpsdk_setvars.bat && %IMHERE%\phpsdk-local.bat && %TASK% !TASK_ARGS!"
+		) else (
+			cmd /c "!PHP_SDK_VC_SHELL_CMD! && %IMHERE%\bin\phpsdk_setvars.bat && %TASK% !TASK_ARGS!"
+		)
 		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
+