Prepare 2.0.12

- re2c is upgraded manually to 1.0.2

.gitattributes

@@ -0,0 +1,7 @@
+*.m4  text eol=lf
+*.awk text eol=lf
+*.c   text eol=lf
+*.h   text eol=lf
+*.php text eol=lf
+*.json text eol=lf
+*.md text eol=lf

.gitignore

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

README.md

@@ -1,117 +1,118 @@
-# PHP SDK
-
-PHP SDK is a tool kit for Windows PHP builds
-
-# License
-
-The PHP SDK itself and the SDK own tools are licensed under the BSD 2-Clause license. With the usage of the other tools, you accept the respective licenses.
-
-# Overview
-
-The PHP SDK 2.0 is compatible with PHP 7.0 and above. The compatibility with [older versions](http://windows.php.net/downloads/php-sdk/php-sdk-binary-tools-20110915.zip "php-sdk-binary-tools-20110915.zip") is kept, also available from the [legacy branch](https://github.com/OSTC/php-sdk-binary-tools/tree/legacy). The toolset was significantly revamped. Newer tools are now available, better workflows are now possible. The toolset consists on a mix of the hand written scripts, selected MSYS2 parts and standalone programs. 
-
-# Requirements
-
-- `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
-- The PHP SDK was successfully tested on Windows 7 or later, earlier versions might work but are not recommended
-
-# Tools
-
-All the tools included are either scripts or 32-bit binaries. They are therefore runable on any of x86 or x64 supported Windows system.
-
-## SDK
-
-- starter scripts, named phpsdk-<crt>-<arch>.bat
-- `phpsdk_buildtree` - initialize the development filesystem structure
-- `phpsdk_deps`      - handle dependency libraries
-- `phpsdk_version`   - show SDK version
-- `phpsdk_dllmap`    - create a JSON listing of DLLs contained in zip files
-- `task.exe`         - wrapper to hide the given command line
-
-## Other tools
-
-- `bison` 3.0.2, `re2c` 0.15.3, `lemon`
-- `awk`, `gawk`, `sed`, `grep`
-- `diff`, `diff3`, `patch`
-- `md5sum`, `sha1sum`, `sha224sum`, `sha256sum`, `sha384sum`, `sha512sum`
-- `7za`, `zip`, `unzip`, `unzipsfx`
-- `wget`
-
-## Optional, not included
-
-These are not included with the PHP SDK, but might be useful. While Visual C++ is the only required, the others might enable some additional functionality. Care yourself about making them available on your system, if relevant.
-
-- `Git`        - useful for PHP source management
-- `Cppcheck`   - used for static analysis
-- `clang`      - useful for experimental builds and for static analysis
-- `ICC`        - useful for experimental builds
-
-# Usage
-
-The PHP SDK should be unzipped into the shortest possible path, preferrably somewhere near the drive root.
-
-Usually, the first step to start the PHP SDK is by invoking one of the suitable starter scripts. This automatically puts the console on the correct environment relevant for the desired PHP build configuration.
-
-It is not required to hold the source in the PHP SDK directory. It could be useful, for example, to simplify the SDK updates.
-
-## Basic usage example
-
-- `git clone https://github.com/OSTC/php-sdk-binary-tools.git c:\php-sdk`
-- `cd c:\php-sdk`
-- `git checkout php-sdk-2.0.0` or later
-- 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`, 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").
-
-## The old way
-
-- `git clone https://github.com/OSTC/php-sdk-binary-tools.git c:\php-sdk`
-- follow the instructions on the PHP [wiki page](https://wiki.php.net/internals/windows/stepbystepbuild "PHP wiki page")
-
-# Customizing
-
-## 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 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.bat was injected into the startup sequence.
-
-## Console emulator integration
-
-The starter scripts can be also easy integrated with the consoles other than standard cmd.exe. For the reference, here's an example ConEmu task
-
-`C:\php-sdk\phpsdk-vc14-x64.bat -cur_console:d:C:\php-sdk\php70\vc14\x64\php-src`
-
-## Unattended builds
-
-An elementary functionality to run unattended builds is included. See an example on how to setup a simple unattended build task in the doc directory.
-
-# Upgrading
-
-- backup phpsdk-local.bat
-- backup the source trees and any other custom files in the PHP SDK root, if any present
-- move the PHP SDK folder into trash
-- download, unpack and the new PHP SDK version under the same path
-- move the custom files back in their respective places
-
-If the PHP SDK is kept as a git checkout, merely what is needed instead is to git fetch and to checkout an updated git tag.
-
-# Extending
-
-The SDK tools are based on the KISS principle and should be kept so. Basic tools are implemented as simple batch script. The minimalistic `PHP` is available for internal SDK purposes. It can be used, if more complexity is required. If you have an idea for some useful tool or workflow, please open a ticket or PR, so it can be discussed, implemented and added to the SDK. By contributing an implementation, you should also accept the SDK license.
-
-# Pitfalls
-
-- SDK or PHP sources put into paths including spaces might cause issue.
-- SDK or PHP sources put into too long paths, will cause an issue.
-- If Cygwin is installed, it might cause issues. If it's unavoidable, to have Cygwin on the same machine, ensure SDK preceeds it on the PATH.
-- 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.
-
-
+# PHP SDK
+
+PHP SDK is a tool kit for Windows PHP builds
+
+# License
+
+The PHP SDK itself and the SDK own tools and code are licensed under the BSD 2-Clause license. With the usage of the other tools, you accept the respective licenses.
+
+# Overview
+
+The PHP SDK 2.0 is compatible with PHP 7.0 and above. The compatibility with [older versions](http://windows.php.net/downloads/php-sdk/php-sdk-binary-tools-20110915.zip "php-sdk-binary-tools-20110915.zip") is kept, also available from the [legacy branch](https://github.com/OSTC/php-sdk-binary-tools/tree/legacy). The toolset was significantly revamped. Newer tools are now available, better workflows are now possible. The toolset consists on a mix of the hand written scripts, selected MSYS2 parts and standalone programs. 
+
+# Requirements
+
+- `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
+- The PHP SDK was successfully tested on Windows 7 or later, earlier versions might work but are not recommended
+
+# Tools
+
+All the tools included are either scripts or 32-bit binaries. They are therefore runable on any of x86 or x64 supported Windows system.
+
+## SDK
+
+- starter scripts, named phpsdk-<crt>-<arch>.bat
+- `phpsdk_buildtree` - initialize the development filesystem structure
+- `phpsdk_deps`      - handle dependency libraries
+- `phpsdk_version`   - show SDK version
+- `phpsdk_dllmap`    - create a JSON listing of DLLs contained in zip files
+- `task.exe`         - wrapper to hide the given command line
+
+## Other tools
+
+- `bison` 3.0.4, `re2c` 1.0.2, `lemon`
+- `awk`, `gawk`, `sed`, `grep`
+- `diff`, `diff3`, `patch`
+- `md5sum`, `sha1sum`, `sha224sum`, `sha256sum`, `sha384sum`, `sha512sum`
+- `7za`, `zip`, `unzip`, `unzipsfx`
+- `wget`, `pwgen`
+
+## Optional, not included
+
+These are not included with the PHP SDK, but might be useful. While Visual C++ is the only required, the others might enable some additional functionality. Care yourself about making them available on your system, if relevant.
+
+- `Git`        - useful for PHP source management
+- `Cppcheck`   - used for static analysis
+- `clang`      - useful for experimental builds and for static analysis
+- `ICC`        - useful for experimental builds
+
+# Usage
+
+The PHP SDK should be unzipped into the shortest possible path, preferrably somewhere near the drive root.
+
+Usually, the first step to start the PHP SDK is by invoking one of the suitable starter scripts. This automatically puts the console on the correct environment relevant for the desired PHP build configuration.
+
+It is not required to hold the source in the PHP SDK directory. It could be useful, for example, to simplify the SDK updates.
+
+## Basic usage example
+
+- `git clone https://github.com/OSTC/php-sdk-binary-tools.git c:\php-sdk`
+- `cd c:\php-sdk`
+- `git checkout php-sdk-2.0.0` or later
+- 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`, 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").
+
+## The old way
+
+- `git clone https://github.com/OSTC/php-sdk-binary-tools.git c:\php-sdk`
+- follow the instructions on the PHP [wiki page](https://wiki.php.net/internals/windows/stepbystepbuild "PHP wiki page")
+
+# Customizing
+
+## 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 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.bat was injected into the startup sequence.
+
+## Console emulator integration
+
+The starter scripts can be also easy integrated with the consoles other than standard cmd.exe. For the reference, here's an example ConEmu task
+
+`C:\php-sdk\phpsdk-vc14-x64.bat -cur_console:d:C:\php-sdk\php70\vc14\x64\php-src`
+
+## Unattended builds
+
+An elementary functionality to run unattended builds is included. See an example on how to setup a simple unattended build task in the doc directory.
+
+# Upgrading
+
+- backup phpsdk-local.bat
+- backup the source trees and any other custom files in the PHP SDK root, if any present
+- move the PHP SDK folder into trash
+- download, unpack and the new PHP SDK version under the same path
+- move the custom files back in their respective places
+
+If the PHP SDK is kept as a git checkout, merely what is needed instead is to git fetch and to checkout an updated git tag.
+
+# Extending
+
+The SDK tools are based on the KISS principle and should be kept so. Basic tools are implemented as simple batch script. The minimalistic `PHP` is available for internal SDK purposes. It can be used, if more complexity is required. If you have an idea for some useful tool or workflow, please open a ticket or PR, so it can be discussed, implemented and added to the SDK. By contributing an implementation, you should also accept the SDK license.
+
+# Pitfalls
+
+- SDK or PHP sources put into paths including spaces might cause issue.
+- SDK or PHP sources put into too long paths, will cause an issue.
+- If Cygwin, MSYS2 or MinGW flavors are exposed in global PATH, it might cause issues. If it's unavoidable, ensure SDK preceeds it on the PATH.
+- When fetching the binary SDK from git, git `core.autocrlf` configuration directive set to `false` is recommended.
+- 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.7
+2.0.12

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) {
@@ -171,13 +187,14 @@ function usage(int $code = -1)
 	echo "PHP SDK dependency handling tool.", PHP_EOL;
 	echo "Usage: ", PHP_EOL, PHP_EOL;
 	echo "Configuration:", PHP_EOL;
-	echo "  -b --branch    Branch name, eg. 7.0, 7.1, etc. If omited, CWD is used to guess.", PHP_EOL;
+	echo "  -b --branch    Branch name, eg. 7.0, 7.1, etc. If omited, several guess methods apply.", PHP_EOL;
 	echo "  -a --arch      Architecture, x86 or x64. If omited, cl.exe is used to guess.", PHP_EOL;
 	echo "  -t --crt       CRT, marked by the corresponding VC++ version, eg. vc11, vc14, etc.", PHP_EOL;
 	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_dllmap.php

@@ -6,7 +6,7 @@
 	- create mappings between dll filename and zip filename
 
 	Usage:
-	php dllmap.php path0 [ path1 ... ] > dllmapping.json
+	php dllmap.php [--pretty] path0 [ path1 ... ] > dllmapping.json
 */
 
 
@@ -20,8 +20,25 @@
 	"C:\\tmp\\libs",
 );*/
 
+$sopt = "p";
+$lopt = array(
+	"pretty",
+);
+
+$flags = 0;
+$opt = getopt($sopt, $lopt);
+foreach ($opt as $name => $val) {
+	switch ($name) {
+			case "p":
+			case "pretty":
+				$flags = JSON_PRETTY_PRINT;
+				break;
+	}
+}
+
+
 $dirs = array();
-foreach (array_slice($_SERVER["argv"], 1) as $item) {
+foreach (array_slice($_SERVER["argv"], (0 == $flags ? 1 : 2)) as $item) {
 	if (file_exists($item) && is_dir($item)) {
 		$dirs[] = $item;
 	}
@@ -32,26 +49,7 @@ if (empty($dirs)) {
 	die;
 }
 
-
-$out = array(
-	"vc9" => array(
-		"x86" => array(),
-		"x64" => array(),
-	),
-	"vc11" => array(
-		"x86" => array(),
-		"x64" => array(),
-	),
-	"vc12" => array(
-		"x86" => array(),
-		"x64" => array(),
-	),
-	"vc14" => array(
-		"x86" => array(),
-		"x64" => array(),
-	),
-);
-
+$out = array();
 
 foreach ($dirs as $path) {
 	$dir = new DirectoryIterator($path);
@@ -74,6 +72,13 @@ foreach ($dirs as $path) {
 		$crt = $m[1];
 		$arch = $m[2];
 
+		if (!isset($out[$crt])) {
+			$out[$crt] = array();
+		}
+		if (!isset($out[$crt][$arch])) {
+			$out[$crt][$arch] = array();
+		}
+
 		$zip = new ZipArchive();
 
 		$zip->open($pathname);
@@ -100,7 +105,7 @@ foreach ($dirs as $path) {
 	}
 }
 
-echo json_encode($out);
+echo json_encode($out, $flags);
 
 /*
  * Local variables:

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
@@ -80,11 +82,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
 )

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/Build/Dependency/Manager.php

@@ -2,7 +2,7 @@
 
 namespace SDK\Build\Dependency;
 
-use SDK\{Config, Cache, Exception, FileOps};
+use SDK\{Config, Cache, Exception, FileOps, Lock};
 
 class Manager
 {
@@ -39,7 +39,7 @@ class Manager
 
 	public function updatesAvailable() : bool
 	{/*{{{*/
-		return $this->series->updatesAvailable();
+		return $this->series->updatesAvailable() || !file_exists(Config::getDepsLocalPath());
 	}/*}}}*/
 
 	/* FIXME implement rollback */
@@ -50,6 +50,15 @@ class Manager
 				$msg .= "No updates are available";
 				return;
 			}
+
+			$lock = new Lock(Config::getDepsLocalPath());
+			if (!$lock->locked()) {
+				$msg .= "Dependencies was updated by another process.";
+				echo "Another process is updating same dependency path. I'm just going to wait for it to finish and then exit.", PHP_EOL;
+				$lock->exclusive(true);
+				unset($lock);
+				return;
+			}
 		}
 
 		$series_data = $this->series->getData();
@@ -86,10 +95,16 @@ class Manager
 
 				/* This is fine, it's gonna be on the same drive. */
 				if (!$this->mv($this->path, $new_path)) {
+					if (!$force) {
+						unset($lock);
+					}
 					throw new Exception("Unable to rename '{$this->path}' to '$new_path'");
 				}
 			} else {
 				if (!$this->rm($this->path)) {
+					if (!$force) {
+						unset($lock);
+					}
 					throw new Exception("Unable to remove the current dependency dir at '{$this->path}'");
 				}
 			}
@@ -97,6 +112,9 @@ class Manager
 			$up = dirname($this->path);
 			if (!file_exists($up)) {
 				if (!$this->md($up)) {
+					if (!$force) {
+						unset($lock);
+					}
 					throw new Exception("Unable to create '{$this->path}'");
 				}
 			}
@@ -118,6 +136,10 @@ class Manager
 		} else {
 			$msg .= "No backup was created.";
 		}
+
+		if (!$force) {
+			unset($lock);
+		}
 	}/*}}}*/
 }
 

