com web/rmtools: Integrate the pre snaps and mass rebuild.: bin/pecl_build_discord.bat bin/pecl_build_next.ba t bin/pecl_snap_pre.bat
bin/rmtools_setvars.bat-d ist

Commit: f0831e59e17b7e3efea61433d69effc777702e52 Author: Anatol Belski <ab@php.net> Mon, 31 Jul 2017 13:01:48 +0200 Parents: 67bca0caf0387d6ac7f82bd1c55e408c47889e1d Branches: master Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=f0831e59e17b7e3efea61433d69effc777702e52 Log: Integrate the pre snaps and mass rebuild.. See the comment about the extra adjustment about how to get it rolling. Changed paths: A bin/pecl_build_discord.bat M bin/pecl_build_next.bat D bin/pecl_snap_pre.bat M bin/rmtools_setvars.bat-dist Diff: diff --git a/bin/pecl_build_discord.bat b/bin/pecl_build_discord.bat new file mode 100644 index 0000000..0de5c01 --- /dev/null +++ b/bin/pecl_build_discord.bat @@ -0,0 +1,55 @@ +@ECHO OFF + +if not exist %~dp0rmtools_setvars.bat ( + echo RMTOOLS is not setup, create %~dp0rmtools_setvars.bat + exit /b 3 +) +call %~dp0rmtools_setvars.bat + +for /f "tokens=2-8 delims=.:/ " %%a in ("%date% %time%") do set cur_date=%%c-%%a-%%b_%%d-%%e-%%f.%%g + +set LOG_FILE=%PHP_RMTOOLS_LOG_PATH%\task-pecl-pre-%cur_date%.log +set LOCK_FILE=%PHP_RMTOOLS_LOCK_PATH%\pecl.lock + +if "%1"=="" goto :help +if "%1"=="--help" goto :help +if "%1"=="-h" goto :help +if "%1"=="/?" goto :help +goto :skip_help + +:help +echo ========================================================== +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 ========================================================== +call "%PHP_RMTOOLS_PHP_SDK_ROOT_PATH%\phpsdk-starter.bat" -c vc15 -a x64 -t "%PHP_RMTOOLS_BIN_PATH%\pecl.bat" +GOTO EXIT_LOCKED + +:skip_help + +IF EXIST "%LOCK_FILE%" ( +ECHO Pecl build script is already running. +GOTO EXIT_LOCKED +) + +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. +rem call %BAT_DIR%pecl.bat --config=pecl55_x64 --first %* >> %LOG_FILE% 2<&1 +rem call %BAT_DIR%pecl.bat --config=pecl55_x86 %* >> %LOG_FILE% 2<&1 +rem call %BAT_DIR%pecl.bat --config=pecl54 %* >> %LOG_FILE% 2<&1 +rem call %BAT_DIR%pecl.bat --config=pecl53 --last %* >> %LOG_FILE% 2<&1 +rem +call "%PHP_RMTOOLS_PHP_SDK_ROOT_PATH%\phpsdk-starter.bat" -c vc15 -a x64 -t "%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --task-args "--config=pecl72_x64 --first %*" >> "%LOG_FILE%" 2<&1 +call "%PHP_RMTOOLS_PHP_SDK_ROOT_PATH%\phpsdk-starter.bat" -c vc15 -a x86 -t "%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --task-args "--config=pecl72_x86 --last %*" >> "%LOG_FILE%" 2<&1 + +echo Done.>> "%LOG_FILE%" + +del "%LOCK_FILE%" >> "%LOG_FILE%" 2<&1 + +:EXIT_LOCKED +echo . + diff --git a/bin/pecl_build_next.bat b/bin/pecl_build_next.bat index ad4f761..4166e00 100644 --- a/bin/pecl_build_next.bat +++ b/bin/pecl_build_next.bat @@ -68,7 +68,7 @@ if not exist %PHP_RMTOOLS_PECL_IN_SNAP_PRE_PATH% ( pushd %PHP_RMTOOLS_PECL_IN_SNAP_PRE_PATH% for /r %%i in (*) do ( - call "%PHP_RMTOOLS_BIN_PATH%\pecl_snap_pre.bat" --upload --is-snap --aggregate-mail --package=%%i + call "%PHP_RMTOOLS_BIN_PATH%\pecl_build_discord.bat" --upload --is-snap --aggregate-mail --package=%%i del %%i goto ONLY_ONE ) @@ -81,7 +81,33 @@ if not exist %PHP_RMTOOLS_PECL_IN_SNAP_NOMAIL_PRE_PATH% ( pushd %PHP_RMTOOLS_PECL_IN_SNAP_NOMAIL_PRE_PATH% for /r %%i in (*) do ( - call "%PHP_RMTOOLS_BIN_PATH%\pecl_snap_pre.bat" --upload --is-snap --package=%%i + call "%PHP_RMTOOLS_BIN_PATH%\pecl_build_discord.bat" --upload --is-snap --package=%%i + del %%i + goto ONLY_ONE +) +popd + +if not exist %PHP_RMTOOLS_PECL_IN_PKG_MASS_REBUILD_PATH% ( + echo %PHP_RMTOOLS_PECL_IN_PKG_MASS_REBUILD_PATH% does not exist + exit /b 3 +) +pushd %PHP_RMTOOLS_PECL_IN_PKG_MASS_REBUILD_PATH% + +for /r %%i in (*) do ( + call "%PHP_RMTOOLS_BIN_PATH%\pecl_build_discord.bat" --upload --aggregate-mail --package=%%i + del %%i + goto ONLY_ONE +) +popd + +if not exist %PHP_RMTOOLS_PECL_IN_PKG_MASS_REBUILD_NOMAIL_PATH% ( + echo %PHP_RMTOOLS_PECL_IN_PKG_MASS_REBUILD_NOMAIL_PATH% does not exist + exit /b 3 +) +pushd %PHP_RMTOOLS_PECL_IN_PKG_MASS_REBUILD_NOMAIL_PATH% + +for /r %%i in (*) do ( + call "%PHP_RMTOOLS_BIN_PATH%\pecl_build_discord.bat" --upload --package=%%i del %%i goto ONLY_ONE ) diff --git a/bin/pecl_snap_pre.bat b/bin/pecl_snap_pre.bat deleted file mode 100644 index 0de5c01..0000000 --- a/bin/pecl_snap_pre.bat +++ /dev/null @@ -1,55 +0,0 @@ -@ECHO OFF - -if not exist %~dp0rmtools_setvars.bat ( - echo RMTOOLS is not setup, create %~dp0rmtools_setvars.bat - exit /b 3 -) -call %~dp0rmtools_setvars.bat - -for /f "tokens=2-8 delims=.:/ " %%a in ("%date% %time%") do set cur_date=%%c-%%a-%%b_%%d-%%e-%%f.%%g - -set LOG_FILE=%PHP_RMTOOLS_LOG_PATH%\task-pecl-pre-%cur_date%.log -set LOCK_FILE=%PHP_RMTOOLS_LOCK_PATH%\pecl.lock - -if "%1"=="" goto :help -if "%1"=="--help" goto :help -if "%1"=="-h" goto :help -if "%1"=="/?" goto :help -goto :skip_help - -:help -echo ========================================================== -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 ========================================================== -call "%PHP_RMTOOLS_PHP_SDK_ROOT_PATH%\phpsdk-starter.bat" -c vc15 -a x64 -t "%PHP_RMTOOLS_BIN_PATH%\pecl.bat" -GOTO EXIT_LOCKED - -:skip_help - -IF EXIST "%LOCK_FILE%" ( -ECHO Pecl build script is already running. -GOTO EXIT_LOCKED -) - -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. -rem call %BAT_DIR%pecl.bat --config=pecl55_x64 --first %* >> %LOG_FILE% 2<&1 -rem call %BAT_DIR%pecl.bat --config=pecl55_x86 %* >> %LOG_FILE% 2<&1 -rem call %BAT_DIR%pecl.bat --config=pecl54 %* >> %LOG_FILE% 2<&1 -rem call %BAT_DIR%pecl.bat --config=pecl53 --last %* >> %LOG_FILE% 2<&1 -rem -call "%PHP_RMTOOLS_PHP_SDK_ROOT_PATH%\phpsdk-starter.bat" -c vc15 -a x64 -t "%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --task-args "--config=pecl72_x64 --first %*" >> "%LOG_FILE%" 2<&1 -call "%PHP_RMTOOLS_PHP_SDK_ROOT_PATH%\phpsdk-starter.bat" -c vc15 -a x86 -t "%PHP_RMTOOLS_BIN_PATH%\pecl.bat" --task-args "--config=pecl72_x86 --last %*" >> "%LOG_FILE%" 2<&1 - -echo Done.>> "%LOG_FILE%" - -del "%LOCK_FILE%" >> "%LOG_FILE%" 2<&1 - -:EXIT_LOCKED -echo . - diff --git a/bin/rmtools_setvars.bat-dist b/bin/rmtools_setvars.bat-dist index d042da8..484db6b 100644 --- a/bin/rmtools_setvars.bat-dist +++ b/bin/rmtools_setvars.bat-dist @@ -18,10 +18,17 @@ set PHP_RMTOOLS_TMP_PATH=%PHP_RMTOOLS_ROOT_PATH%\tmp set PHP_RMTOOLS_PECL_IN_PKG_PATH=c:\php-snap-build\in-pkg\release set PHP_RMTOOLS_PECL_IN_PKG_NOMAIL_PATH=c:\php-snap-build\in-pkg\release-nomail -set PHP_RMTOOLS_PECL_IN_PKG_MASS_REBUILD_PATH=c:\php-snap-build\in-pkg\release-mass-rebuild -set PHP_RMTOOLS_PECL_IN_PKG_MASS_REBUILD_NOMAIL_PATH=c:\php-snap-build\in-pkg\release-nomail-mass-rebuild set PHP_RMTOOLS_PECL_IN_SNAP_PATH=c:\php-snap-build\in-pkg\snap set PHP_RMTOOLS_PECL_IN_SNAP_NOMAIL_PATH=c:\php-snap-build\in-pkg\snap-nomail + +rem The below can be used to automate snaps against pre release of PHP or for +rem the mass rebuild. For snaps against some pre PHP, adjust the rss watcher +rem call with --enable-pre. For a mass rebuild, just put all the packages into +rem the corresponding directory. This way, the regular builds and snaps will +rem always have a higher priority over the pre or mass rebuild, thus the +rem normal operation is not hurt. +set PHP_RMTOOLS_PECL_IN_PKG_MASS_REBUILD_PATH=c:\php-snap-build\in-pkg\release-mass-rebuild +set PHP_RMTOOLS_PECL_IN_PKG_MASS_REBUILD_NOMAIL_PATH=c:\php-snap-build\in-pkg\release-nomail-mass-rebuild set PHP_RMTOOLS_PECL_IN_SNAP_PRE_PATH=c:\php-snap-build\in-pkg\snap-pre set PHP_RMTOOLS_PECL_IN_SNAP_NOMAIL_PRE_PATH=c:\php-snap-build\in-pkg\snap-pre-nomail