pajoye Wed Mar 4 22:56:36 2009 UTC Modified files: /php-internals-win/script snapshot.bat snapshot_5_3_vc9x64.bat Log: - fix snaps for x64 http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?r1=1.15&r2=1.16&diff_format=u Index: php-internals-win/script/snapshot.bat diff -u php-internals-win/script/snapshot.bat:1.15 php-internals-win/script/snapshot.bat:1.16 --- php-internals-win/script/snapshot.bat:1.15 Thu Jan 1 03:59:56 2009 +++ php-internals-win/script/snapshot.bat Wed Mar 4 22:56:36 2009 @@ -80,7 +80,7 @@ :CONFIG_VC9_X64 ECHO Setting environment for VC9-x64 SET INCLUDE=%VC9_X64_INCLUDE% -SET LIB=%VC9_LIB% +SET LIB=%VC9_X64_LIB% SET PATH=%VC9_X64_PATH%;%PATH% SET VC_VERS=VC9 SET ARCH=x64 @@ -134,6 +134,11 @@ cd %DEST% IF EXIST Release_TS GOTO RELEASE_TS IF EXIST Release GOTO RELEASE_NTS +IF EXIST x64\Release GOTO X64_RELEASE_NTS +IF EXIST x64\Release_TS GOTO X64_RELEASE_TS + +ECHO Build Error, no release, relase_ts (or x64/) directory +GOTO EXIT :RELEASE_TS SET PHP_BUILD_DIR=Release_TS @@ -155,6 +160,31 @@ ECHO Build error. GOTO EXIT ) +GOTO REMOTE_COPY + +:X64_RELEASE_NTS +SET PHP_BUILD_DIR=x64\Release +SET PHP_EXE=x64\Release\php.exe +SET NTS_POSTFIX=-nts +SET NTS=nts +IF NOT EXIST %PHP_EXE% ( + ECHO Build error. + GOTO EXIT +) +GOTO REMOTE_COPY + +:X64_RELEASE_TS +SET PHP_BUILD_DIR=x64\Release_TS +SET PHP_EXE=x64\Release_TS\php.exe +SET NTS_POSTFIX= +SET NTS=ts +IF NOT EXIST %PHP_EXE% ( + ECHO Build error. + GOTO EXIT +) +GOTO REMOTE_COPY + + :REMOTE_COPY FOR /F "tokens=*" %%A IN ('%PHP_EXE% -r "echo substr(phpversion(),0,3);"') DO SET _PHPVERSION_SHORT=%%A FOR /F "tokens=*" %%A IN ('%PHP_EXE% -r "echo phpversion();"') DO SET _PHPVERSION_STRING=%%A @@ -170,8 +200,10 @@ FOR %%A IN (%PHP_BUILD_DIR%\*.zip) DO ( echo Copying %%~nA-%SNAPDATETIME%.zip ... - "%PUTTYBASE%pscp.exe" -batch -q -i %SSH_KEY% -l %SSH_USER% %PHP_BUILD_DIR%\%%~nA.zip %SSH_URL%:%REMOTE_PATH%/%%~nA-%SNAPDATETIME%.zip >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1 + echo .... %SSH_URL%:%REMOTE_PATH%/%%~nA-%SNAPDATETIME%.zip + echo "%PUTTYBASE%pscp.exe" -batch -q -i %SSH_KEY% -l %SSH_USER% %PHP_BUILD_DIR%\%%~nA.zip %SSH_URL%:%REMOTE_PATH%/%%~nA-%SNAPDATETIME%.zip copy %PHP_BUILD_DIR%\%%~nA.zip %PHP_BUILD_DIR%\%%~nA-%SNAPDATETIME%.zip + "%PUTTYBASE%pscp.exe" -batch -q -i %SSH_KEY% -l %SSH_USER% %PHP_BUILD_DIR%\%%~nA.zip %SSH_URL%:%REMOTE_PATH%/%%~nA-%SNAPDATETIME%.zip >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1 ) @@ -192,9 +224,9 @@ "%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/php-%VERSION_INFO%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.zip %REMOTE_PATH%/php-%PHP_VERSION%%NTS_POSTFIX%-win32-%VC_VERS%-%ARCH%-latest.zip >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1 "%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/php-debug-pack-%VERSION_INFO%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.zip %REMOTE_PATH%/php-debug-pack-%PHP_VERSION%%NTS_POSTFIX%-win32-%VC_VERS%-%ARCH%-latest.zip >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1 "%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/php-test-pack-%_PHPVERSION_STRING%-%SNAPDATETIME%.zip %REMOTE_PATH%/php-test-pack-%_PHPVERSION_SHORT%-latest.zip >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1 -"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/compile-%PHP_VERSION%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log %REMOTE_PATH%/compile-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1 -"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/buildconf-%PHP_VERSION%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log %REMOTE_PATH%/buildconf-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1 -"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/configure-%PHP_VERSION%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log %REMOTE_PATH%/configure-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1 +"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/compile-%PHP_VERSION%-%VC_VERS%-%ARCH%%NTS_POSTFIX%-%SNAPDATETIME%.log %REMOTE_PATH%/compile-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1 +"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/buildconf-%PHP_VERSION%-%VC_VERS%-%ARCH%%NTS_POSTFIX%-%SNAPDATETIME%.log %REMOTE_PATH%/buildconf-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1 +"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/configure-%PHP_VERSION%-%VC_VERS%-%ARCH%%NTS_POSTFIX%-%SNAPDATETIME%.log %REMOTE_PATH%/configure-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1 SET PHP_ZIP_FILE=%PHP_BUILD_DIR%\php-%VERSION_INFO%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.zip GOTO INSTALLER @@ -269,4 +301,4 @@ SET SSH_URL= SET START= SET VC= -SET ZIP_PATH= \ No newline at end of file +SET ZIP_PATH= http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot_5_3_vc9x64.bat?r1=1.1&r2=1.2&diff_format=u Index: php-internals-win/script/snapshot_5_3_vc9x64.bat diff -u php-internals-win/script/snapshot_5_3_vc9x64.bat:1.1 php-internals-win/script/snapshot_5_3_vc9x64.bat:1.2 --- php-internals-win/script/snapshot_5_3_vc9x64.bat:1.1 Sat Oct 25 16:50:25 2008 +++ php-internals-win/script/snapshot_5_3_vc9x64.bat Wed Mar 4 22:56:36 2009 @@ -1,11 +1,4 @@ -REM $Id: snapshot_5_3_vc9x64.bat,v 1.1 2008/10/25 16:50:25 pajoye Exp $ - @ECHO OFF -REM %VC9_SHELL% - -REM CD "C:\Program Files\Microsoft SDKs\Windows\v6.1\" -REM CALL "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd" /x86 /xp /release - SET PHP_SDK_SCRIPT_PATH=%~dp0 REM change the drive @@ -13,15 +6,27 @@ CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat -SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --with-pdo-oci=C:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=C:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=C:\php-sdk\oracle\instantclient11\sdk,shared -SET PHP_MODULE=php5 +CD %PHP_SDK_PATH%\snap_5_3\vc9\x64 + +IF "%1" == "" ( + SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --disable-isapi +) +IF "%1" == "ts" ( + SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --disable-isapi +) + +IF "%1" == "nts" ( + SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --disable-zts --disable-isapi --disable-nsapi +) -CD %PHP_SDK_PATH%\snap_5_3\sources -CALL snapshot_src_download.bat 5.3 +SET PHP_MODULE=php5 -REM XP is the minimum version we support -REM setenv /x86 /xp /release +IF "%2" == "" ( + CD %PHP_SDK_PATH%\snap_5_3\sources + CALL snapshot_src_download.bat 5.3 +) CD %PHP_SDK_PATH%\snap_5_3\vc9\x64 -CALL snapshot.bat 9x64 PHP_5_3 snap53_vc9x64 %PHP_SDK_PATH%\snap_5_3\sources\php-5.3-src-latest.zip +CALL snapshot.bat 9x64 5.3 snap53_vc9x64 %PHP_SDK_PATH%\snap_5_3\sources\php-5.3-src-latest.zip %4 +
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php