pajoye Fri Nov 7 09:04:47 2008 UTC
Modified files:
/php-internals-win/script snapshot.bat snapshot_6_0.bat
snapshot_6_0_vc9.bat
Log:
- fix missing option for 6.x NTS build
- stop on error (keep last working snaps online)
http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?r1=1.10&r2=1.11&diff_format=u
Index: php-internals-win/script/snapshot.bat
diff -u php-internals-win/script/snapshot.bat:1.10
php-internals-win/script/snapshot.bat:1.11
--- php-internals-win/script/snapshot.bat:1.10 Sun Nov 2 17:55:28 2008
+++ php-internals-win/script/snapshot.bat Fri Nov 7 09:04:47 2008
@@ -141,6 +141,10 @@
SET PHP_EXE=Release_TS\php.exe
SET NTS_POSTFIX=
SET NTS=ts
+IF NOT EXIST %PHP_EXE% (
+ ECHO Build error.
+ GOTO EXIT
+)
GOTO REMOTE_COPY
:RELEASE_NTS
@@ -148,7 +152,10 @@
SET PHP_EXE=Release\php.exe
SET NTS_POSTFIX=-nts
SET NTS=nts
-
+IF NOT EXIST %PHP_EXE% (
+ ECHO Build error.
+ GOTO EXIT
+)
: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
@@ -158,8 +165,8 @@
FOR %%A IN (%START%\*.log) DO (
ECHO copying %%~nA-%_PHPVERSION_SHORT%-%SNAPDATETIME%.log ...
- COPY %START%\%%~nA.log
%LOG_DIR%\%%~nA-%_PHPVERSION_SHORT%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log
- "%PUTTYBASE%pscp.exe" -batch -q -i %SSH_KEY% -l %SSH_USER%
%LOG_DIR%\%%~nA-%_PHPVERSION_SHORT%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log
%SSH_URL%:%REMOTE_PATH% >>
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
+ COPY %START%\%%~nA.log
%LOG_DIR%\%%~nA-%_PHPVERSION_SHORT%-%VC_VERS%-%ARCH%%NTS_POSTFIX%-%SNAPDATETIME%.log
+ "%PUTTYBASE%pscp.exe" -batch -q -i %SSH_KEY% -l %SSH_USER%
%LOG_DIR%\%%~nA-%_PHPVERSION_SHORT%-%VC_VERS%-%ARCH%%NTS_POSTFIX%-%SNAPDATETIME%.log
%SSH_URL%:%REMOTE_PATH% >>
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
)
FOR %%A IN (%PHP_BUILD_DIR%\*.zip) DO (
@@ -167,7 +174,7 @@
"%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
copy %PHP_BUILD_DIR%\%%~nA.zip %PHP_BUILD_DIR%\%%~nA-%SNAPDATETIME%.zip
)
-echo ************************ 1
+
REM Remove old links and create the "-latest links"
"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% "rm -f"
%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% "rm -f"
%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
@@ -177,7 +184,7 @@
"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% "rm -f"
%REMOTE_PATH%/cache.info >>
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
SET VERSION_INFO=%_PHPVERSION_STRING%%NTS_POSTFIX%-Win32
-echo ************************ 2
+
IF "%PHP_VERSION%"=="5.2" GOTO OLD_NAMING
:CLEAN_NAMING
http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot_6_0.bat?r1=1.1&r2=1.2&diff_format=u
Index: php-internals-win/script/snapshot_6_0.bat
diff -u php-internals-win/script/snapshot_6_0.bat:1.1
php-internals-win/script/snapshot_6_0.bat:1.2
--- php-internals-win/script/snapshot_6_0.bat:1.1 Sat Oct 25 16:50:25 2008
+++ php-internals-win/script/snapshot_6_0.bat Fri Nov 7 09:04:47 2008
@@ -1,5 +1,3 @@
-REM $Id: snapshot_6_0.bat,v 1.1 2008/10/25 16:50:25 pajoye Exp $
-
@ECHO OFF
SET PHP_SDK_SCRIPT_PATH=%~dp0
@@ -11,14 +9,14 @@
SET PHP_MODULE=HEAD
IF "%1" == "" (
- SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack
--without-static-icu
--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 CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack
--without-static-icu
--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
)
IF "%1" == "ts" (
SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack
--without-static-icu
--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
)
IF "%1" == "nts" (
- SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack
--without-static-icu
--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 CONFIGURE_ARGS=--enable-snapshot-build --disable-zts
--disable-isapi --enable-debug-pack --without-static-icu
--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 OLD_PATH=%PATH%
http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot_6_0_vc9.bat?r1=1.1&r2=1.2&diff_format=u
Index: php-internals-win/script/snapshot_6_0_vc9.bat
diff -u php-internals-win/script/snapshot_6_0_vc9.bat:1.1
php-internals-win/script/snapshot_6_0_vc9.bat:1.2
--- php-internals-win/script/snapshot_6_0_vc9.bat:1.1 Sat Oct 25 16:50:25 2008
+++ php-internals-win/script/snapshot_6_0_vc9.bat Fri Nov 7 09:04:47 2008
@@ -1,5 +1,3 @@
-REM $Id: snapshot_6_0_vc9.bat,v 1.1 2008/10/25 16:50:25 pajoye Exp $
-
@ECHO OFF
SET PHP_SDK_SCRIPT_PATH=%~dp0
@@ -18,7 +16,7 @@
)
IF "%1" == "nts" (
- SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack
--without-static-icu
--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 CONFIGURE_ARGS=--enable-snapshot-build --disable-zts
--disable-isapi --enable-debug-pack --without-static-icu
--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 OLD_PATH=%PATH%
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
