Merge branch 'PHP-7.1'

weltling · weltling · commit ced36f9b2e85 · 2017-03-23T13:15:30.000+01:00
* PHP-7.1:
  adjust deps dir naming scheme
diff --git a/appveyor/build_task.bat b/appveyor/build_task.bat
@@ -17,7 +17,7 @@ if /i "%APPVEYOR_REPO_BRANCH:~0,4%" equ "php-" (
 	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% --crt vc15
diff --git a/appveyor/test_task.bat b/appveyor/test_task.bat
@@ -11,7 +11,7 @@ if /i "%APPVEYOR_REPO_BRANCH:~0,4%" equ "php-" (
 	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 setup MySQL related exts
 set MYSQL_PWD=Password12!

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ if /i "%APPVEYOR_REPO_BRANCH:~0,4%" equ "php-" (`
`17`	`17`	`set BRANCH=master`
`18`	`18`	`set STABILITY=staging`
`19`	`19`	`)`
`20`		`-set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%PHP_SDK_VC%-%PHP_SDK_ARCH%-%BRANCH%`
	`20`	`+set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VC%-%PHP_SDK_ARCH%`
`21`	`21`	`rem SDK is cached, deps info is cached as well`
`22`	`22`	`echo Updating dependencies in %DEPS_DIR%`
`23`	`23`	`call phpsdk_deps --update --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% --crt vc15`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ if /i "%APPVEYOR_REPO_BRANCH:~0,4%" equ "php-" (`
`11`	`11`	`set BRANCH=master`
`12`	`12`	`set STABILITY=staging`
`13`	`13`	`)`
`14`		`-set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%PHP_SDK_VC%-%PHP_SDK_ARCH%-%BRANCH%`
	`14`	`+set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VC%-%PHP_SDK_ARCH%`
`15`	`15`
`16`	`16`	`rem setup MySQL related exts`
`17`	`17`	`set MYSQL_PWD=Password12!`