Compare commits

..

11 Commits

Author SHA1 Message Date
Anatol Belski
d552f7118b reached first stable, 2.0.0 final 2017-03-30 17:53:34 +02:00
Anatol Belski
f77a7e791a Merge branch 'new_binary_tools'
* new_binary_tools: (141 commits)
  yet more reword
  typo
  rephrase readme
  bump version
  improve crt usability check with multiple choices
  fix condition
  don't check for sdk 8.1 for vc15 and up, only vc14 is relevant
  extend readme with vc15 support
  version++
  add new line
  add dedicated vc15 starter scripts
  vc15 support, more to follow
  add vswhere
  add lemon to the list
  beta2 now
  prepare for beta1
  provide lemon
  upgrade to 7.1.0, seems fine so far
  downgrade the bundled to 7.0.12 for now
  fix graceful exit
  ...
2017-03-30 17:48:38 +02:00
Anatol Belski
024c694807 yet more reword 2017-03-30 01:48:53 +02:00
Anatol Belski
5c7c222e8f typo 2017-03-30 01:42:39 +02:00
Anatol Belski
9fe493edf7 rephrase readme 2017-03-30 01:42:09 +02:00
Anatol Belski
5d51577cd5 bump version 2017-03-20 15:39:32 +01:00
Anatol Belski
cad50539cf improve crt usability check with multiple choices 2017-03-20 15:38:07 +01:00
Anatol Belski
6b50dabf00 fix condition 2017-03-13 18:39:15 +01:00
Anatol Belski
f5f5620c55 don't check for sdk 8.1 for vc15 and up, only vc14 is relevant 2017-03-13 18:22:19 +01:00
Anatol Belski
139ea9a86d extend readme with vc15 support 2017-03-09 15:29:12 +01:00
Anatol Belski
cf054fd362 version++ 2017-03-09 15:28:22 +01:00
4 changed files with 27 additions and 20 deletions

View File

@@ -8,11 +8,11 @@ The PHP SDK itself and the SDK own tools are licensed under the BSD 2-Clause lic
# Overview
The PHP SDK 2.0 is compatible with PHP 7.0 and above. The compatibility with older versions, eq. php-sdk-binary-tools-20110915.zip available from windows.php.net previously, is kept. Though, some irrelevant tools was removed. 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.
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. 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` must be installed prior SDK usage
- `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

View File

@@ -1 +1 @@
2.0.0beta2
2.0.0

View File

@@ -64,23 +64,24 @@ if /i "%1"=="vc14" (
)
set TMPKEY=
rem get sdk dir
if /i "%PHP_SDK_OS_ARCH%"=="x64" (
set TMPKEY=HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v8.1
) else (
set TMPKEY=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.1
)
for /f "tokens=2*" %%a in ('reg query "!TMPKEY!" /v InstallationFolder') do (
if exist "%%b\Include\um\Windows.h" (
set PHP_SDK_WIN_SDK_DIR=%%b
if /i "%PHP_SDK_VC%"=="vc14" (
rem get sdk dir
if /i "%PHP_SDK_OS_ARCH%"=="x64" (
set TMPKEY=HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v8.1
) else (
set TMPKEY=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.1
)
for /f "tokens=2*" %%a in ('reg query "!TMPKEY!" /v InstallationFolder') do (
if exist "%%b\Include\um\Windows.h" (
set PHP_SDK_WIN_SDK_DIR=%%b
)
)
if not defined PHP_SDK_WIN_SDK_DIR (
echo Windows SDK not found.
goto out_error;
)
set TMPKEY=
)
if not defined PHP_SDK_WIN_SDK_DIR (
echo Windows SDK not found.
goto out_error;
)
set TMPKEY=
if /i "%PHP_SDK_ARCH%"=="x64" (
if /i "%1"=="vc14" (

View File

@@ -134,8 +134,14 @@ class Config
throw new Exception("More than one CRT is available for branch '" . self::$currentBranchName . "', pass one explicitly.");
}
$crt = array_keys($branches[self::$currentBranchName])[0];
if ($cur_crt != $crt) {
$cur_crt_usable = false;
foreach (array_keys($branches[self::$currentBranchName]) as $crt) {
if ($cur_crt == $crt) {
$cur_crt_usable = true;
break;
}
}
if (!$cur_crt_usable) {
throw new Exception("The passed CRT '$cur_crt' doesn't match any availbale for branch '" . self::$currentBranchName . "'");
}
$data = $branches[self::$currentBranchName][$cur_crt];