Commit:    31351e1f243eb6d7e2fb563d746039d81fbbefe2
Author:    Anatol Belski <[email protected]>         Sat, 19 Nov 2016 16:55:05 +0100
Parents:   428f9cb070de3cd60f6dc99ace2ea3607b0df98d
Branches:  master

Link:       
http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=31351e1f243eb6d7e2fb563d746039d81fbbefe2

Log:
adapt pecl_build_all

Changed paths:
  M  bin/pecl_build_all.bat


Diff:
diff --git a/bin/pecl_build_all.bat b/bin/pecl_build_all.bat
index 58a2904..408ace8 100644
--- a/bin/pecl_build_all.bat
+++ b/bin/pecl_build_all.bat
@@ -5,10 +5,9 @@ if "%PHP_SDK_ROOT_PATH%"=="" (
        echo PHP SDK is not setup
        exit /b 3
 )
-call %dp0rmtools_setvars.bat 
 
-set yyyy=%date:~6,4%
-set mm=%date:~3,2%
+set yyyy=%date:~-4%
+set mm=%date:~4,2%
 set dd=%date:~0,2%
 
 set hh=%time:~0,2%
@@ -17,6 +16,8 @@ set nn=%time:~3,2%
 set ss=%time:~6,2%
 set cur_date=%yyyy%%mm%%dd%-%hh%%nn%%ss%
 
+call %~dp0rmtools_setvars.bat 
+
 set LOG_FILE=%PHP_RMTOOLS_LOG_PATH%\task-pecl-%cur_date%.log
 set LOCK_FILE=%PHP_RMTOOLS_LOCK_PATH%\pecl.lock
 
@@ -32,14 +33,16 @@ echo This is the PECL build batch script. You can see the 
help
 echo output of the underlaying worker below. Note that you HAVE
 echo TO ommit the --config option when running this batch.
 echo ==========================================================
-"%PHP_RMTOOLS_BIN_PATH%\pecl.bat"
-GOTO EXIT_LOCKED
+call "%PHP_SDK_ROOT_PATH%\phpsdk-starter.bat" -c vc14 -a x64 -t 
"%PHP_RMTOOLS_BIN_PATH%\pecl.bat"
+echo .
+exit /b 0
 
 :skip_help
 
 IF EXIST "%LOCK_FILE%" (
        ECHO Pecl build script is already running.
-       GOTO EXIT_LOCKED
+       echo .
+       exit /b 3
 )
 
 ECHO running > "%LOCK_FILE%"
@@ -47,19 +50,19 @@ ECHO running > "%LOCK_FILE%"
 rem Notice the --first and the --last calls marked, that's important
 rem to maintain the state between call for the same package. For instance
 rem if --aggregate-mail is used.
-call "%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --config=pecl70_x64 --first %* >> 
"%LOG_FILE%" 2<&1
-call "%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --config=pecl70_x86 %* >> "%LOG_FILE%" 
2<&1
-call "%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --config=pecl56_x64 %* >> "%LOG_FILE%" 
2<&1
-call "%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --config=pecl56_x86 %* >> "%LOG_FILE%" 
2<&1
-call "%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --config=pecl55_x64 %* >> "%LOG_FILE%" 
2<&1
-call "%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --config=pecl55_x86 %* >> "%LOG_FILE%" 
2<&1
-call "%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --config=pecl54 %* >> "%LOG_FILE%" 2<&1
-call "%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --config=pecl53 --last %* >> 
"%LOG_FILE%" 2<&1
+call "%PHP_SDK_ROOT_PATH%\phpsdk-starter.bat" -c vc14 -a x64 -t 
"%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --task-args "--config=pecl70_x64 --first %*" 
>> "%LOG_FILE%" 2<&1
+call "%PHP_SDK_ROOT_PATH%\phpsdk-starter.bat" -c vc14 -a x64 -t 
"%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --task-args "--config=pecl70_x86 %*" >> 
"%LOG_FILE%" 2<&1
+call "%PHP_SDK_ROOT_PATH%\phpsdk-starter.bat" -c vc14 -a x64 -t 
"%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --task-args "--config=pecl56_x64 %*" >> 
"%LOG_FILE%" 2<&1
+call "%PHP_SDK_ROOT_PATH%\phpsdk-starter.bat" -c vc14 -a x64 -t 
"%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --task-args "--config=pecl56_x86 %*" >> 
"%LOG_FILE%" 2<&1
+call "%PHP_SDK_ROOT_PATH%\phpsdk-starter.bat" -c vc14 -a x64 -t 
"%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --task-args "--config=pecl55_x64 %*" >> 
"%LOG_FILE%" 2<&1
+call "%PHP_SDK_ROOT_PATH%\phpsdk-starter.bat" -c vc14 -a x64 -t 
"%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --task-args "--config=pecl55_x86 %*" >> 
"%LOG_FILE%" 2<&1
+call "%PHP_SDK_ROOT_PATH%\phpsdk-starter.bat" -c vc14 -a x64 -t 
"%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --task-args "--config=pecl54 %*" >> 
"%LOG_FILE%" 2<&1
+call "%PHP_SDK_ROOT_PATH%\phpsdk-starter.bat" -c vc14 -a x64 -t 
"%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --task-args "--config=pecl53 --last %*" >> 
"%LOG_FILE%" 2<&1
 
 echo Done.>> "%LOG_FILE%"
 
 del "%LOCK_FILE%" >> "%LOG_FILE%" 2<&1
 
-:EXIT_LOCKED
 echo .
+exit /b 0


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to