pajoye Sat Oct 25 16:51:28 2008 UTC
Modified files:
/php-internals-win/script conf_tools.bat phpsdk_buildtree.bat
phpsdk_setvars.bat snapshot.bat
snapshot_5_3.bat
Log:
- update config
- add support for already downloaded sources instead of cvs
- add installer build script call to snapshot.bat
http://cvs.php.net/viewvc.cgi/php-internals-win/script/conf_tools.bat?r1=1.3&r2=1.4&diff_format=u
Index: php-internals-win/script/conf_tools.bat
diff -u php-internals-win/script/conf_tools.bat:1.3
php-internals-win/script/conf_tools.bat:1.4
--- php-internals-win/script/conf_tools.bat:1.3 Sat Aug 23 23:55:40 2008
+++ php-internals-win/script/conf_tools.bat Sat Oct 25 16:51:28 2008
@@ -1,3 +1,5 @@
+REM $Id: conf_tools.bat,v 1.4 2008/10/25 16:51:28 pajoye Exp $
+
@ECHO OFF
SET PSDK_200302_DIR=C:\Program Files\Microsoft SDK
@@ -10,14 +12,20 @@
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_SHELL=C:\WINDOWS\system32\cmd.exe /E:ON /V:ON /T:0E /K "C:\Program
Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd"
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 VC9_X64_INCLUDE=%VC9_DIR%\VC\Include;C:\Program Files\Microsoft
SDKs\Windows\v6.1\Include;C:\Program Files\Microsoft
SDKs\Windows\v6.1\Include\gl;%VC9_DIR%VC\ATLMFC\INCLUDE;
+SET VC9_X64_LIB=%VC9_DIR%\VC\Lib\amd64;C:\Program Files\Microsoft
SDKs\Windows\v6.1\Lib\x64;%VC9_DIR%\VC\ATLMFC\LIB\AMD64;
+SET
VC9_X64_PATH=%VC9_DIR%\VC\Bin\x86_amd64;%VC9_DIR%\VC\Bin;%VC9_DIR%\VC\vcpackages;%VC9_DIR%\Common7\IDE;C:\Program
Files\Microsoft
SDKs\Windows\v6.1\Bin;C:\WINDOWS\Microsoft.NET\Framework64\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework64\v2.0.50727;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\Perl\site\bin;C:\Perl\bin;C:\Program
Files\PHP\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;c:\win2k3cd;C:\Program
Files\cvsnt;C:\Program Files\WinSCP\;C:\Program Files\CVSNT\
+
SET PHP_CVSROOT=-d :pserver:[EMAIL PROTECTED]:/repository
-SET PUTTYBASE=C:\Program Files (x86)\PUTTY\
-SET REMOTE_USER=edink
-SET [EMAIL PROTECTED]
-SET REMOTE_PATH=/local/sites/snaps.php.net/www/win32
+SET PUTTYBASE=C:\Program Files\PUTTY\
+SET SSH_USER=snaps
+SET SSH_HOST=example.com
+SET SSH_KEY= d:\php-sdk\keys\nameofyourkey.ppk
+SET REMOTE_PATH=/home/web/windows.php.net/docroot/downloads/snaps
SET HOMEPATH=\Documents and Settings\pierre
SET HOMEDRIVE=C:
http://cvs.php.net/viewvc.cgi/php-internals-win/script/phpsdk_buildtree.bat?r1=1.2&r2=1.3&diff_format=u
Index: php-internals-win/script/phpsdk_buildtree.bat
diff -u php-internals-win/script/phpsdk_buildtree.bat:1.2
php-internals-win/script/phpsdk_buildtree.bat:1.3
--- php-internals-win/script/phpsdk_buildtree.bat:1.2 Sun Aug 24 11:21:02 2008
+++ php-internals-win/script/phpsdk_buildtree.bat Sat Oct 25 16:51:28 2008
@@ -1,3 +1,5 @@
+REM $Id: phpsdk_buildtree.bat,v 1.3 2008/10/25 16:51:28 pajoye Exp $
+
@echo off
IF "%1" EQU "" GOTO Help
http://cvs.php.net/viewvc.cgi/php-internals-win/script/phpsdk_setvars.bat?r1=1.2&r2=1.3&diff_format=u
Index: php-internals-win/script/phpsdk_setvars.bat
diff -u php-internals-win/script/phpsdk_setvars.bat:1.2
php-internals-win/script/phpsdk_setvars.bat:1.3
--- php-internals-win/script/phpsdk_setvars.bat:1.2 Wed Jul 30 07:35:19 2008
+++ php-internals-win/script/phpsdk_setvars.bat Sat Oct 25 16:51:28 2008
@@ -1,12 +1,14 @@
-::phpsdk.bat
+REM $Id: phpsdk_setvars.bat,v 1.3 2008/10/25 16:51:28 pajoye Exp $
+
@ECHO OFF
-:: Add skd\bin directory to the path
+REM Add skd\bin directory to the path
SET PHP_SDK_SCRIPT_PATH=%~dp0
-SET PHP_SDK_BIN_PATH=%PHP_SDK_SCRIPT_PATH%\..\bin\
+SET PHP_SDK_BIN_PATH=%PHP_SDK_SCRIPT_PATH%\..\bin
+SET PHP_SDK_PATH=%PHP_SDK_SCRIPT_PATH%\..
-SET PATH=%PATH%;%PHP_SDK_SCRIPT_PATH%;%PHP_SDK_BIN_PATH%
+SET PATH=%PATH%;%PHP_SDK_BIN_PATH%;%PHP_SDK_SCRIPT_PATH%
-:: Set BISON_SIMPLE
-SET BISON_SIMPLE=%PHP_SDK_BIN_PATH%bison.simple
+REM Set BISON_SIMPLE
+SET BISON_SIMPLE=%PHP_SDK_BIN_PATH%\bison.simple
http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?r1=1.8&r2=1.9&diff_format=u
Index: php-internals-win/script/snapshot.bat
diff -u php-internals-win/script/snapshot.bat:1.8
php-internals-win/script/snapshot.bat:1.9
--- php-internals-win/script/snapshot.bat:1.8 Sat Aug 23 23:55:40 2008
+++ php-internals-win/script/snapshot.bat Sat Oct 25 16:51:28 2008
@@ -1,3 +1,5 @@
+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
http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot_5_3.bat?r1=1.2&r2=1.3&diff_format=u
Index: php-internals-win/script/snapshot_5_3.bat
diff -u php-internals-win/script/snapshot_5_3.bat:1.2
php-internals-win/script/snapshot_5_3.bat:1.3
--- php-internals-win/script/snapshot_5_3.bat:1.2 Sat Aug 23 23:55:40 2008
+++ php-internals-win/script/snapshot_5_3.bat Sat Oct 25 16:51:28 2008
@@ -1,10 +1,30 @@
+REM $Id: snapshot_5_3.bat,v 1.3 2008/10/25 16:51:28 pajoye Exp $
+
@ECHO OFF
SET PHP_SDK_SCRIPT_PATH=%~dp0
-CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat
-cd %PHP_SDK_PATH%\php_5_3\vc6\x86
+REM change the drive
+%~d0
+
+CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat
-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
+IF "%1" == "" (
+ 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
+)
+IF "%1" == "ts" (
+ 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
+)
+
+IF "%1" == "nts" (
+ SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack
--disable-zts --disable-isapi
--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 "%2" == "" (
+ CD %PHP_SDK_PATH%\snap_5_3\sources
+ CALL snapshot_src_download.bat 5.3
+)
+
+CD %PHP_SDK_PATH%\snap_5_3\vc6\x86
+CALL snapshot.bat 6 5.3 snap53_vc6
%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