lib/php/libsdk/SDK/Cache.php

@@ -36,6 +36,7 @@ class Cache
 		return file_exists($this->getCacheablePath($path, $relative));
 	}/*}}}*/
 
+	/* TODO Sometimes a timestamp comparison might make sense. */
 	public function cachedContentDiffers(string $path, string $content, bool $relative = false) : bool
 	{/*{{{*/
 		$p = $this->getCacheablePath($path, $relative);
@@ -54,7 +55,26 @@ class Cache
 	{/*{{{*/
 		$p = $this->getCacheablePath($path, $relative);
 
-		if (strlen($content) !== file_put_contents($p, $content)) {
+		$to_write = strlen($content);
+		$wrote = 0;
+
+		$fd = fopen($p, "wb");
+
+		flock($fd, LOCK_EX);
+
+		do {
+			$got = fwrite($fd, substr($content, $wrote));
+			if (false == $got) {
+				break;
+			}
+			$wrote += $got;
+		} while ($wrote < $to_write);
+
+		flock($fd, LOCK_UN);
+
+		fclose($fd);
+
+		if ($to_write !== $wrote) {
 			throw new Exception("Couldn't cache '$p'");
 		}
 	}/*}}}*/

lib/php/libsdk/SDK/Config.php

@@ -55,19 +55,18 @@ class Config
 		if (NULL === self::$currentArchName) {
 			/* XXX this might be not true for other compilers! */
 			passthru("where cl.exe >nul", $status);
-			if ($status) {
-				throw new Exception("Couldn't find cl.exe.");
-			}
-
-			exec("cl.exe /? 2>&1", $a, $status);
 			if ($status) {
 				throw new Exception("Couldn't execute cl.exe.");
 			}
 
-			if (preg_match(",x64,", $a[0])) {
+			exec("cl.exe /? 2>&1", $out);
+
+			if (preg_match(",x64,", $out[0])) {
 				self::setCurrentArchName("x64");
-			} else {
+			} elseif (preg_match(",x86,", $out[0])) {
 				self::setCurrentArchName("x86");
+			} else {
+				throw new Exception("Couldn't determine Arch.");
 			}
 		}
 
@@ -172,10 +171,25 @@ class Config
 	public static function guessCurrentBranchName() : ?string
 	{/*{{{*/
 		$branch = NULL;
+		$found = false;
 
-		/* Try to figure out the branch. For now it only works if CWD is in php-src. */
+		/* Try to figure out the branch. The worky scenarios are
+			- CWD is in php-src 
+			- phpize is on the path
+			FIXME for the dev package, there should be a php-config utility
+		 */
 		$fl = "main/php_version.h";
-		if (file_exists($fl)) {
+		$found = file_exists($fl);
+
+		if (!$found) {
+			exec("where phpize", $out, $status);
+			if (!$status) {
+				$fl = dirname($out[0]) . DIRECTORY_SEPARATOR . "include" . DIRECTORY_SEPARATOR . $fl;
+				$found = file_exists($fl);
+			}
+		}
+
+		if ($found) {
 			$s = file_get_contents($fl);
 			$major = $minor = NULL;
 
@@ -297,9 +311,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");
 			}

lib/php/libsdk/SDK/FileOps.php

@@ -1,163 +1,163 @@
-<?php
-
-namespace SDK;
-
-use SDK\Config;
-use SDK\Exception;
-
-trait FileOps
-{
-	protected function md(string $name = "", bool $tmp = false) : string
-	{/*{{{*/
-		$ret = $name;
-
-		if (!$name) {
-			if ($tmp) {
-				$pre = Config::getTmpDir();
-				$ret = $pre . DIRECTORY_SEPARATOR . md5(uniqid());
-			} else {
-				throw new Exception("Dir name is empty");
-			}
-		}
-
-
-		if (!is_dir($ret)) {
-			if (!mkdir($ret, 0755, true)) {
-				throw new Exception("Unable to create '$ret'");
-			}
-		}
-
-		return $ret;
-	}/*}}}*/
-
-	/* TODO is link and more checks. */
-	protected function rm(string $path) : bool
-	{/*{{{*/
-		if (!file_exists($path)) {
-			return false;
-		} else if (is_file($path)) {
-			return unlink($path);
-		}
-
-		$ret = true;
-
-		$iterator = new \RecursiveIteratorIterator(
-			new \RecursiveDirectoryIterator(
-				$path,
-				\FilesystemIterator::SKIP_DOTS
-			),
-			\RecursiveIteratorIterator::CHILD_FIRST
-		);
-		foreach ($iterator as $item) {
-			if ($item->isDir()) {
-				$ret = $ret && rmdir($item->getPathname());
-			} else {
-				$ret = $ret && unlink($item->getPathname());
-			}
-		}
-		return $ret && rmdir($path);
-	}/*}}}*/
-
-	/* TODO islink and more checks */
-	protected function cp_or_mv(string $src, string $dst, callable $cb) : bool
-	{/*{{{*/
-		if (!file_exists($src)) {
-			return false;
-		} else if (is_file($src)) {
-			return call_user_func($cb, $src, $dst);
-		}
-
-		if (!file_exists($dst)) {
-			$this->md($dst);
-		}
-
-		$iterator = new \RecursiveIteratorIterator(
-			new \RecursiveDirectoryIterator(
-				$src,
-				\FilesystemIterator::SKIP_DOTS
-			),
-			\RecursiveIteratorIterator::CHILD_FIRST
-		);
-		$cut_len = strlen($src)+1;
-		foreach ($iterator as $item) {
-			$src_path = $item->getPathname();
-			$sub = substr($src_path, $cut_len);
-			$dst_path = $dst . DIRECTORY_SEPARATOR . $sub;
-			$dst_parent = dirname($dst_path);
-
-			if (!is_dir($dst_parent)) {
-				if (!$this->md($dst_parent)) {
-					throw new Exception("Unable to create '$dst_parent'");
-				}
-			}
-
-			if ($item->isFile()) {
-				if (!call_user_func($cb, $src_path, $dst_path)) {
-					throw new Exception("Unable to $cb '$src_path' to '$dst_path'");
-				}
-			}
-			
-		}
-
-		return true;
-	}/*}}}*/
-
-	protected function cp(string $src, string $dst) : bool
-	{/*{{{*/
-		return $this->cp_or_mv($src, $dst, "copy");
-	}/*}}}*/
-
-	protected function mv(string $src, string $dst) : bool
-	{/*{{{*/
-		$ret = $this->cp_or_mv($src, $dst, "rename");
-
-		$ret = $ret && $this->rm($src);
-
-		return $ret;
-	}/*}}}*/
-
-	protected function download(string $url, string $dest = NULL) : ?string
-	{
-		$fd = NULL;
-		$ch = curl_init($url);
-
-		if ($dest) {
-			$fd = fopen($dest, "w+");
-			curl_setopt($ch, CURLOPT_FILE, $fd); 
-		} else {
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		}
-
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-
-		$ret = curl_exec($ch);
-		if (false === $ret) {
-			$err = curl_error();
-			curl_close($ch);
-			if ($dest) {
-				fclose($fd);
-			}
-			throw new Exception($err);
-		}
-
-		curl_close($ch);
-
-		if ($dest) {
-			fclose($fd);
-			return NULL;
-		}
-
-		return $ret;
-	}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
+<?php
+
+namespace SDK;
+
+use SDK\Config;
+use SDK\Exception;
+
+trait FileOps
+{
+	protected function md(string $name = "", bool $tmp = false) : string
+	{/*{{{*/
+		$ret = $name;
+
+		if (!$name) {
+			if ($tmp) {
+				$pre = Config::getTmpDir();
+				$ret = $pre . DIRECTORY_SEPARATOR . md5(uniqid());
+			} else {
+				throw new Exception("Dir name is empty");
+			}
+		}
+
+
+		if (!is_dir($ret)) {
+			if (!mkdir($ret, 0755, true)) {
+				throw new Exception("Unable to create '$ret'");
+			}
+		}
+
+		return $ret;
+	}/*}}}*/
+
+	/* TODO is link and more checks. */
+	protected function rm(string $path) : bool
+	{/*{{{*/
+		if (!file_exists($path)) {
+			return false;
+		} else if (is_file($path)) {
+			return unlink($path);
+		}
+
+		$ret = true;
+
+		$iterator = new \RecursiveIteratorIterator(
+			new \RecursiveDirectoryIterator(
+				$path,
+				\FilesystemIterator::SKIP_DOTS
+			),
+			\RecursiveIteratorIterator::CHILD_FIRST
+		);
+		foreach ($iterator as $item) {
+			if ($item->isDir()) {
+				$ret = $ret && rmdir($item->getPathname());
+			} else {
+				$ret = $ret && unlink($item->getPathname());
+			}
+		}
+		return $ret && rmdir($path);
+	}/*}}}*/
+
+	/* TODO islink and more checks */
+	protected function cp_or_mv(string $src, string $dst, callable $cb) : bool
+	{/*{{{*/
+		if (!file_exists($src)) {
+			return false;
+		} else if (is_file($src)) {
+			return call_user_func($cb, $src, $dst);
+		}
+
+		if (!file_exists($dst)) {
+			$this->md($dst);
+		}
+
+		$iterator = new \RecursiveIteratorIterator(
+			new \RecursiveDirectoryIterator(
+				$src,
+				\FilesystemIterator::SKIP_DOTS
+			),
+			\RecursiveIteratorIterator::CHILD_FIRST
+		);
+		$cut_len = strlen($src)+1;
+		foreach ($iterator as $item) {
+			$src_path = $item->getPathname();
+			$sub = substr($src_path, $cut_len);
+			$dst_path = $dst . DIRECTORY_SEPARATOR . $sub;
+			$dst_parent = dirname($dst_path);
+
+			if (!is_dir($dst_parent)) {
+				if (!$this->md($dst_parent)) {
+					throw new Exception("Unable to create '$dst_parent'");
+				}
+			}
+
+			if ($item->isFile()) {
+				if (!call_user_func($cb, $src_path, $dst_path)) {
+					throw new Exception("Unable to $cb '$src_path' to '$dst_path'");
+				}
+			}
+			
+		}
+
+		return true;
+	}/*}}}*/
+
+	protected function cp(string $src, string $dst) : bool
+	{/*{{{*/
+		return $this->cp_or_mv($src, $dst, "copy");
+	}/*}}}*/
+
+	protected function mv(string $src, string $dst) : bool
+	{/*{{{*/
+		$ret = $this->cp_or_mv($src, $dst, "rename");
+
+		$ret = $ret && $this->rm($src);
+
+		return $ret;
+	}/*}}}*/
+
+	protected function download(string $url, string $dest = NULL) : ?string
+	{/*{{{*/
+		$fd = NULL;
+		$ch = curl_init($url);
+
+		if ($dest) {
+			$fd = fopen($dest, "w+");
+			curl_setopt($ch, CURLOPT_FILE, $fd); 
+		} else {
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		}
+
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+
+		$ret = curl_exec($ch);
+		if (false === $ret) {
+			$err = curl_error();
+			curl_close($ch);
+			if ($dest) {
+				fclose($fd);
+			}
+			throw new Exception($err);
+		}
+
+		curl_close($ch);
+
+		if ($dest) {
+			fclose($fd);
+			return NULL;
+		}
+
+		return $ret;
+	}/*}}}*/
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */

lib/php/libsdk/SDK/Lock.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace SDK;
+
+use SDK\{Config, Exception};
+
+class Lock
+{
+	protected $fd;
+	protected $fn;
+	protected $locked = false;
+	protected $wouldBlock = false;
+	protected $shared = false;
+
+	public function __construct(string $tag, bool $auto = true, bool $autoShared = false)
+	{/*{{{*/
+		$hash = hash("sha256", $tag);
+		$this->fn = Config::getTmpDir() . DIRECTORY_SEPARATOR . $hash . ".lock";
+
+		if ($auto) {
+			if ($autoShared) {
+				$this->shared();
+			} else {
+				$this->exclusive();
+			}
+		}
+	}/*}}}*/
+
+	public function __destruct()
+	{/*{{{*/
+		$this->unlock();
+		/* We don't really know no one else waits on the same lock yet.*/
+		/*if (file_exists($this->fn) && !$this->shared) {
+			@unlink($this->fn);
+		}*/
+	}/*}}}*/
+
+	public function shared(bool $block = false) : bool
+	{/*{{{*/
+		$flags = LOCK_SH;
+		if (!$block) {
+			$flags |= LOCK_NB;
+		}
+
+		return $this->doLock($flags);
+	}/*}}}*/
+
+	public function exclusive(bool $block = false) : bool
+	{/*{{{*/
+		$flags = LOCK_EX;
+		if (!$block) {
+			$flags |= LOCK_NB;
+		}
+
+		return $this->doLock($flags);
+	}/*}}}*/
+
+	protected function doLock(int $flags = LOCK_EX) : bool
+	{/*{{{*/
+		if ($this->locked) {
+			/* Or throw an exception, as we don't know which lock type the outta world expected. */
+			return true;
+		}
+
+		$this->shared = $flags & LOCK_SH;
+		if ($this->shared) {
+			$this->fd = fopen($this->fn, "rb");
+		} else {
+			$this->fd = fopen($this->fn, "wb");
+		}
+		$this->locked = flock($this->fd, $flags, $this->wouldBlock);	
+		return $this->locked;
+	}/*}}}*/
+
+	public function unlock() : bool
+	{/*{{{*/
+		if (!$this->locked) {
+			return true;
+		}
+
+		$this->doLock(LOCK_UN);
+
+		fclose($this->fd);
+		$this->fd = NULL;
+
+		return $this->locked;
+	}/*}}}*/
+
+	public function locked() : bool
+	{/*{{{*/
+		return $this->locked;
+	}/*}}}*/
+
+	public function wouldBlock() : bool
+	{/*{{{*/
+		return 1 === $this->wouldBlock;
+	}/*}}}*/
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */