parametrize crt, so only one place has to be changed

diff --git a/.appveyor.yml b/.appveyor.yml
index 221dc65d60d59c38b3efc6f08c4adeee55f69eb4..84b8b93066eb45dadc7452146d0d766ffcef463c 100644 (file)
--- 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 357fecfffabbb4f86cb97f84cf16c849e2ca72e4..eecfddaa9fe0de0836583405feac2f03b2a51b4f 100644 (file)
--- 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 5ed71174629a4a24625cbbd3abd9873469c655d0..e44eb7628f79209f4241feb40a2fd6144250ae45 100644 (file)
--- 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 8fb039dba9c2e8760b4d08a5a59fd38081ca6833..ec4b730913eedda98617a2619501de45c822b742 100644 (file)
--- 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