[PHP-CVS] cvs: php-internals-win /script snapshot.bat snapshot_5_3_vc9x64.bat

2009-03-04 Thread Pierre-Alain Joye
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.15r2=1.16diff_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 21
+   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 21
 )
 
 
@@ -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 21
 %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 21
 %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 21
-%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 21
-%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 21
-%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 21
+%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 21
+%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 21
+%PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% 

[PHP-CVS] cvs: php-internals-win /script snapshot.bat

2008-12-31 Thread Pierre-Alain Joye
pajoye  Thu Jan  1 03:59:57 2009 UTC

  Modified files:  
/php-internals-win/script   snapshot.bat 
  Log:
  - fix naming for links
  
http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?r1=1.14r2=1.15diff_format=u
Index: php-internals-win/script/snapshot.bat
diff -u php-internals-win/script/snapshot.bat:1.14 
php-internals-win/script/snapshot.bat:1.15
--- php-internals-win/script/snapshot.bat:1.14  Mon Dec 15 10:53:15 2008
+++ php-internals-win/script/snapshot.bat   Thu Jan  1 03:59:56 2009
@@ -174,10 +174,11 @@
copy %PHP_BUILD_DIR%\%%~nA.zip %PHP_BUILD_DIR%\%%~nA-%SNAPDATETIME%.zip
 )
 
+
 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 21
 %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 21
-%PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% rm -f 
%REMOTE_PATH%/php-test-pack-%_PHPVERSION_STRING%-latest.zip   
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
+%PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% rm -f 
%REMOTE_PATH%/php-test-pack-%_PHPVERSION_SHORT%-latest.zip   
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
 %PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% rm -f 
%REMOTE_PATH%/compile-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log  
 %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
 %PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% rm -f 
%REMOTE_PATH%/buildconf-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log  
 %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
 %PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% rm -f 
%REMOTE_PATH%/configure-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log  
 %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
@@ -189,8 +190,8 @@
 
 :CLEAN_NAMING
 %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 21
-%PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s 
%REMOTE_PATH%/php-debug-pack-%VERSION_INFO%-%SNAPDATETIME%.zip 
%REMOTE_PATH%/php-debug-pack-%_PHPVERSION_STRING%-latest.zip   
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
-%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-%PHP_VERSION%%NTS_POSTFIX%-win32-%VC_VERS%-%ARCH%-latest.zip
   %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
+%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 21
+%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 21
 %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 21
 %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 21
 %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 21



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-internals-win /script snapshot.bat

2008-11-15 Thread Pierre-Alain Joye
pajoye  Sat Nov 15 17:13:24 2008 UTC

  Modified files:  
/php-internals-win/script   snapshot.bat 
  Log:
  - log the installer script
  - remove the {version}-latest.msi before trying to create the link
  
http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?r1=1.11r2=1.12diff_format=u
Index: php-internals-win/script/snapshot.bat
diff -u php-internals-win/script/snapshot.bat:1.11 
php-internals-win/script/snapshot.bat:1.12
--- php-internals-win/script/snapshot.bat:1.11  Fri Nov  7 09:04:47 2008
+++ php-internals-win/script/snapshot.bat   Sat Nov 15 17:13:24 2008
@@ -214,14 +214,15 @@
 echo  3.1 installer
FOR %%A IN (%PHP_ZIP_FILE%) DO (
echo snapshot_installer.bat %PHP_VERSION%.0 %NTS% %VC_VERS% 
%ARCH% %%~fA
-   CALL snapshot_installer.bat %PHP_VERSION%.0 %NTS% %VC_VERS% 
%ARCH% %%~fA
+   CALL snapshot_installer.bat %PHP_VERSION%.0 %NTS% %VC_VERS% 
%ARCH% %%~fA  
%LOG_DIR%\msi_%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log 
21
)
 )
 
 FOR %%A IN (%PHP_BUILD_DIR%\*.msi) DO (
echo Copying %%~nA.msi ...
-   %PUTTYBASE%pscp.exe -batch -q -i %SSH_KEY% -l %SSH_USER% 
%PHP_BUILD_DIR%\%%~nA.msi %SSH_URL%:%REMOTE_PATH%/%%~nA.msi  
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
-   %PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s 
%REMOTE_PATH%/%%~nA.msi 
%REMOTE_PATH%/php-%PHP_VERSION%%NTS_POSTFIX%-win32-%VC_VERS%-%ARCH%-latest.msi 
 %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
+   %PUTTYBASE%pscp.exe -batch -q -i %SSH_KEY% -l %SSH_USER% 
%PHP_BUILD_DIR%\%%~nA.msi %SSH_URL%:%REMOTE_PATH%/%%~nA.msi  
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log 
21
+   %PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% rm 
%REMOTE_PATH%/php-%PHP_VERSION%%NTS_POSTFIX%-win32-%VC_VERS%-%ARCH%-latest.msi 
 %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log 
21
+   %PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s 
%REMOTE_PATH%/%%~nA.msi 
%REMOTE_PATH%/php-%PHP_VERSION%%NTS_POSTFIX%-win32-%VC_VERS%-%ARCH%-latest.msi 
 %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log 
21
 )
 
 %PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% sha1sum 
