prepare 2.0.9

.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

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 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.
+- When fetching 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.8
+2.0.9

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);

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
+ */