pajoye Thu Aug 7 20:16:01 2008 UTC
Modified files:
/php-internals-win/script snapshot.bat
Log:
- pdo_oic8 and fix unlock snapshot.bat
http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?r1=1.2&r2=1.3&diff_format=u
Index: php-internals-win/script/snapshot.bat
diff -u php-internals-win/script/snapshot.bat:1.2
php-internals-win/script/snapshot.bat:1.3
--- php-internals-win/script/snapshot.bat:1.2 Thu Aug 7 17:18:12 2008
+++ php-internals-win/script/snapshot.bat Thu Aug 7 20:16:01 2008
@@ -1,9 +1,9 @@
@ECHO off
REM Configuration
CALL %PHP_SDK_PATH%\script\conf_tools.bat
-IF EXIST %PHP_SDK_PATH%\snaps.lock
-echo Snapshot script is running, aborted.
-GOTO EXIT
+
+
+IF EXIST %PHP_SDK_PATH%\snaps.lock ECHO Snapshot script is already running &&
GOTO EXIT
SET START=%CD%
echo "LOCKED" > %PHP_SDK_PATH%\snaps.lock
@@ -41,8 +41,8 @@
:CVS
cvs -d :pserver:[EMAIL PROTECTED]:/repository -z3 checkout -r %BRANCH% -d
%DEST% php5 >> %START%\cvs.log 2<&1
-
-IF EXIST %DEST% GOTO DEST_EXISTS
+echo Testing %DEST%...
+IF EXIST %DEST% GOTO DEST_EXISTS
ECHO CVS ERROR
GOTO EXIT
:DEST_EXISTS
@@ -50,7 +50,7 @@
cd %DEST%
call buildconf.bat >> %START%\buildconf.log 2<&1
-call configure.bat --enable-snapshot-build --enable-debug-pack
--disable-fileinfo --with-oci8=C:\php-sdk\oracle\instantclient10\sdk,shared
--with-oci8-11g=C:\php-sdk\oracle\instantclient11\sdk,shared >
%START%\compile.log 2<&1
+call configure.bat --enable-snapshot-build --enable-debug-pack
--disable-fileinfo --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 >
%START%\compile.log 2<&1
nmake snap >> %START%\compile.log 2<&1
@@ -73,7 +73,7 @@
"%PUTTYBASE%pscp.exe" -batch -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk
-l %REMOTE_USER% %START%\compile.log
%SSH_URL%:%REMOTE_PATH%/compile-%_PHPVERSION_SHORT%.log
"%PUTTYBASE%pscp.exe" -batch -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk
-l %REMOTE_USER% %START%\cvs.log
%SSH_URL%:%REMOTE_PATH%/cvs-%_PHPVERSION_SHORT%.log
"%PUTTYBASE%pscp.exe" -batch -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk
-l %REMOTE_USER% %START%\buildconf.log
%SSH_URL%:%REMOTE_PATH%/buildconf-%_PHPVERSION_SHORT%.log
-delete %PHP_SDK_PATH%\snaps.lock
+del %PHP_SDK_PATH%\snaps.lock
GOTO EXIT
:HELP
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