%REMOTE_PATH%/*-latest.zip %REMOTE_PATH%/*-latest.msi  
%REMOTE_PATH%/sha1sum.txt   
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-internals-win /script snapshot.bat snapshot_6_0.bat snapshot_6_0_vc9.bat

2008-11-07 Thread Pierre-Alain Joye
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.10r2=1.11diff_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 21
+   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 21
 )
 
 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 21
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 21
 %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 21
@@ -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 21
 
 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.1r2=1.2diff_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 

[PHP-CVS] cvs: php-internals-win /script snapshot.bat snapshot_installer.bat

2008-11-02 Thread Pierre-Alain Joye
pajoye  Sun Nov  2 17:55:28 2008 UTC

  Modified files:  
/php-internals-win/script   snapshot.bat snapshot_installer.bat 
  Log:
  - call the installer script from the snap script (optional)
  - clean the env on leaving
  http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?r1=1.9r2=1.10diff_format=u
Index: php-internals-win/script/snapshot.bat
diff -u php-internals-win/script/snapshot.bat:1.9 
php-internals-win/script/snapshot.bat:1.10
--- php-internals-win/script/snapshot.bat:1.9   Sat Oct 25 16:51:28 2008
+++ php-internals-win/script/snapshot.bat   Sun Nov  2 17:55:28 2008
@@ -1,106 +1,262 @@
-REM $Id: snapshot.bat,v 1.9 2008/10/25 16:51:28 pajoye Exp $
-
 @ECHO off
 REM Configuration 
 CALL %PHP_SDK_PATH%\script\conf_tools.bat
 
-
-IF EXIST %PHP_SDK_PATH%\snaps.lock ECHO Snapshot script is already running  
GOTO EXIT
+IF EXIST %PHP_SDK_PATH%\snaps.lock (
+   ECHO Snapshot script is already running
+   GOTO EXIT_LOCKED
+)
 
 SET LOG_DIR=%PHP_SDK_PATH%\log
 SET START=%CD%
 echo LOCKED   %PHP_SDK_PATH%\snaps.lock
+
 IF %1== GOTO HELP
 IF %2== GOTO HELP
 IF %3== GOTO HELP
+IF %4== SET USE_CVS=Yes
+IF %5==msi SET USE_INSTALLER=Yes
+
+SET SRC_ARCHIVE=%4
 SET VC=%1
 SET BRANCH=%2
 SET DEST=%3
+FOR /F TOKENS=1* DELIMS=  %%A IN ('DATE/T') DO SET CALL_DATE=%%B
+FOR /F TOKENS=* %%A IN ('TIME/T') DO SET CALL_TIME=%%A
+SET CALL_DATETIME=%CALL_DATE% %CALL_TIME%
+
+IF %2==5.2 (
+   SET BRANCH=PHP_5_2
+   SET PHP_VERSION=5.2
+   GOTO START
+)
+IF %2==5.3 (
+   SET BRANCH=PHP_5_3
+   SET PHP_VERSION=5.3
+   GOTO START
+)
+IF %2==6.0 (
+   SET BRANCH=HEAD
+   SET PHP_VERSION=6.0
+   GOTO START
+)
+echo Invalid branch name
+GOTO EXIT
 
-SET CUR_PATH=%PATH%
-
+:START
 for /F tokens=1-4 delims=:.,  %%a in ('time/T') do set _TIME=%%a%%b%%c
 for /F tokens=2-5 delims=:.,/  %%a in ('date/T') do set _DATE=%%a%%b%%c
 SET SNAPDATETIME=%_DATE%%_TIME%
 
-IF EXIST %3 rmdir /s /q %3
+REM IF EXIST %3 rmdir /s /q %3
+SET OLD_INCLUDE=%INCLUDE%
+SET OLD_LIB=%LIB%
+SET OLD_PATH=%PATH%
 
 IF %VC%==6 GOTO CONFIG_VC6
 IF %VC%==9 GOTO CONFIG_VC9
+IF %VC%==9x64 GOTO CONFIG_VC9_X64
 echo Invalid VC Version
 GOTO EXIT
 
 :CONFIG_VC6
+ECHO Setting environment for VC6-x86
 SET INCLUDE=%VC6_INCLUDE%
 SET LIB=%VC6_LIB%
 SET PATH=%VC6_PATH%;%PATH%
+SET ARCH=x86
+SET VC_VERS=VC6
 GOTO CVS
 
 :CONFIG_VC9
+ECHO Setting environment for VC9-x86
 SET INCLUDE=%VC9_INCLUDE%
 SET LIB=%VC9_LIB%
 SET PATH=%VC9_PATH%;%PATH%
+SET VC_VERS=VC9
+SET ARCH=x86
+GOTO CVS
+
+:CONFIG_VC9_X64
+ECHO Setting environment for VC9-x64
+SET INCLUDE=%VC9_X64_INCLUDE%
+SET LIB=%VC9_LIB%
+SET PATH=%VC9_X64_PATH%;%PATH%
+SET VC_VERS=VC9
+SET ARCH=x64
 
 :CVS
+IF NOT %USE_CVS%==Yes GOTO USE_LAST_ARCHIVE
+IF EXIST %DEST% RD /Q /S %DEST%
+echo checkout from  cvs %PHP_CVSROOT% -z3 checkout -r %BRANCH% -d %DEST% 
%PHP_MODULE%
+cvs %PHP_CVSROOT% -z3 export -r %BRANCH% -d %DEST% %PHP_MODULE%  
%START%\cvs.log 21
+
+GOTO TEST_DEST
+
+:USE_LAST_ARCHIVE
+ECHO Using archive %SRC_ARCHIVE% ...
+unzip -o -qq %SRC_ARCHIVE%
+FOR /D %%A IN (php-?.?-src-*) DO (
+   SET DIRNAME=%%A
+)
+ECHO Using %DIRNAME% ...
+IF EXIST %DIRNAME%.last GOTO ALREADY_DONE
+IF EXIST %DEST% RD /Q /S %DEST%
+REN %DIRNAME% %DEST%
+
+REM Clean old directories and .last file
+FOR /D %%A IN (php-?.?-src-*) DO (
+   RD /Q /S %%A
+)
+FOR /F tokens=4 delims=- %%A IN (%DIRNAME%) DO SET SNAPDATETIME=%%A
 
-REM cvs -d :pserver:[EMAIL PROTECTED]:/repository -z3 checkout -r %BRANCH% -d 
%DEST% php5  %START%\cvs.log 21
-echo checkout from  %PHP_CVSROOT% -z3 checkout -r %BRANCH% -d %DEST% php5
-cvs %PHP_CVSROOT% -z3 checkout -r %BRANCH% -d %DEST% php5  %START%\cvs.log 
21
+:TEST_DEST
 echo Testing %DEST%...
 IF EXIST %DEST% GOTO DEST_EXISTS 
-ECHO CVS ERROR 
+ECHO CVS or Archive ERROR %DEST% cannot be found
 GOTO EXIT
-:DEST_EXISTS
 
+:DEST_EXISTS
+echo Compiling...
 cd %DEST%
 
+echo Buildconf log for %SNAPDATETIME% called at %CALL_DATETIME%  
%START%\configure.log 21
+echo Buildconf log for %SNAPDATETIME% called at %CALL_DATETIME%  
%START%\buildconf.log
 call buildconf.bat  %START%\buildconf.log 21
-call configure.bat %CONFIGURE_ARGS%  %START%\configure.log 21
 
-nmake snap  %START%\compile.log 21
+echo Configure log for %SNAPDATETIME% called at %CALL_DATETIME%  
%START%\configure.log 21
+cscript /nologo configure.js %CONFIGURE_ARGS%  %START%\configure.log 21
+
+echo Compile log for %SNAPDATETIME% called at %CALL_DATETIME%  
%START%\compile.log
+nmake snap  %START%\compile.log 21
 
 :TRANSFERT
-FOR /F tokens=* %%A IN ('Release_TS\\php.exe -r echo 
substr(phpversion(),0,3);') DO SET _PHPVERSION_SHORT=%%A
-FOR /F tokens=* %%A IN ('Release_TS\\php.exe -r echo phpversion();') DO 
SET _PHPVERSION_STRING=%%A
-FOR /F tokens=* %%A IN ('Release_TS\\php.exe -r echo date('YmdHi');') DO 
SET SNAPDATETIME=%%A
-
-SET PHP_ZIP_FILE=Release_TS\php-%_PHPVERSION_STRING%-Win32.zip
-copy %PHP_ZIP_FILE% %START%\php%_PHPVERSION_SHORT%-win32-%SNAPDATETIME%.zip
-

[PHP-CVS] cvs: php-internals-win /script snapshot.bat

2008-08-13 Thread Pierre-Alain Joye
pajoye  Wed Aug 13 19:43:25 2008 UTC

  Modified files:  
/php-internals-win/script   snapshot.bat 
  Log:
  - #45807, wrong file copied for the debug pack
  
http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?r1=1.4r2=1.5diff_format=u
Index: php-internals-win/script/snapshot.bat
diff -u php-internals-win/script/snapshot.bat:1.4 
php-internals-win/script/snapshot.bat:1.5
--- php-internals-win/script/snapshot.bat:1.4   Fri Aug  8 10:12:34 2008
+++ php-internals-win/script/snapshot.bat   Wed Aug 13 19:43:25 2008
@@ -63,7 +63,7 @@
 copy %PHP_ZIP_FILE% %START%\php%_PHPVERSION_SHORT%-win32-%SNAPDATETIME%.zip
 
 SET PHPDEBUG_ZIP_FILE=Release_TS\php-debug-pack-%_PHPVERSION_STRING%-Win32.zip
-copy %PHP_ZIP_FILE% 
%START%\php%_PHPVERSION_SHORT%-dbgpack-win32-%SNAPDATETIME%.zip
+copy %PHPDEBUG_ZIP_FILE% 
%START%\php%_PHPVERSION_SHORT%-dbgpack-win32-%SNAPDATETIME%.zip
 
 REM Using -i now
 REM %PUTTYBASE%pageant.exe %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-internals-win /script snapshot.bat

2008-08-13 Thread Pierre-Alain Joye
pajoye  Wed Aug 13 21:28:02 2008 UTC

  Modified files:  
/php-internals-win/script   snapshot.bat 
  Log:
  - add a LOG_DIR var, add logs for the ssh transfert and configure, copy the 
log per build in the log dir
  
http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?r1=1.5r2=1.6diff_format=u
Index: php-internals-win/script/snapshot.bat
diff -u php-internals-win/script/snapshot.bat:1.5 
php-internals-win/script/snapshot.bat:1.6
--- php-internals-win/script/snapshot.bat:1.5   Wed Aug 13 19:43:25 2008
+++ php-internals-win/script/snapshot.bat   Wed Aug 13 21:28:01 2008
@@ -5,6 +5,7 @@
 
 IF EXIST %PHP_SDK_PATH%\snaps.lock ECHO Snapshot script is already running  
GOTO EXIT
 
+SET LOG_DIR=%PHP_SDK_PATH%\log
 SET START=%CD%
 echo LOCKED   %PHP_SDK_PATH%\snaps.lock
 IF %1== GOTO HELP
@@ -50,7 +51,7 @@
 cd %DEST%
 
 call buildconf.bat  %START%\buildconf.log 21
-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 21
+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%\configure.log 21
 
 nmake snap  %START%\compile.log 21
 
@@ -68,11 +69,18 @@
 REM Using -i now
 REM %PUTTYBASE%pageant.exe %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk
 %PUTTYBASE%plink.exe -batch -l %REMOTE_USER% -m 
%PHP_SDK_PATH%script\snap_delete_old.sh snaps.php.net
-%PUTTYBASE%pscp.exe -batch -q -i 
%PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% 
%START%\php%_PHPVERSION_SHORT%-dbgpack-win32-%SNAPDATETIME%.zip 
%SSH_URL%:%REMOTE_PATH%
-%PUTTYBASE%pscp.exe -batch -q -i 
%PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% 
%START%\php%_PHPVERSION_SHORT%-win32-%SNAPDATETIME%.zip %SSH_URL%:%REMOTE_PATH%
-%PUTTYBASE%pscp.exe -batch -q -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 -q -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 -q -i 
%PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% 
%START%\buildconf.log %SSH_URL%:%REMOTE_PATH%/buildconf-%_PHPVERSION_SHORT%.log
+%PUTTYBASE%pscp.exe -batch -q -i 
%PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% 
%START%\php%_PHPVERSION_SHORT%-dbgpack-win32-%SNAPDATETIME%.zip 
%SSH_URL%:%REMOTE_PATH%  %LOG_DIR%\scp_%SNAPDATETIME%.log 21
+%PUTTYBASE%pscp.exe -batch -q -i 
%PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% 
%START%\php%_PHPVERSION_SHORT%-win32-%SNAPDATETIME%.zip %SSH_URL%:%REMOTE_PATH% 
 %LOG_DIR%\scp_%SNAPDATETIME%.log 21
+%PUTTYBASE%pscp.exe -batch -q -i 
%PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% 
%START%\compile.log %SSH_URL%:%REMOTE_PATH%/compile-%_PHPVERSION_SHORT%.log  
%LOG_DIR%\scp_%SNAPDATETIME%.log 21
+%PUTTYBASE%pscp.exe -batch -q -i 
%PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% %START%\cvs.log 
%SSH_URL%:%REMOTE_PATH%/cvs-%_PHPVERSION_SHORT%.log  
%LOG_DIR%\scp_%SNAPDATETIME%.log 21
+%PUTTYBASE%pscp.exe -batch -q -i 
%PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% 
%START%\buildconf.log %SSH_URL%:%REMOTE_PATH%/buildconf-%_PHPVERSION_SHORT%.log 
 %LOG_DIR%\scp_%SNAPDATETIME%.log 21
+
+del %START%\php%_PHPVERSION_SHORT%-dbgpack-win32-%SNAPDATETIME%.zip
+del %START%\php%_PHPVERSION_SHORT%-win32-%SNAPDATETIME%.zip
+copy %START%\compile.log %LOG_DIR%\compile_%SNAPDATETIME%.log
+copy %START%\cvs.log %LOG_DIR%\cvs_%SNAPDATETIME%.log
+copy %START%\buildconf.log %LOG_DIR%\buildconf_%SNAPDATETIME%.log
+copy %START%\configure.log %LOG_DIR%\configure_%SNAPDATETIME%.log
 
 GOTO EXIT
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-internals-win /script snapshot.bat

2008-08-08 Thread Pierre-Alain Joye
pajoye  Fri Aug  8 10:12:34 2008 UTC

  Modified files:  
/php-internals-win/script   snapshot.bat 
  Log:
  - add leading zero to the hour, quiet mode for pscp and start a fresh log 
instad of appending to the existing one
  
http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?r1=1.3r2=1.4diff_format=u
Index: php-internals-win/script/snapshot.bat
diff -u php-internals-win/script/snapshot.bat:1.3 
php-internals-win/script/snapshot.bat:1.4
--- php-internals-win/script/snapshot.bat:1.3   Thu Aug  7 20:16:01 2008
+++ php-internals-win/script/snapshot.bat   Fri Aug  8 10:12:34 2008
@@ -40,7 +40,7 @@
 
 :CVS
 
-cvs -d :pserver:[EMAIL PROTECTED]:/repository -z3 checkout -r %BRANCH% -d 
%DEST% php5  %START%\cvs.log 21
+cvs -d :pserver:[EMAIL PROTECTED]:/repository -z3 checkout -r %BRANCH% -d 
%DEST% php5  %START%\cvs.log 21
 echo Testing %DEST%...
 IF EXIST %DEST% GOTO DEST_EXISTS 
 ECHO CVS ERROR 
@@ -49,15 +49,15 @@
 
 cd %DEST%
 
-call buildconf.bat  %START%\buildconf.log 21
+call buildconf.bat  %START%\buildconf.log 21
 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 21
 
-nmake snap  %START%\compile.log 21
+nmake snap  %START%\compile.log 21
 
 :TRANSFERT
 FOR /F tokens=* %%A IN ('Release_TS\\php.exe -r echo 
substr(phpversion(),0,3);') DO SET _PHPVERSION_SHORT=%%A
 FOR /F tokens=* %%A IN ('Release_TS\\php.exe -r echo phpversion();') DO 
SET _PHPVERSION_STRING=%%A
-FOR /F tokens=* %%A IN ('Release_TS\\php.exe -r echo date('YmdGi');') DO 
SET SNAPDATETIME=%%A
+FOR /F tokens=* %%A IN ('Release_TS\\php.exe -r echo date('YmdHi');') DO 
SET SNAPDATETIME=%%A
 
 SET PHP_ZIP_FILE=Release_TS\php-%_PHPVERSION_STRING%-Win32.zip
 copy %PHP_ZIP_FILE% %START%\php%_PHPVERSION_SHORT%-win32-%SNAPDATETIME%.zip
@@ -68,16 +68,17 @@
 REM Using -i now
 REM %PUTTYBASE%pageant.exe %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk
 %PUTTYBASE%plink.exe -batch -l %REMOTE_USER% -m 
%PHP_SDK_PATH%script\snap_delete_old.sh snaps.php.net
-%PUTTYBASE%pscp.exe -batch -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk 
-l %REMOTE_USER% 
%START%\php%_PHPVERSION_SHORT%-dbgpack-win32-%SNAPDATETIME%.zip 
%SSH_URL%:%REMOTE_PATH%
-%PUTTYBASE%pscp.exe -batch -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk 
-l %REMOTE_USER% %START%\php%_PHPVERSION_SHORT%-win32-%SNAPDATETIME%.zip 
%SSH_URL%:%REMOTE_PATH%
-%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
-del %PHP_SDK_PATH%\snaps.lock
+%PUTTYBASE%pscp.exe -batch -q -i 
%PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% 
%START%\php%_PHPVERSION_SHORT%-dbgpack-win32-%SNAPDATETIME%.zip 
%SSH_URL%:%REMOTE_PATH%
+%PUTTYBASE%pscp.exe -batch -q -i 
%PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% 
%START%\php%_PHPVERSION_SHORT%-win32-%SNAPDATETIME%.zip %SSH_URL%:%REMOTE_PATH%
+%PUTTYBASE%pscp.exe -batch -q -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 -q -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 -q -i 
%PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% 
%START%\buildconf.log %SSH_URL%:%REMOTE_PATH%/buildconf-%_PHPVERSION_SHORT%.log
+
 GOTO EXIT
 
 :HELP
 ECHO snapshot ^VC version^ ^branch/tag^ ^destination^
 
 :EXIT
+del %PHP_SDK_PATH%\snaps.lock
 cd %START%



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-internals-win /script snapshot.bat

2008-08-07 Thread Pierre-Alain Joye
pajoye  Thu Aug  7 17:18:13 2008 UTC

  Modified files:  
/php-internals-win/script   snapshot.bat 
  Log:
  add lock
  
http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?r1=1.1r2=1.2diff_format=u
Index: php-internals-win/script/snapshot.bat
diff -u php-internals-win/script/snapshot.bat:1.1 
php-internals-win/script/snapshot.bat:1.2
--- php-internals-win/script/snapshot.bat:1.1   Thu Aug  7 17:04:33 2008
+++ php-internals-win/script/snapshot.bat   Thu Aug  7 17:18:12 2008
@@ -1,9 +1,12 @@
 @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
 
 SET START=%CD%
-
+echo LOCKED   %PHP_SDK_PATH%\snaps.lock
 IF %1== GOTO HELP
 IF %2== GOTO HELP
 IF %3== GOTO HELP
@@ -70,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
 GOTO EXIT
 
 :HELP



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-internals-win /script snapshot.bat

2008-08-07 Thread Pierre-Alain Joye
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.2r2=1.3diff_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 21
-
-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 21
-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 21
+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 21
 
 nmake snap  %START%\compile.log 21
 
@@ -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