pajoye Sat Aug 23 23:55:40 2008 UTC
Modified files:
/php-internals-win/script conf_tools.bat snapshot.bat
snapshot_5_3.bat
Log:
- add configure option as configuration
- psdk path are now one single variable
http://cvs.php.net/viewvc.cgi/php-internals-win/script/conf_tools.bat?r1=1.2&r2=1.3&diff_format=u
Index: php-internals-win/script/conf_tools.bat
diff -u php-internals-win/script/conf_tools.bat:1.2
php-internals-win/script/conf_tools.bat:1.3
--- php-internals-win/script/conf_tools.bat:1.2 Fri Aug 22 09:17:42 2008
+++ php-internals-win/script/conf_tools.bat Sat Aug 23 23:55:40 2008
@@ -1,12 +1,20 @@
@ECHO OFF
-SET VC6_INCLUDE=C:\Program Files (x86)\Microsoft
SDK\Include;C:\PROGRA~2\MICROS~2\VC98\ATL\INCLUDE;C:\PROGRA~2\MICROS~2\VC98\INCLUDE;C:\PROGRA~2\MICROS~2\VC98\MFC\INCLUDE
-SET VC6_LIB=C:\Program Files (x86)\Microsoft
SDK\Lib;C:\PROGRA~2\MICROS~2\VC98\LIB;C:\PROGRA~2\MICROS~2\VC98\MFC\LIB
-SET VC6_PATH=c:\Program Files (x86)\Microsoft SDK\Bin;c:\Program Files
(x86)\Microsoft
SDK\Bin\WinNT;c:\PROGRA~2\MICROS~2\Common\msdev98\BIN;c:\PROGRA~2\MICROS~2\VC98\BIN;c:\PROGRA~2\MICROS~2\Common\TOOLS\WINNT;c:\PROGRA~2\MICROS~2\Common/TOOLS
-SET VC9_INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio
9.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio
9.0\VC\INCLUDE;C:\Program Files\\Microsoft
SDKs\Windows\v6.0A\include;C:\Program Files (x86)\Microsoft Visual Studio .NET
2003\SDK\v1.1\include\
-SET VC9_LIB=C:\Program Files (x86)\Microsoft Visual Studio
9.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Microsoft Visual Studio
9.0\VC\LIB;C:\Program Files\\Microsoft SDKs\Windows\v6.0A\lib;C:\Program Files
(x86)\Microsoft Visual Studio .NET 2003\SDK\v1.1\Lib\
-SET VC9_PATH=C:\Program Files (x86)\Microsoft Visual Studio
9.0\Common7\IDE;C:\Program Files (x86)\Microsoft Visual Studio
9.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio
9.0\Common7\Tools;C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\Program
Files (x86)\Microsoft Visual Studio 9.0\VC\VCPackages;C:\Program
Files\\Microsoft
SDKs\Windows\v6.0A\bin;C:\Perl\site\bin;C:\Perl\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem
+SET PSDK_200302_DIR=C:\Program Files\Microsoft SDK
+SET VC6_DIR=C:\Program Files\Microsoft Visual Studio
+SET PSDK_61_DIR=C:\Program Files\Microsoft SDKs\Windows\v6.1
+SET VC9_DIR=C:\Program Files\Microsoft Visual Studio 9.0
+
+SET
VC6_INCLUDE=%PSDK_200302_DIR%\Include;%VC6_DIR%\VC98\ATL\Include;%VC6_DIR%\VC98\Include;%VC6_DIR%\VC98\MFC\Include
+SET VC6_LIB=%PSDK_200302_DIR%\Lib;%VC6_DIR%\VC98\LIB;%VC6_DIR%\VC98\MFC\LIB
+SET
VC6_PATH=%PSDK_200302_DIR%\Bin;%PSDK_200302_DIR%\Bin\WinNT;%VC6_DIR%\Common\msdev98\BIN;%VC6_DIR%\VC98\BIN;%VC6_DIR%\Common\TOOLS\WINNT;%VC6_DIR%\Common/TOOLS
+
+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
+
+SET PHP_CVSROOT=-d :pserver:[EMAIL PROTECTED]:/repository
SET PUTTYBASE=C:\Program Files (x86)\PUTTY\
SET REMOTE_USER=edink
SET [EMAIL PROTECTED]
http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?r1=1.7&r2=1.8&diff_format=u
Index: php-internals-win/script/snapshot.bat
diff -u php-internals-win/script/snapshot.bat:1.7
php-internals-win/script/snapshot.bat:1.8
--- php-internals-win/script/snapshot.bat:1.7 Fri Aug 22 09:17:42 2008
+++ php-internals-win/script/snapshot.bat Sat Aug 23 23:55:40 2008
@@ -41,7 +41,9 @@
:CVS
-cvs -d :pserver:[EMAIL PROTECTED]:/repository -z3 checkout -r %BRANCH% -d
%DEST% php5 > %START%\cvs.log 2<&1
+REM cvs -d :pserver:[EMAIL PROTECTED]:/repository -z3 checkout -r %BRANCH% -d
%DEST% php5 > %START%\cvs.log 2<&1
+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
2<&1
echo Testing %DEST%...
IF EXIST %DEST% GOTO DEST_EXISTS
ECHO CVS ERROR
@@ -51,7 +53,7 @@
cd %DEST%
call buildconf.bat > %START%\buildconf.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%\configure.log 2<&1
+call configure.bat %CONFIGURE_ARGS% > %START%\configure.log 2<&1
nmake snap > %START%\compile.log 2<&1
http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot_5_3.bat?r1=1.1&r2=1.2&diff_format=u
Index: php-internals-win/script/snapshot_5_3.bat
diff -u php-internals-win/script/snapshot_5_3.bat:1.1
php-internals-win/script/snapshot_5_3.bat:1.2
--- php-internals-win/script/snapshot_5_3.bat:1.1 Thu Aug 7 17:04:33 2008
+++ php-internals-win/script/snapshot_5_3.bat Sat Aug 23 23:55:40 2008
@@ -1,6 +1,10 @@
@ECHO OFF
-CALL C:\php-sdk\bin\phpsdk_setvars.bat
+SET PHP_SDK_SCRIPT_PATH=%~dp0
+CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat
-cd %PHP_SDK_PATH%\vc6\x86
+cd %PHP_SDK_PATH%\php_5_3\vc6\x86
+
+SET CONFIGURE_ARGS=--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
+SET PHP_MODULE=php5
CALL snapshot.bat 6 PHP_5_3 snap53
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
