com web/rmtools: basic rewrite for pecl scripts: bin/pecl.bat bin/pecl_build_all.bat bin/pecl_build_next.bat
| From: | Anatol Belski | Date: | Wed, 16 Nov 2016 19:37:41 +0000 |
| Subject: | com web/rmtools: basic rewrite for pecl scripts: bin/pecl.bat bin/pecl_build_all.bat bin/pecl_build_next.bat | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-25916@lists.php.net to get a copy of this message | ||
Commit: 0b0651fe7278346753fcd1b36be4f3d6e36ecc9d
Author: Anatol Belski <ab@php.net> Wed, 16 Nov 2016 20:37:41 +0100
Parents: 4615c9923b77528a401eb876f81217815d304343
Branches: master
Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=0b0651fe7278346753fcd1b36be4f3d6e36ecc9d
Log:
basic rewrite for pecl scripts
Changed paths:
M bin/pecl.bat
M bin/pecl_build_all.bat
M bin/pecl_build_next.bat
diff --git a/bin/pecl.bat b/bin/pecl.bat index 6108202..d9ede9c 100644 --- a/bin/pecl.bat +++ b/bin/pecl.bat @@ -1,10 +1,11 @@ @ECHO OFF -SET BAT_DIR=%~dp0 - -set RMTOOLS_BASE_DIR=c:\php-sdk\rmtools-client - -set PECL_PHP_CMD=c:\php-sdk\php\php.exe -d memory_limit=2G +rem must be on the env already +if "%PHP_SDK_ROOT_PATH%"=="" ( + echo PHP SDK is not setup + exit /b 3 +) +call %~dp0rmtools_setvars.bat if "%1"=="" goto :help if "%1"=="--help" goto :help @@ -13,114 +14,20 @@ if "%1"=="/?" goto :help goto :skip_help :help -%PECL_PHP_CMD% %BAT_DIR%\..\script\pecl.php +%PHP_SDK_PHP_CMD% %PHP_RMTOOLS_SCRIPT_PATH%\pecl.php GOTO EXIT_LOCKED :skip_help -CALL c:\php-sdk\bin\phpsdk_setvars.bat - -copy c:\php-sdk\rmtools.base\data\config\credentials_ftps.php %RMTOOLS_BASE_DIR%\data\config\ - - -REM --------VC9-------------- -SET PSDK_61_DIR=C:\Program Files\Microsoft SDKs\Windows\v6.1 -SET VC9_DIR=C:\Program Files (x86)\Microsoft Visual Studio 9.0 -SET VC9_SHELL=C:\WINDOWS\system32\cmd.exe /E:ON /V:ON /T:0E /K "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd" -SET VC9_INCLUDE=%PSDK_61_DIR%\include;%VC9_DIR%\VC\ATLMFC\INCLUDE;%VC9_DIR%\VC\INCLUDE -SET VC9_LIB=%PSDK_61_DIR%\lib;%VC9_DIR%\VC\ATLMFC\LIB;%VC9_DIR%\VC\LIB -SET VC9_PATH=%VC9_DIR%\Common7\IDE;%VC9_DIR%\VC\BIN;%VC9_DIR%\Common7\Tools;%VC9_DIR%\VC\VCPackages;%PSDK_61_DIR%\bin;C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem - -REM SET VC9_X64_INCLUDE=%VC9_DIR%\VC\Include;C:\Program Files\Microsoft SDKs\Windows\v6.1\Include;C:\Program Files\Microsoft SDKs\Windows\v6.1\Include\gl;%VC9_DIR%VC\ATLMFC\INCLUDE; -REM SET VC9_X64_LIB=%VC9_DIR%\VC\Lib\amd64;C:\Program Files\Microsoft SDKs\Windows\v6.1\Lib\x64;%VC9_DIR%\VC\ATLMFC\LIB\AMD64; -REM SET VC9_X64_PATH=%VC9_DIR%\VC\Bin\x86_amd64;%VC9_DIR%\VC\Bin;%VC9_DIR%\VC\vcpackages;%VC9_DIR%\Common7\IDE;C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin;C:\WINDOWS\Microsoft.NET\Framework64\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework64\v2.0.50727;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\Perl\site\bin;C:\Perl\bin;C:\Program Files\PHP\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;c:\win2k3cd;C:\Program Files\cvsnt;C:\Program Files\WinSCP\;C:\Program Files\CVSNT\ - -SET OLD_PATH=%PATH% -SET PATH=%PATH%;%VC9_PATH% -SET LIB=%VC9_LIB% -SET INCLUDE=%VC9_INCLUDE% - -REM --------VC11-------------- -SET VC11_SHELL=%comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat"" x86 - -SET PSDK_80_DIR=C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0 -SET VC11_DIR=C:\Program Files (x86)\Microsoft Visual Studio 11.0 - -SET VC11_INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.0\include\shared;C:\Program Files (x86)\Windows Kits\8.0\include\um;C:\Program Files (x86)\Windows Kits\8.0\include\winrt; -SET VC11_LIB=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\8.0\lib\win8\um\x86; -SET LIBPATH=C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Windows\Microsoft.NET\Framework\v3.5;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\8.0\References\CommonConfiguration\Neutral;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0\ExtensionSDKs\Microsoft.VCLibs\11.0\References\CommonConfiguration\neutral; -SET INCLUDE=%VC11_INCLUDE% -SET LIB=%VC11_LIB% - -REM SET VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\ -REM SET VisualStudioVersion=11.0 -REM SET VS110COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools\ -REM SET VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 11.0\ -REM SET DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\ -REM SET ExtensionSdkDir=C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0\ExtensionSDKs -REM SET WindowsSdkDir=C:\Program Files (x86)\Windows Kits\8.0\ -REM SET WindowsSdkDir_35=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ -REM SET WindowsSdkDir_old=C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\ - -SET VC11_PATH=C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft SDKs\F#\3.0\Framework\v4.0\;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VSTSDB\Deploy;C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Windows\Microsoft.NET\Framework\v3.5;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 11.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\8.0\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX 4.0 Tools;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\Microsoft\Web Platform Installer\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET WebPages\v1.0\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Windows Kits\8.0\Windows Performance Toolkit\ -REM SET OLD_PATH=%PATH% -REM SET PATH=%PATH%;%VC11_PATH% - -SET VC11_X64_PATH=C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\BIN\amd64;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Windows\Microsoft.NET\Framework64\v3.5;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE;C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 11.0\Team Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio 11.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\8.0\bin\x64;C:\Program Files (x86)\Windows Kits\8.0\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX 4.0 Tools\x64;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX4.0 Tools;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\Microsoft\Web Platform Installer\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v1.0\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Windows Kits\8.0\Windows Performance Toolkit\;C:\apps\apache24\php_deps -SET VC11_X64_INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.0\include\shared;C:\Program Files (x86)\Windows Kits\8.0\include\um;C:\Program Files (x86)\Windows Kits\8.0\include\winrt; -SET VC11_X64_LIB=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\LIB\amd64;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\ATLMFC\LIB\amd64;C:\Program Files (x86)\Windows Kits\8.0\lib\win8\um\x64; -REM SET VC11_X64_LIBPATH=C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Windows\Microsoft.NET\Framework64\v3.5;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\LIB\amd64;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\ATLMFC\LIB\amd64;C:\Program Files (x86)\Windows Kits\8.0\References\CommonConfiguration\Neutral;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0\ExtensionSDKs\Microsoft.VCLibs\11.0\References\CommonConfiguration\neutral; -REM SET VC11_X64_SHELL=%comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat"" amd64 - - -REM --------VC14-------------- -SET VC14_SHELL=%comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"" x86 -SET PSDK_81_DIR=C:\Program Files (x86)\Windows Kits\8.1\ -SET VC14_DIR=C:\Program Files (x86)\Microsoft Visual Studio 14.0\ - -REM SET DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\ - -SET VC14_INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\ucrt;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6.1\include\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\shared;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\winrt; - - -SET VC14_LIB=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10240.0\ucrt\x86;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6.1\lib\um\x86;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10240.0\um\x86; - - -SET LIBPATH=C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB;References\CommonConfiguration\Neutral;\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral; - -REM SET INCLUDE=%VC14_INCLUDE% -REM SET LIB=%VC14_LIB% - -REM SET VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC -REM SET VisualStudioVersion=14.0 -REM SET UniversalCRTSdkDir=C:\Program Files (x86)\Windows Kits\10\ -REM SET VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ -REM SET VS140COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\ -REM SET VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 14.0\ -REM SET WindowsSdkDir=C:\Program Files (x86)\Windows Kits\8.1\ -REM SET WindowsSDK_ExecutablePath_x64=C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\x64\ -REM SET WindowsSDK_ExecutablePath_x86=C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\ - -SET VC14_PATH=C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\MSBuild\14.0\bin;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\;C:\Program Files (x86)\Mail Enable\BIN;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\Microsoft\Web Platform Installer\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v1.0\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\apps\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files (x86)\Mail Enable\BIN64;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;%USERPROFILE%\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit\;C:\Users\anatol\.dnx\bin;C:\Program Files (x86)\CMake 2.8\bin - -SET OLD_PATH=%PATH% -SET PATH=%PATH%;%VC14_PATH% - -SET VC14_X64_PATH=C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\MSBuild\14.0\bin\amd64;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN\amd64;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\;C:\Program Files (x86)\Mail Enable\BIN;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\Microsoft\Web Platform Installer\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v1.0\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\apps\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files (x86)\Mail Enable\BIN64;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;%USERPROFILE%\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit\;C:\Users\anatol\.dnx\bin;C:\Program Files (x86)\CMake 2.8\bin - -SET VC14_X64_INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\ucrt;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6.1\include\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\shared;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\winrt; - -SET VC14_X64_LIB=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB\amd64;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB\amd64;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10240.0\ucrt\x64;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6.1\lib\um\x64;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10240.0\um\x64; - -SET VC14_X64_LIBPATH=C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB\amd64;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB\amd64;References\CommonConfiguration\Neutral;\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral; -SET VC14_X64_SHELL=%comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"" amd64 +if not exist "%PHP_SDK_ROOT_PATH%\data\config\credentials_ftps.php" ( + echo FTP config %PHP_SDK_ROOT_PATH%\data\config\credentials_ftps.php not found + exit /b 3 +) REM Run pecl.php -SET BISON_SIMPLE=c:\php-sdk\bin\bison.simple @ECHO ON -%PECL_PHP_CMD% %BAT_DIR%..\script\pecl.php %* +%PHP_SDK_PHP_CMD% %PHP_RMTOOLS_SCRIPT_PATH%\pecl.php %* @ECHO OFF -SET PATH=%OLD_PATH% :EXIT_LOCKED echo . diff --git a/bin/pecl_build_all.bat b/bin/pecl_build_all.bat index 550e74d..58a2904 100644 --- a/bin/pecl_build_all.bat +++ b/bin/pecl_build_all.bat @@ -1,6 +1,11 @@ @ECHO OFF -SET BAT_DIR=%~dp0 +rem must be on the env already +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% @@ -12,8 +17,8 @@ set nn=%time:~3,2% set ss=%time:~6,2% set cur_date=%yyyy%%mm%%dd%-%hh%%nn%%ss% -set LOG_FILE=c:\php-sdk\logs\task-pecl-%cur_date%.log -set RMTOOLS_BASE_DIR=c:\php-sdk\rmtools-client +set LOG_FILE=%PHP_RMTOOLS_LOG_PATH%\task-pecl-%cur_date%.log +set LOCK_FILE=%PHP_RMTOOLS_LOCK_PATH%\pecl.lock if "%1"=="" goto :help if "%1"=="--help" goto :help @@ -27,33 +32,33 @@ 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 ========================================================== -%BAT_DIR%pecl.bat +"%PHP_RMTOOLS_BIN_PATH%\pecl.bat" GOTO EXIT_LOCKED :skip_help -IF EXIST c:\php-sdk\locks\pecl.lock ( -ECHO Pecl build script is already running. -GOTO EXIT_LOCKED +IF EXIST "%LOCK_FILE%" ( + ECHO Pecl build script is already running. + GOTO EXIT_LOCKED ) -ECHO running > c:\php-sdk\locks\pecl.lock +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 %BAT_DIR%pecl.bat --config=pecl70_x64 --first %* >> %LOG_FILE% 2<&1 -call %BAT_DIR%pecl.bat --config=pecl70_x86 %* >> %LOG_FILE% 2<&1 -call %BAT_DIR%pecl.bat --config=pecl56_x64 %* >> %LOG_FILE% 2<&1 -call %BAT_DIR%pecl.bat --config=pecl56_x86 %* >> %LOG_FILE% 2<&1 -call %BAT_DIR%pecl.bat --config=pecl55_x64 %* >> %LOG_FILE% 2<&1 -call %BAT_DIR%pecl.bat --config=pecl55_x86 %* >> %LOG_FILE% 2<&1 -call %BAT_DIR%pecl.bat --config=pecl54 %* >> %LOG_FILE% 2<&1 -call %BAT_DIR%pecl.bat --config=pecl53 --last %* >> %LOG_FILE% 2<&1 - -echo Done.>> %LOG_FILE% - -del c:\php-sdk\locks\pecl.lock >> %LOG_FILE% 2<&1 +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 + +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 107becf..7bbb409 100644 --- a/bin/pecl_build_next.bat +++ b/bin/pecl_build_next.bat @@ -3,12 +3,17 @@ rem pick the next PECL pkg and pass to pecl_build_all.bat rem first try releases, if there aren't any, look for snaps -SET BAT_DIR=%~dp0 +rem must be on the env already +if "%PHP_SDK_ROOT_PATH%"=="" ( + echo PHP SDK is not setup + exit /b 3 +) +call %dp0rmtools_setvars.bat cd c:\pecl-in-pkg for /r %%i in (*) do ( - call %BAT_DIR%pecl_build_all.bat --upload --aggregate-mail --package=%%i + call "%PHP_RMTOOLS_BIN_PATH%\pecl_build_all.bat" --upload --aggregate-mail --package=%%i del %%i goto ONLY_ONE ) @@ -16,7 +21,7 @@ for /r %%i in (*) do ( cd c:\pecl-in-pkg-nomail for /r %%i in (*) do ( - call %BAT_DIR%pecl_build_all.bat --upload --package=%%i + call "%PHP_RMTOOLS_BIN_PATH%\pecl_build_all.bat" --upload --package=%%i del %%i goto ONLY_ONE ) @@ -24,7 +29,7 @@ for /r %%i in (*) do ( cd c:\pecl-in-snap for /r %%i in (*) do ( - call %BAT_DIR%pecl_build_all.bat --upload --is-snap --aggregate-mail --package=%%i + call "%PHP_RMTOOLS_BIN_PATH%\pecl_build_all.bat" --upload --is-snap --aggregate-mail --package=%%i del %%i goto ONLY_ONE ) @@ -32,7 +37,7 @@ for /r %%i in (*) do ( cd c:\pecl-in-snap-nomail for /r %%i in (*) do ( - call %BAT_DIR%pecl_build_all.bat --upload --is-snap --package=%%i + call "%PHP_RMTOOLS_BIN_PATH%\pecl_build_all.bat" --upload --is-snap --package=%%i del %%i goto ONLY_ONE ) @@ -40,7 +45,7 @@ for /r %%i in (*) do ( cd c:\pecl-in-snap-pre for /r %%i in (*) do ( - call %BAT_DIR%pecl_snap_pre.bat --upload --is-snap --aggregate-mail --package=%%i + call "%PHP_RMTOOLS_BIN_PATH%\pecl_snap_pre.bat" --upload --is-snap --aggregate-mail --package=%%i del %%i goto ONLY_ONE ) @@ -48,12 +53,12 @@ for /r %%i in (*) do ( cd c:\pecl-in-snap-nomail-pre for /r %%i in (*) do ( - call %BAT_DIR%pecl_snap_pre.bat --upload --is-snap --package=%%i + call "%PHP_RMTOOLS_BIN_PATH%\pecl_snap_pre.bat" --upload --is-snap --package=%%i del %%i goto ONLY_ONE ) :ONLY_ONE -cd %BAT_DIR% +cd %PHP_RMTOOLS_BIN_PATH% echo .
diff --git a/bin/pecl.bat b/bin/pecl.bat index 6108202..d9ede9c 100644 --- a/bin/pecl.bat +++ b/bin/pecl.bat @@ -1,10 +1,11 @@ @ECHO OFF -SET BAT_DIR=%~dp0 - -set RMTOOLS_BASE_DIR=c:\php-sdk\rmtools-client - -set PECL_PHP_CMD=c:\php-sdk\php\php.exe -d memory_limit=2G +rem must be on the env already +if "%PHP_SDK_ROOT_PATH%"=="" ( + echo PHP SDK is not setup + exit /b 3 +) +call %~dp0rmtools_setvars.bat if "%1"=="" goto :help if "%1"=="--help" goto :help @@ -13,114 +14,20 @@ if "%1"=="/?" goto :help goto :skip_help :help -%PECL_PHP_CMD% %BAT_DIR%\..\script\pecl.php +%PHP_SDK_PHP_CMD% %PHP_RMTOOLS_SCRIPT_PATH%\pecl.php GOTO EXIT_LOCKED :skip_help -CALL c:\php-sdk\bin\phpsdk_setvars.bat - -copy c:\php-sdk\rmtools.base\data\config\credentials_ftps.php %RMTOOLS_BASE_DIR%\data\config\ - - -REM --------VC9-------------- -SET PSDK_61_DIR=C:\Program Files\Microsoft SDKs\Windows\v6.1 -SET VC9_DIR=C:\Program Files (x86)\Microsoft Visual Studio 9.0 -SET VC9_SHELL=C:\WINDOWS\system32\cmd.exe /E:ON /V:ON /T:0E /K "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd" -SET VC9_INCLUDE=%PSDK_61_DIR%\include;%VC9_DIR%\VC\ATLMFC\INCLUDE;%VC9_DIR%\VC\INCLUDE -SET VC9_LIB=%PSDK_61_DIR%\lib;%VC9_DIR%\VC\ATLMFC\LIB;%VC9_DIR%\VC\LIB -SET VC9_PATH=%VC9_DIR%\Common7\IDE;%VC9_DIR%\VC\BIN;%VC9_DIR%\Common7\Tools;%VC9_DIR%\VC\VCPackages;%PSDK_61_DIR%\bin;C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem - -REM SET VC9_X64_INCLUDE=%VC9_DIR%\VC\Include;C:\Program Files\Microsoft SDKs\Windows\v6.1\Include;C:\Program Files\Microsoft SDKs\Windows\v6.1\Include\gl;%VC9_DIR%VC\ATLMFC\INCLUDE; -REM SET VC9_X64_LIB=%VC9_DIR%\VC\Lib\amd64;C:\Program Files\Microsoft SDKs\Windows\v6.1\Lib\x64;%VC9_DIR%\VC\ATLMFC\LIB\AMD64; -REM SET VC9_X64_PATH=%VC9_DIR%\VC\Bin\x86_amd64;%VC9_DIR%\VC\Bin;%VC9_DIR%\VC\vcpackages;%VC9_DIR%\Common7\IDE;C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin;C:\WINDOWS\Microsoft.NET\Framework64\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework64\v2.0.50727;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\Perl\site\bin;C:\Perl\bin;C:\Program Files\PHP\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;c:\win2k3cd;C:\Program Files\cvsnt;C:\Program Files\WinSCP\;C:\Program Files\CVSNT\ - -SET OLD_PATH=%PATH% -SET PATH=%PATH%;%VC9_PATH% -SET LIB=%VC9_LIB% -SET INCLUDE=%VC9_INCLUDE% - -REM --------VC11-------------- -SET VC11_SHELL=%comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat"" x86 - -SET PSDK_80_DIR=C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0 -SET VC11_DIR=C:\Program Files (x86)\Microsoft Visual Studio 11.0 - -SET VC11_INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.0\include\shared;C:\Program Files (x86)\Windows Kits\8.0\include\um;C:\Program Files (x86)\Windows Kits\8.0\include\winrt; -SET VC11_LIB=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\8.0\lib\win8\um\x86; -SET LIBPATH=C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Windows\Microsoft.NET\Framework\v3.5;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\8.0\References\CommonConfiguration\Neutral;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0\ExtensionSDKs\Microsoft.VCLibs\11.0\References\CommonConfiguration\neutral; -SET INCLUDE=%VC11_INCLUDE% -SET LIB=%VC11_LIB% - -REM SET VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\ -REM SET VisualStudioVersion=11.0 -REM SET VS110COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools\ -REM SET VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 11.0\ -REM SET DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\ -REM SET ExtensionSdkDir=C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0\ExtensionSDKs -REM SET WindowsSdkDir=C:\Program Files (x86)\Windows Kits\8.0\ -REM SET WindowsSdkDir_35=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ -REM SET WindowsSdkDir_old=C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\ - -SET VC11_PATH=C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft SDKs\F#\3.0\Framework\v4.0\;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VSTSDB\Deploy;C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Windows\Microsoft.NET\Framework\v3.5;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 11.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\8.0\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX 4.0 Tools;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\Microsoft\Web Platform Installer\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET WebPages\v1.0\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Windows Kits\8.0\Windows Performance Toolkit\ -REM SET OLD_PATH=%PATH% -REM SET PATH=%PATH%;%VC11_PATH% - -SET VC11_X64_PATH=C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\BIN\amd64;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Windows\Microsoft.NET\Framework64\v3.5;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE;C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 11.0\Team Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio 11.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\8.0\bin\x64;C:\Program Files (x86)\Windows Kits\8.0\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX 4.0 Tools\x64;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX4.0 Tools;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\Microsoft\Web Platform Installer\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v1.0\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Windows Kits\8.0\Windows Performance Toolkit\;C:\apps\apache24\php_deps -SET VC11_X64_INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.0\include\shared;C:\Program Files (x86)\Windows Kits\8.0\include\um;C:\Program Files (x86)\Windows Kits\8.0\include\winrt; -SET VC11_X64_LIB=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\LIB\amd64;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\ATLMFC\LIB\amd64;C:\Program Files (x86)\Windows Kits\8.0\lib\win8\um\x64; -REM SET VC11_X64_LIBPATH=C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Windows\Microsoft.NET\Framework64\v3.5;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\LIB\amd64;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\ATLMFC\LIB\amd64;C:\Program Files (x86)\Windows Kits\8.0\References\CommonConfiguration\Neutral;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0\ExtensionSDKs\Microsoft.VCLibs\11.0\References\CommonConfiguration\neutral; -REM SET VC11_X64_SHELL=%comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat"" amd64 - - -REM --------VC14-------------- -SET VC14_SHELL=%comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"" x86 -SET PSDK_81_DIR=C:\Program Files (x86)\Windows Kits\8.1\ -SET VC14_DIR=C:\Program Files (x86)\Microsoft Visual Studio 14.0\ - -REM SET DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\ - -SET VC14_INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\ucrt;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6.1\include\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\shared;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\winrt; - - -SET VC14_LIB=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10240.0\ucrt\x86;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6.1\lib\um\x86;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10240.0\um\x86; - - -SET LIBPATH=C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB;References\CommonConfiguration\Neutral;\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral; - -REM SET INCLUDE=%VC14_INCLUDE% -REM SET LIB=%VC14_LIB% - -REM SET VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC -REM SET VisualStudioVersion=14.0 -REM SET UniversalCRTSdkDir=C:\Program Files (x86)\Windows Kits\10\ -REM SET VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ -REM SET VS140COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\ -REM SET VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 14.0\ -REM SET WindowsSdkDir=C:\Program Files (x86)\Windows Kits\8.1\ -REM SET WindowsSDK_ExecutablePath_x64=C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\x64\ -REM SET WindowsSDK_ExecutablePath_x86=C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\ - -SET VC14_PATH=C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\MSBuild\14.0\bin;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\;C:\Program Files (x86)\Mail Enable\BIN;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\Microsoft\Web Platform Installer\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v1.0\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\apps\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files (x86)\Mail Enable\BIN64;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;%USERPROFILE%\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit\;C:\Users\anatol\.dnx\bin;C:\Program Files (x86)\CMake 2.8\bin - -SET OLD_PATH=%PATH% -SET PATH=%PATH%;%VC14_PATH% - -SET VC14_X64_PATH=C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\MSBuild\14.0\bin\amd64;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN\amd64;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\;C:\Program Files (x86)\Mail Enable\BIN;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\Microsoft\Web Platform Installer\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v1.0\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\apps\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files (x86)\Mail Enable\BIN64;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;%USERPROFILE%\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit\;C:\Users\anatol\.dnx\bin;C:\Program Files (x86)\CMake 2.8\bin - -SET VC14_X64_INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\ucrt;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6.1\include\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\shared;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10240.0\winrt; - -SET VC14_X64_LIB=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB\amd64;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB\amd64;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10240.0\ucrt\x64;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6.1\lib\um\x64;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10240.0\um\x64; - -SET VC14_X64_LIBPATH=C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB\amd64;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB\amd64;References\CommonConfiguration\Neutral;\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral; -SET VC14_X64_SHELL=%comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"" amd64 +if not exist "%PHP_SDK_ROOT_PATH%\data\config\credentials_ftps.php" ( + echo FTP config %PHP_SDK_ROOT_PATH%\data\config\credentials_ftps.php not found + exit /b 3 +) REM Run pecl.php -SET BISON_SIMPLE=c:\php-sdk\bin\bison.simple @ECHO ON -%PECL_PHP_CMD% %BAT_DIR%..\script\pecl.php %* +%PHP_SDK_PHP_CMD% %PHP_RMTOOLS_SCRIPT_PATH%\pecl.php %* @ECHO OFF -SET PATH=%OLD_PATH% :EXIT_LOCKED echo . diff --git a/bin/pecl_build_all.bat b/bin/pecl_build_all.bat index 550e74d..58a2904 100644 --- a/bin/pecl_build_all.bat +++ b/bin/pecl_build_all.bat @@ -1,6 +1,11 @@ @ECHO OFF -SET BAT_DIR=%~dp0 +rem must be on the env already +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% @@ -12,8 +17,8 @@ set nn=%time:~3,2% set ss=%time:~6,2% set cur_date=%yyyy%%mm%%dd%-%hh%%nn%%ss% -set LOG_FILE=c:\php-sdk\logs\task-pecl-%cur_date%.log -set RMTOOLS_BASE_DIR=c:\php-sdk\rmtools-client +set LOG_FILE=%PHP_RMTOOLS_LOG_PATH%\task-pecl-%cur_date%.log +set LOCK_FILE=%PHP_RMTOOLS_LOCK_PATH%\pecl.lock if "%1"=="" goto :help if "%1"=="--help" goto :help @@ -27,33 +32,33 @@ 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 ========================================================== -%BAT_DIR%pecl.bat +"%PHP_RMTOOLS_BIN_PATH%\pecl.bat" GOTO EXIT_LOCKED :skip_help -IF EXIST c:\php-sdk\locks\pecl.lock ( -ECHO Pecl build script is already running. -GOTO EXIT_LOCKED +IF EXIST "%LOCK_FILE%" ( + ECHO Pecl build script is already running. + GOTO EXIT_LOCKED ) -ECHO running > c:\php-sdk\locks\pecl.lock +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 %BAT_DIR%pecl.bat --config=pecl70_x64 --first %* >> %LOG_FILE% 2<&1 -call %BAT_DIR%pecl.bat --config=pecl70_x86 %* >> %LOG_FILE% 2<&1 -call %BAT_DIR%pecl.bat --config=pecl56_x64 %* >> %LOG_FILE% 2<&1 -call %BAT_DIR%pecl.bat --config=pecl56_x86 %* >> %LOG_FILE% 2<&1 -call %BAT_DIR%pecl.bat --config=pecl55_x64 %* >> %LOG_FILE% 2<&1 -call %BAT_DIR%pecl.bat --config=pecl55_x86 %* >> %LOG_FILE% 2<&1 -call %BAT_DIR%pecl.bat --config=pecl54 %* >> %LOG_FILE% 2<&1 -call %BAT_DIR%pecl.bat --config=pecl53 --last %* >> %LOG_FILE% 2<&1 - -echo Done.>> %LOG_FILE% - -del c:\php-sdk\locks\pecl.lock >> %LOG_FILE% 2<&1 +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 + +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 107becf..7bbb409 100644 --- a/bin/pecl_build_next.bat +++ b/bin/pecl_build_next.bat @@ -3,12 +3,17 @@ rem pick the next PECL pkg and pass to pecl_build_all.bat rem first try releases, if there aren't any, look for snaps -SET BAT_DIR=%~dp0 +rem must be on the env already +if "%PHP_SDK_ROOT_PATH%"=="" ( + echo PHP SDK is not setup + exit /b 3 +) +call %dp0rmtools_setvars.bat cd c:\pecl-in-pkg for /r %%i in (*) do ( - call %BAT_DIR%pecl_build_all.bat --upload --aggregate-mail --package=%%i + call "%PHP_RMTOOLS_BIN_PATH%\pecl_build_all.bat" --upload --aggregate-mail --package=%%i del %%i goto ONLY_ONE ) @@ -16,7 +21,7 @@ for /r %%i in (*) do ( cd c:\pecl-in-pkg-nomail for /r %%i in (*) do ( - call %BAT_DIR%pecl_build_all.bat --upload --package=%%i + call "%PHP_RMTOOLS_BIN_PATH%\pecl_build_all.bat" --upload --package=%%i del %%i goto ONLY_ONE ) @@ -24,7 +29,7 @@ for /r %%i in (*) do ( cd c:\pecl-in-snap for /r %%i in (*) do ( - call %BAT_DIR%pecl_build_all.bat --upload --is-snap --aggregate-mail --package=%%i + call "%PHP_RMTOOLS_BIN_PATH%\pecl_build_all.bat" --upload --is-snap --aggregate-mail --package=%%i del %%i goto ONLY_ONE ) @@ -32,7 +37,7 @@ for /r %%i in (*) do ( cd c:\pecl-in-snap-nomail for /r %%i in (*) do ( - call %BAT_DIR%pecl_build_all.bat --upload --is-snap --package=%%i + call "%PHP_RMTOOLS_BIN_PATH%\pecl_build_all.bat" --upload --is-snap --package=%%i del %%i goto ONLY_ONE ) @@ -40,7 +45,7 @@ for /r %%i in (*) do ( cd c:\pecl-in-snap-pre for /r %%i in (*) do ( - call %BAT_DIR%pecl_snap_pre.bat --upload --is-snap --aggregate-mail --package=%%i + call "%PHP_RMTOOLS_BIN_PATH%\pecl_snap_pre.bat" --upload --is-snap --aggregate-mail --package=%%i del %%i goto ONLY_ONE ) @@ -48,12 +53,12 @@ for /r %%i in (*) do ( cd c:\pecl-in-snap-nomail-pre for /r %%i in (*) do ( - call %BAT_DIR%pecl_snap_pre.bat --upload --is-snap --package=%%i + call "%PHP_RMTOOLS_BIN_PATH%\pecl_snap_pre.bat" --upload --is-snap --package=%%i del %%i goto ONLY_ONE ) :ONLY_ONE -cd %BAT_DIR% +cd %PHP_RMTOOLS_BIN_PATH% echo .