Commit: 7649f91593e216cf7eda35c66e7cc13267066d9a
Author: Stephen Zarkos <[email protected]> Thu, 28 Feb
2013 16:17:39 -0800
Parents: 51f8737bcd57a2beb0f6a13044c96c979d3f621b
Branches: master
Link:
http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=7649f91593e216cf7eda35c66e7cc13267066d9a
Log:
VC11 Support
Changed paths:
M client/bin/snap.bat
A client/bin/snapshot_task_nts.bat
A client/bin/snapshot_task_ts.bat
A client/data/branch/php54.ini
A client/data/branch/php55.ini
M client/data/branch/phptrunk.ini
diff --git a/client/bin/snap.bat b/client/bin/snap.bat
index f857059..196ece5 100644
--- a/client/bin/snap.bat
+++ b/client/bin/snap.bat
@@ -1,22 +1,53 @@
-@ECHO OFF
-SET BAT_DIR=%~dp0
-SET PSDK_61_DIR=C:\Program Files\Microsoft SDKs\Windows\v6.1
-SET VC9_DIR=C:\Program Files (x86)\Microsoft Visual Studio 9.0
-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 OLD_PATH=%PATH%
-
-SET PATH=%PATH%;%VC9_PATH%
-SET LIB=%VC9_LIB%
-SET INCLUDE=%VC9_INCLUDE%
-SET BISON_SIMPLE=c:\php-sdk\bin\bison.simple
-
-c:\php-sdk\php\php.exe -d extension_dir=c:\php-sdk\php\ext -d
extension=php_openssl.dll -d extension=php_curl.dll
%BAT_DIR%\..\script\snap.php %*
-SET PATH=%OLD_PATH%
\ No newline at end of file
+@ECHO OFF
+SET BAT_DIR=%~dp0
+
+REM VC9 Support
+SET PSDK_61_DIR=C:\Program Files\Microsoft SDKs\Windows\v6.1
+SET VC9_DIR=C:\Program Files (x86)\Microsoft Visual Studio 9.0
+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 OLD_PATH=%PATH%
+SET PATH=%PATH%;%VC9_PATH%
+SET LIB=%VC9_LIB%
+SET INCLUDE=%VC9_INCLUDE%
+
+REM VC11 Support
+SET VC11_SHELL=%comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\vcvarsall.bat"" x86
+SET PSDK_80_DIR=C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0
+
+SET VC11_DIR=C:\Program Files (x86)\Microsoft Visual Studio 11.0
+SET VC11_INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows
Kits\8.0\include\shared;C:\Program Files (x86)\Windows
Kits\8.0\include\um;C:\Program Files (x86)\Windows Kits\8.0\include\winrt;
+SET VC11_LIB=C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\8.0\lib\win8\um\x86;
+SET
LIBPATH=C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Windows\Microsoft.NET\Framework\v3.5;C:\Program
Files (x86)\Microsoft Visual Studio 11.0\VC\LIB;C:\Program Files
(x86)\Microsoft Visual Studio 11.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows
Kits\8.0\References\CommonConfiguration\Neutral;C:\Program Files
(x86)\Microsoft
SDKs\Windows\v8.0\ExtensionSDKs\Microsoft.VCLibs\11.0\References\CommonConfiguration\neutral;
+SET INCLUDE=%VC11_INCLUDE%
+SET LIB=%VC11_LIB%
+
+SET VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\
+SET VisualStudioVersion=11.0
+SET VS110COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio
11.0\Common7\Tools\
+SET VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 11.0\
+SET DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\
+SET ExtensionSdkDir=C:\Program Files (x86)\Microsoft
SDKs\Windows\v8.0\ExtensionSDKs
+SET WindowsSdkDir=C:\Program Files (x86)\Windows Kits\8.0\
+SET WindowsSdkDir_35=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\
+SET WindowsSdkDir_old=C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\
+
+SET VC11_PATH=C:\Program Files (x86)\Microsoft Visual Studio
11.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files
(x86)\Microsoft SDKs\F#\3.0\Framework\v4.0\;C:\Program Files (x86)\Microsoft
Visual Studio 11.0\VSTSDB\Deploy;C:\Program Files (x86)\Microsoft Visual Studio
11.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio
11.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Windows\Microsoft.NET\Framework\v3.5;C:\Program
Files (x86)\Microsoft Visual Studio 11.0\VC\VCPackages;C:\Program Files
(x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio
11.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows
Kits\8.0\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX
4.0 Tools;C:\Program Files (x86)\Microsoft
SDKs\Windows\v7.0A\Bin\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program
Files\Microsoft\Web Platform Installer\;C:\Program Files (x86)\Microsoft
ASP.NET\ASP.NET WebPages\v1.0\;C:\Program Files\Microsoft SQL
Server\110\Tools\Binn\;C:\Program Files (x86)\Windows Kits\8.0\Windows
Performance Toolkit\
+SET OLD_PATH=%PATH%
+SET PATH=%PATH%;%VC11_PATH%
+
+SET VC11_X64_PATH=C:\Program Files (x86)\Microsoft Visual Studio
11.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files
(x86)\Microsoft Visual Studio
11.0\VC\BIN\amd64;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Windows\Microsoft.NET\Framework64\v3.5;C:\Program
Files (x86)\Microsoft Visual Studio 11.0\VC\VCPackages;C:\Program Files
(x86)\Microsoft Visual Studio 11.0\Common7\IDE;C:\Program Files (x86)\Microsoft
Visual Studio 11.0\Common7\Tools;C:\Program Files (x86)\HTML Help
Workshop;C:\Program Files (x86)\Microsoft Visual Studio 11.0\Team
Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio
11.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows
Kits\8.0\bin\x64;C:\Program Files (x86)\Windows Kits\8.0\bin\x86;C:\Program
Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX 4.0 Tools\x64;C:\Program
Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;C:\Program Files
(x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX4.0 Tools;C:\Program Files
(x86)\Microsoft
SDKs\Windows\v7.0A\Bin\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program
Files\Microsoft\Web Platform Installer\;C:\Program Files (x86)\Microsoft
ASP.NET\ASP.NET Web Pages\v1.0\;C:\Program Files\Microsoft SQL
Server\110\Tools\Binn\;C:\Program Files (x86)\Windows Kits\8.0\Windows
Performance Toolkit\
+SET VC11_X64_INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows
Kits\8.0\include\shared;C:\Program Files (x86)\Windows
Kits\8.0\include\um;C:\Program Files (x86)\Windows Kits\8.0\include\winrt;
+SET VC11_X64_LIB=C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\LIB\amd64;C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\ATLMFC\LIB\amd64;C:\Program Files (x86)\Windows
Kits\8.0\lib\win8\um\x64;
+SET
VC11_X64_LIBPATH=C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Windows\Microsoft.NET\Framework64\v3.5;C:\Program
Files (x86)\Microsoft Visual Studio 11.0\VC\LIB\amd64;C:\Program Files
(x86)\Microsoft Visual Studio 11.0\VC\ATLMFC\LIB\amd64;C:\Program Files
(x86)\Windows Kits\8.0\References\CommonConfiguration\Neutral;C:\Program Files
(x86)\Microsoft
SDKs\Windows\v8.0\ExtensionSDKs\Microsoft.VCLibs\11.0\References\CommonConfiguration\neutral;
+SET VC11_X64_SHELL=%comspec% /k ""C:\Program Files (x86)\Microsoft Visual
Studio 11.0\VC\vcvarsall.bat"" amd64
+
+REM Run snap.php
+SET BISON_SIMPLE=c:\php-sdk\bin\bison.simple
+c:\php-sdk\php\php.exe -d extension_dir=c:\php-sdk\php\ext -d
extension=php_openssl.dll -d extension=php_curl.dll
%BAT_DIR%\..\script\snap.php %*
+SET PATH=%OLD_PATH%
diff --git a/client/bin/snapshot_task_nts.bat b/client/bin/snapshot_task_nts.bat
new file mode 100644
index 0000000..e9a0221
--- /dev/null
+++ b/client/bin/snapshot_task_nts.bat
@@ -0,0 +1,43 @@
+@ECHO OFF
+set yyyy=%date:~6,4%
+set mm=%date:~3,2%
+set dd=%date:~0,2%
+
+set hh=%time:~0,2%
+if %hh% lss 10 (set hh=0%time:~1,1%)
+set nn=%time:~3,2%
+set ss=%time:~6,2%
+set cur_date=%yyyy%%mm%%dd%-%hh%%nn%%ss%
+
+set LOG_FILE=c:\php-sdk\logs\task-nts-%cur_date%.log
+set RMTOOLS_BASE_DIR=c:\php-sdk\rmtools-client
+
+IF EXIST c:\php-sdk\locks\snaps_nts.lock (
+ECHO Snapshot script is already running.
+GOTO EXIT_LOCKED
+)
+
+ECHO running > c:\php-sdk\locks\snaps_nts.lock
+
+CALL c:\php-sdk\bin\phpsdk_setvars.bat
+
+rem rmdir /q /s %RMTOOLS_BASE_DIR% >> %LOG_FILE% 2<&1
+
+rem svn export --quiet --force
https://svn.php.net/repository/web/php-rmtools/trunk/client %RMTOOLS_BASE_DIR%
>> %LOG_FILE% 2<&1
+rem xcopy /s /e /y /i c:\php-sdk\src\rmtools-client %RMTOOLS_BASE_DIR% >>
%LOG_FILE% 2<&1
+
+copy c:\php-sdk\rmtools.base\data\config\credentials_ftps.php
%RMTOOLS_BASE_DIR%\data\config\ >> %LOG_FILE% 2<&1
+copy c:\php-sdk\rmtools.base\data\db\* %RMTOOLS_BASE_DIR%\data\db\ >>
%LOG_FILE% 2<&1
+mkdir %RMTOOLS_BASE_DIR%\tmp
+
+REM CALL c:\php-sdk\rmtools-client\bin\snap.bat php53 1 %* >> %LOG_FILE% 2<&1
+CALL c:\php-sdk\rmtools-client\bin\snap.bat %* >> %LOG_FILE% 2<&1
+REM CALL c:\php-sdk\rmtools-client\bin\snap.bat phptrunk %* >> %LOG_FILE% 2<&1
+
+copy %RMTOOLS_BASE_DIR%\data\db\* c:\php-sdk\rmtools.base\data\db\ >>
%LOG_FILE% 2<&1
+del c:\php-sdk\locks\snaps_nts.lock >> %LOG_FILE% 2<&1
+
+echo Done.>> %LOG_FILE%
+
+:EXIT_LOCKED
+echo .
\ No newline at end of file
diff --git a/client/bin/snapshot_task_ts.bat b/client/bin/snapshot_task_ts.bat
new file mode 100644
index 0000000..defbc49
--- /dev/null
+++ b/client/bin/snapshot_task_ts.bat
@@ -0,0 +1,43 @@
+@ECHO OFF
+set yyyy=%date:~6,4%
+set mm=%date:~3,2%
+set dd=%date:~0,2%
+
+set hh=%time:~0,2%
+if %hh% lss 10 (set hh=0%time:~1,1%)
+set nn=%time:~3,2%
+set ss=%time:~6,2%
+set cur_date=%yyyy%%mm%%dd%-%hh%%nn%%ss%
+
+set LOG_FILE=c:\php-sdk\logs\task-ts-%cur_date%.log
+set RMTOOLS_BASE_DIR=c:\php-sdk\rmtools-client
+
+IF EXIST c:\php-sdk\locks\snaps_ts.lock (
+ECHO Snapshot script is already running.
+GOTO EXIT_LOCKED
+)
+
+ECHO running > c:\php-sdk\locks\snaps_ts.lock
+
+CALL c:\php-sdk\bin\phpsdk_setvars.bat
+
+rem rmdir /q /s %RMTOOLS_BASE_DIR% >> %LOG_FILE% 2<&1
+
+rem svn export --quiet --force
https://svn.php.net/repository/web/php-rmtools/trunk/client %RMTOOLS_BASE_DIR%
>> %LOG_FILE% 2<&1
+rem xcopy /s /e /y /i c:\php-sdk\src\rmtools-client %RMTOOLS_BASE_DIR% >>
%LOG_FILE% 2<&1
+
+copy c:\php-sdk\rmtools.base\data\config\credentials_ftps.php
%RMTOOLS_BASE_DIR%\data\config\ >> %LOG_FILE% 2<&1
+copy c:\php-sdk\rmtools.base\data\db\* %RMTOOLS_BASE_DIR%\data\db\ >>
%LOG_FILE% 2<&1
+mkdir %RMTOOLS_BASE_DIR%\tmp
+
+REM CALL c:\php-sdk\rmtools-client\bin\snap.bat php53 1 %* >> %LOG_FILE% 2<&1
+CALL c:\php-sdk\rmtools-client\bin\snap.bat %* >> %LOG_FILE% 2<&1
+REM CALL c:\php-sdk\rmtools-client\bin\snap.bat phptrunk %* >> %LOG_FILE% 2<&1
+
+copy %RMTOOLS_BASE_DIR%\data\db\* c:\php-sdk\rmtools.base\data\db\ >>
%LOG_FILE% 2<&1
+del c:\php-sdk\locks\snaps_ts.lock >> %LOG_FILE% 2<&1
+
+echo Done.>> %LOG_FILE%
+
+:EXIT_LOCKED
+echo .
\ No newline at end of file
diff --git a/client/data/branch/php54.ini b/client/data/branch/php54.ini
new file mode 100644
index 0000000..19f1f62
--- /dev/null
+++ b/client/data/branch/php54.ini
@@ -0,0 +1,24 @@
+name=php-5.4
+branch=5.4
+repo_name=phpnet
+repo_module=php-src.git
+repo_branch=refs/heads/PHP-5.4
+build_dir=c:/obj
+build_location=c:/php-sdk/snap_5_4/vc9/x86/
+appver=xp
+debug=0
+pgo=1
+
+[build-nts-windows-vc9-x86]
+name=nts-windows-vc9-x86
+compiler=vc9
+arch=x86
+configure_options=--enable-snapshot-build --disable-zts --disable-isapi
--enable-debug-pack --disable-nsapi --without-mssql --without-pdo-mssql
--without-pi3web --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
--enable-com-dotnet=shared --with-mcrypt=static --disable-static-analyze
+platform=windows
+
+[build-ts-windows-vc9-x86]
+name=ts-windows-vc9-x86
+compiler=vc9
+arch=x86
+configure_options=--enable-snapshot-build --disable-isapi --enable-debug-pack
--disable-nsapi --without-mssql --without-pdo-mssql --without-pi3web
--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
--enable-com-dotnet=shared --with-mcrypt=static --disable-static-analyze
+platform=windows
\ No newline at end of file
diff --git a/client/data/branch/php55.ini b/client/data/branch/php55.ini
new file mode 100644
index 0000000..c77f163
--- /dev/null
+++ b/client/data/branch/php55.ini
@@ -0,0 +1,26 @@
+name=php-5.5
+branch=5.5
+repo_name=phpnet
+repo_module=php-src.git
+repo_branch=refs/heads/PHP-5.5
+build_dir=c:/obj
+build_location=c:/php-sdk/snap_5_5/vc11/x86/
+appver=2008
+debug=0
+pgo=1
+compiler=vc11
+arch=x86
+
+[build-nts-windows-vc11-x86]
+name=nts-windows-vc11-x86
+compiler=vc11
+arch=x86
+configure_options=--enable-snapshot-build --disable-zts --disable-isapi
--enable-debug-pack --disable-nsapi --without-mssql --without-pdo-mssql
--without-pi3web --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
--enable-com-dotnet=shared --with-mcrypt=static --disable-static-analyze
+platform=windows
+
+[build-ts-windows-vc11-x86]
+name=ts-windows-vc11-x86
+compiler=vc11
+arch=x86
+configure_options=--enable-snapshot-build --disable-isapi --enable-debug-pack
--disable-nsapi --without-mssql --without-pdo-mssql --without-pi3web
--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
--enable-com-dotnet=shared --with-mcrypt=static --disable-static-analyze
+platform=windows
\ No newline at end of file
diff --git a/client/data/branch/phptrunk.ini b/client/data/branch/phptrunk.ini
index 498317a..27ad369 100644
--- a/client/data/branch/phptrunk.ini
+++ b/client/data/branch/phptrunk.ini
@@ -1,21 +1,24 @@
-name=php-trunk
-branch=trunk
-repo_name=phpnet
-repo_module=/php/php-src
-repo_branch=/trunk
-build_dir=g:/temp/obj
-build_location=g:/php-sdk/php6/vc9/x86/
-
-[build-nts-windows-vc9-x86]
-name=nts-windows-vc9-x86
-compiler=vc9
-arch=x86
-configure_options=--enable-snapshot-build --disable-zts --disable-isapi
--enable-debug-pack --disable-isapi --without-mssql --without-pdo-mssql
--without-pi3web --with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared
--with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared
--with-oci8-11g=D:\php-sdk\oracle\instantclient11\sdk,shared
--enable-com-dotnet --with-mcrypt=static --enable-object-out-dir=d:/temp/obj/
-platform=windows
-
-[build-ts-windows-vc9-x86]
-name=ts-windows-vc9-x86
-compiler=vc9
-arch=x86
-configure_options=--enable-snapshot-build --disable-isapi --enable-debug-pack
--without-mssql --without-pdo-mssql --without-pi3web
--with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared
--with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared
--with-oci8-11g=D:\php-sdk\oracle\instantclient11\sdk,shared
--enable-com-dotnet --with-mcrypt=static --enable-object-out-dir=d:/temp/obj/
-platform=windows
+name=master
+branch=master
+repo_name=phpnet
+repo_module=php-src.git
+repo_branch=refs/heads/master
+build_dir=c:/obj
+build_location=c:/php-sdk/trunk/vc9/x86/
+appver=2008
+debug=0
+pgo=1
+
+[build-nts-windows-vc9-x86]
+name=nts-windows-vc9-x86
+compiler=vc9
+arch=x86
+configure_options=--enable-snapshot-build --disable-zts --disable-isapi
--enable-debug-pack --disable-nsapi --without-mssql --without-pdo-mssql
--without-pi3web --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
--enable-com-dotnet=shared --with-mcrypt=static --disable-static-analyze
+platform=windows
+
+[build-ts-windows-vc9-x86]
+name=ts-windows-vc9-x86
+compiler=vc9
+arch=x86
+configure_options=--enable-snapshot-build --disable-isapi --enable-debug-pack
--disable-nsapi --without-mssql --without-pdo-mssql --without-pi3web
--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
--enable-com-dotnet=shared --with-mcrypt=static --disable-static-analyze
+platform=windows
--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
