com php-src: parametrize crt, so only one place has to be changed: .appveyor.yml appveyor/build.bat appveyor/build_task.bat appveyor/test.bat
| From: | Anatol Belski | Date: | Thu, 23 Mar 2017 18:27:10 +0000 |
| Subject: | com php-src: parametrize crt, so only one place has to be changed: .appveyor.yml appveyor/build.bat appveyor/build_task.bat appveyor/test.bat | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-97382@lists.php.net to get a copy of this message | ||
Commit: 0f6232675d6607e7f61182ec0b93fc3092feead8
Author: Anatol Belski <ab@php.net> Thu, 23 Mar 2017 19:26:30 +0100
Parents: 1b565f1393f82e0ce0c94806cc7f52c6d9c5e87d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0f6232675d6607e7f61182ec0b93fc3092feead8
Log:
parametrize crt, so only one place has to be changed
Changed paths:
M .appveyor.yml
M appveyor/build.bat
M appveyor/build_task.bat
M appveyor/test.bat
Diff:
diff --git a/.appveyor.yml b/.appveyor.yml
index 221dc65..84b8b93 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -25,6 +25,7 @@ environment:
PHP_BUILD_OBJ_DIR: c:\obj
PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
PHP_BUILD_SDK_BRANCH: php-sdk-2.0.0beta3
+ PHP_BUILD_CRT: vc15
# ext and env setup for tests
#MYSQL_TEST_PASSWD: Password12!
#MYSQL_TEST_USER: root
diff --git a/appveyor/build.bat b/appveyor/build.bat
index 357fecf..eecfdda 100644
--- a/appveyor/build.bat
+++ b/appveyor/build.bat
@@ -23,7 +23,7 @@ if not exist "%PHP_BUILD_CACHE_SDK_DIR%" (
git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git"
--work-tree="%PHP_BUILD_CACHE_SDK_DIR%" checkout --force %SDK_BRANCH%
)
-set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-vc15-%PLATFORM%.bat
+set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-%PHP_BUILD_CRT%-%PLATFORM%.bat
if not exist "%SDK_RUNNER%" (
echo "%SDK_RUNNER%" doesn't exist
exit /b 3
diff --git a/appveyor/build_task.bat b/appveyor/build_task.bat
index 5ed7117..e44eb76 100644
--- a/appveyor/build_task.bat
+++ b/appveyor/build_task.bat
@@ -20,7 +20,7 @@ if /i "%APPVEYOR_REPO_BRANCH:~0,4%" equ "php-" (
set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VC%-%PHP_SDK_ARCH%
rem SDK is cached, deps info is cached as well
echo Updating dependencies in %DEPS_DIR%
-call phpsdk_deps --update --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% --crt vc15
+call phpsdk_deps --update --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% --crt
%PHP_BUILD_CRT%
if %errorlevel% neq 0 exit /b 3
call buildconf.bat --force
diff --git a/appveyor/test.bat b/appveyor/test.bat
index 8fb039d..ec4b730 100644
--- a/appveyor/test.bat
+++ b/appveyor/test.bat
@@ -1,6 +1,6 @@
@echo off
-set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-vc15-%PLATFORM%.bat
+set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-%PHP_BUILD_CRT%-%PLATFORM%.bat
if not exist "%SDK_RUNNER%" (
echo "%SDK_RUNNER%" doesn't exist
exit /b 3