From: Anatol Belski <ab@php.net>
Date: Thu, 23 Mar 2017 12:15:30 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~219
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ced36f9b2e85587e9a433b5d60a6d9fb9044a83f;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  adjust deps dir naming scheme
---

ced36f9b2e85587e9a433b5d60a6d9fb9044a83f
diff --cc appveyor/build_task.bat
index 1f5485e8bd,5b88159d66..5ed7117462
--- 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