com web/rmtools: Add PHP 5.5 support and new build variables for debug and appver: client/data/config/branch/php55.ini
client/data/config/branch/phptrunk.ini client/include/BranchConfig.php client/include/BuildVC.php

Commit: 5ff4336062e5ddfd8d8884cc4c4f11e185416776 Author: Stephen Zarkos <stephen.zarkos@microsoft.com> Wed, 21 Nov 2012 15:47:32 -0800 Parents: 3fdf9c3b90f6d43f95fedcd903027018bf7ee6b9 Branches: master Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=5ff4336062e5ddfd8d8884cc4c4f11e185416776 Log: Add PHP 5.5 support and new build variables for debug and appver Changed paths: A client/data/config/branch/php55.ini M client/data/config/branch/phptrunk..ini M client/include/BranchConfig.php M client/include/BuildVC.php Diff: diff --git a/client/data/config/branch/php55.ini b/client/data/config/branch/php55.ini new file mode 100644 index 0000000..1826009 --- /dev/null +++ b/client/data/config/branch/php55.ini @@ -0,0 +1,24 @@ +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/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 \ No newline at end of file diff --git a/client/data/config/branch/phptrunk.ini b/client/data/config/branch/phptrunk.ini index de79aed..27ad369 100644 --- a/client/data/config/branch/phptrunk.ini +++ b/client/data/config/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=c:/obj -build_location=c:/php-sdk/trunk/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=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 --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 --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 --with-mcrypt=static --disable-static-analyze -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 diff --git a/client/include/BranchConfig.php b/client/include/BranchConfig.php index ed53818..a221e74 100644 --- a/client/include/BranchConfig.php +++ b/client/include/BranchConfig.php @@ -19,6 +19,8 @@ class BranchConfig { 'RepoBranch' => 'repo_branch', 'Module' => 'repo_module', 'PGO' => 'pgo', + 'Debug' => 'debug', + 'Appver' => 'appver', ); function __construct($path) diff --git a/client/include/BuildVC.php b/client/include/BuildVC.php index 6615a9b..119dad8 100644 --- a/client/include/BuildVC.php +++ b/client/include/BuildVC.php @@ -67,6 +67,19 @@ class BuildVC { if (!isset($env['BISON_SIMPLE'])) { $env['BISON_SIMPLE'] = getenv('BISON_SIMPLE'); } + + $env['CPU'] = "i386"; + $env['APPVER'] = "5.01"; // setenv /xp + if (strcasecmp($this->architecture, 'x64') == 0) { + $env['CPU'] = "AMD64"; + } + if (strcmp($branch->config->getAppver(), '2008') == 0) { + $env['APPVER'] = "6.0"; + } + if ($branch->config->getDebug() == 0) { + $env['NODEBUG'] = "1"; + } + $this->env = $env; }