Compare commits

...

9 Commits

Author SHA1 Message Date
Anatol Belski
1a8c2e03b7 prepare for tag 2017-04-26 16:33:10 +02:00
Anatol Belski
866ffa7b3c upgrade vswhere 2017-04-26 16:09:49 +02:00
Anatol Belski
0b764877b2 add pgo subdir to ignore 2017-04-25 18:53:49 +02:00
Anatol Belski
9523a991d8 some more readme 2017-04-25 16:50:40 +02:00
Anatol Belski
b2e434d5a1 extend notes 2017-04-25 16:42:03 +02:00
Anatol Belski
42682a421b move actual vs. branch crt check to global stage 2017-04-25 15:24:52 +02:00
Anatol Belski
3dfcb7ccd1 bail out if the active crt is not what the branch tells 2017-04-25 12:34:44 +02:00
Anatol Belski
b79e4ba51b update tag name 2017-04-24 22:33:42 +02:00
Anatol Belski
1ce16ca360 back to dev 2017-04-24 19:43:36 +02:00
5 changed files with 19 additions and 8 deletions

1
.gitignore vendored
View File

@@ -18,3 +18,4 @@ oracle
# either these two become submodules, or uncomment them
#pgo-build
#rmtools*
pgo

View File

@@ -15,10 +15,11 @@ The PHP SDK 2.0 is compatible with PHP 7.0 and above. The compatibility with [ol
- `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 Windows system.
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
@@ -59,14 +60,14 @@ 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`
- invoke `phpsdk-vc14-x64.bat`
- `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`
- do the build, eg. `buildconf && configure --enable-cli && nmake`
TODO more extensive documentation on the wiki.
More extensive documentation can be found on the [wiki](https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2 "PHP wiki page").
## The old way
@@ -77,7 +78,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 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.
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
@@ -92,10 +93,12 @@ An elementary functionality to run unattended builds is included. See an example
# Upgrading
- backup phpsdk-local.bat
- backup the source trees and any other custom files in the PHP SDK root
- 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 into their respective places
- 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
@@ -107,4 +110,6 @@ The SDK tools are based on the KISS principle and should be kept so. Basic tools
- 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.

View File

@@ -1 +1 @@
2.0.1
2.0.2

View File

@@ -169,6 +169,11 @@ try {
Config::setCurrentCrtName(array_keys($branch)[0]);
}
}
/* The current CRT needs to match the config one. */
$active_crt = getenv("PHP_SDK_VC");
if (Config::getCurrentCrtName() != $active_crt && !$force) {
throw new Exception("Active CRT '$active_crt' differs from the branch CRT '" . Config::getCurrentCrtName() . "'.");
}
if (NULL === Config::getCurrentStabilityName()) {
if ("master" == Config::getCurrentBranchName()) {

Binary file not shown.