com php-src: Merge branch 'PHP-7.1': appveyor/build_task.ba t

From: Date: Thu, 23 Mar 2017 12:15:30 +0000
Subject: com php-src: Merge branch 'PHP-7.1': appveyor/build_task.ba t
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-97378@lists.php.net to get a copy of this message
Commit: ced36f9b2e85587e9a433b5d60a6d9fb9044a83f Author: Anatol Belski <ab@php.net> Thu, 23 Mar 2017 13:15:30 +0100 Parents: 4f8b410b06d99326d6767da1bb2f92fbd821cd45 78bacbadfb4277a0b5d41d49e456bca6095433c8 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ced36f9b2e85587e9a433b5d60a6d9fb9044a83f Log: Merge branch 'PHP-7.1' * PHP-7.1: adjust deps dir naming scheme Changed paths: MM appveyor/build_task.bat Diff: diff --cc appveyor/build_task.bat index 1f5485e,5b88159..5ed7117 --- a/appveyor/build_task.bat +++ b/appveyor/build_task.bat @@@ -17,10 -17,10 +17,10 @@@ if /i "%APPVEYOR_REPO_BRANCH:~0,4%" eq set BRANCH=master set STABILITY=staging ) - set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%PHP_SDK_VC%-%PHP_SDK_ARCH%-%BRANCH% + 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% +call phpsdk_deps --update --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% --crt vc15 if %errorlevel% neq 0 exit /b 3 call buildconf.bat --force

« previous php.cvs (#97378) next »