]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Sat, 17 Jun 2017 00:00:27 +0000 (02:00 +0200)
committerAnatol Belski <ab@php.net>
Sat, 17 Jun 2017 00:00:27 +0000 (02:00 +0200)
* PHP-7.1:
  Next round on AppVeyor reliability.

1  2 
appveyor/build.bat
appveyor/build_task.bat
appveyor/test.bat
appveyor/test_task.bat

Simple merge
index b2f029a145e73c9785d525427eb46c844fc875b3,4b59580cb77225dbba128ad84beff3744b6e65fb..6a2bf2dbc08ca43e11681d906ad29403f3ac7d26
@@@ -19,20 -19,21 +19,20 @@@ set STABILITY=stagin
  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 --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% --crt %PHP_BUILD_CRT%
 -cmd /c phpsdk_deps --update --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR%
++cmd /c phpsdk_deps --update --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% --crt %PHP_BUILD_CRT%
  if %errorlevel% neq 0 exit /b 3
  
- call buildconf.bat --force
+ cmd /c buildconf.bat --force
  if %errorlevel% neq 0 exit /b 3
  
  if "%THREAD_SAFE%" equ "0" set ADD_CONF=--disable-zts
  
 -set EXT_EXCLUDE_FROM_TEST=snmp,oci8_12c,pdo_oci,pdo_odbc,odbc,pdo_firebird,interbase,ldap,imap,dba
 +set EXT_EXCLUDE_FROM_TEST=snmp,oci8_12c,pdo_oci,pdo_odbc,odbc,pdo_firebird,interbase,ldap,imap
  if "%OPCACHE%" equ "0" set EXT_EXCLUDE_FROM_TEST=%EXT_EXCLUDE_FROM_TEST%,opcache
  
- call configure.bat ^
+ cmd /c configure.bat ^
        --enable-snapshot-build ^
        --disable-debug-pack ^
 -      --with-mcrypt=shared ^
        --enable-com-dotnet=shared ^
        --without-analyzer ^
        --enable-object-out-dir=%PHP_BUILD_OBJ_DIR% ^
Simple merge
Simple merge