Commit: 96f6cb3a88dd9fb1aad6b3f9208098c743479b91
Author: Anatol Belski <[email protected]> Fri, 30 Aug 2013 09:26:14 +0200
Parents: c17d9eb229c1ae5c7dc1e128ac1478e448d03599
Branches: master
Link:
http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=96f6cb3a88dd9fb1aad6b3f9208098c743479b91
Log:
prepared more stuff in the configs
Changed paths:
M client/data/config/pecl/pecl53.ini
M client/data/config/pecl/pecl54.ini
D client/data/config/pecl/pecl55.ini
A client/data/config/pecl/pecl55_x64.ini
A client/data/config/pecl/pecl55_x86.ini
M client/data/config/pecl/pecltrunk.ini
M client/include/BranchConfig.php
diff --git a/client/data/config/pecl/pecl53.ini
b/client/data/config/pecl/pecl53.ini
index 0e75604..d3133f3 100644
--- a/client/data/config/pecl/pecl53.ini
+++ b/client/data/config/pecl/pecl53.ini
@@ -6,6 +6,9 @@ build_location=c:/php-sdk/php53/vc9/x86/
appver=xp
debug=0
pgo=0
+pecl_deps_base=c:/pecl-dep-libs/vc9/x86
+arch=x86
+compiler=vc9
[build-nts-windows-vc9-x86]
name=nts-windows-vc9-x86
diff --git a/client/data/config/pecl/pecl54.ini
b/client/data/config/pecl/pecl54.ini
index 19f1f62..55456d5 100644
--- a/client/data/config/pecl/pecl54.ini
+++ b/client/data/config/pecl/pecl54.ini
@@ -1,24 +1,27 @@
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/
+build_src_subdir=php-5.4.19-src
+build_location=C:\php-sdk\php54\vc9\x86
appver=xp
debug=0
-pgo=1
+pgo=0
+pecl_deps_base=c:/pecl-dep-libs/vc9/x86
+arch=x86
+compiler=vc9
[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
+thread_safe=0
+configure_options=--enable-snapshot-build --disable-zts --disable-isapi
--enable-debug-pack --disable-nsapi --without-mssql --without-pdo-mssql
--without-pi3web --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
+thread_safe=1
+configure_options=--enable-snapshot-build --disable-isapi --enable-debug-pack
--disable-nsapi --without-mssql --without-pdo-mssql --without-pi3web
--enable-com-dotnet=shared --with-mcrypt=static --disable-static-analyze
+platform=windows
diff --git a/client/data/config/pecl/pecl55.ini
b/client/data/config/pecl/pecl55.ini
deleted file mode 100644
index c77f163..0000000
--- a/client/data/config/pecl/pecl55.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-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/config/pecl/pecl55_x64.ini
b/client/data/config/pecl/pecl55_x64.ini
new file mode 100644
index 0000000..4a74a66
--- /dev/null
+++ b/client/data/config/pecl/pecl55_x64.ini
@@ -0,0 +1,27 @@
+name=php-5.5
+branch=5.5
+build_dir=c:/obj
+build_src_subdir=php-5.5.3-src
+build_location=C:\php-sdk\php55\vc11\x64
+appver=2008
+debug=0
+pgo=0
+compiler=vc11
+arch=x64
+pecl_deps_base=c:/pecl-dep-libs/vc11/x64
+
+[build-nts-windows-vc11-x64]
+name=nts-windows-vc11-x64
+compiler=vc11
+arch=x64
+thread_safe=0
+configure_options=--enable-snapshot-build --disable-zts --disable-isapi
--enable-debug-pack --disable-nsapi --without-mssql --without-pdo-mssql
--without-pi3web --enable-com-dotnet=shared --with-mcrypt=static
--disable-static-analyze
+platform=windows
+
+[build-ts-windows-vc11-x64]
+name=ts-windows-vc11-x64
+compiler=vc11
+arch=x64
+thread_safe=1
+configure_options=--enable-snapshot-build --disable-isapi --enable-debug-pack
--disable-nsapi --without-mssql --without-pdo-mssql --without-pi3web
--enable-com-dotnet=shared --with-mcrypt=static --disable-static-analyze
+platform=windows
diff --git a/client/data/config/pecl/pecl55_x86.ini
b/client/data/config/pecl/pecl55_x86.ini
new file mode 100644
index 0000000..1cd665c
--- /dev/null
+++ b/client/data/config/pecl/pecl55_x86.ini
@@ -0,0 +1,27 @@
+name=php-5.5
+branch=5.5
+build_dir=c:/obj
+build_src_subdir=php-5.5.3-src
+build_location=C:\php-sdk\php55\vc11\x86
+appver=2008
+debug=0
+pgo=0
+compiler=vc11
+arch=x86
+pecl_deps_base=c:/pecl-dep-libs/vc11/x86
+
+[build-nts-windows-vc11-x86]
+name=nts-windows-vc11-x86
+compiler=vc11
+arch=x86
+thread_safe=0
+configure_options=--enable-snapshot-build --disable-zts --disable-isapi
--enable-debug-pack --disable-nsapi --without-mssql --without-pdo-mssql
--without-pi3web --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
+thread_safe=1
+configure_options=--enable-snapshot-build --disable-isapi --enable-debug-pack
--disable-nsapi --without-mssql --without-pdo-mssql --without-pi3web
--enable-com-dotnet=shared --with-mcrypt=static --disable-static-analyze
+platform=windows
diff --git a/client/data/config/pecl/pecltrunk.ini
b/client/data/config/pecl/pecltrunk.ini
index 27ad369..7ab9e38 100644
--- a/client/data/config/pecl/pecltrunk.ini
+++ b/client/data/config/pecl/pecltrunk.ini
@@ -1,24 +1,25 @@
-name=master
+name=php-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/
+build_src_subdir=php-src
+build_location=C:\php-sdk\phpmaster\vc11\x86
appver=2008
debug=0
-pgo=1
+pgo=0
+compiler=vc11
-[build-nts-windows-vc9-x86]
-name=nts-windows-vc9-x86
-compiler=vc9
+[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
+thread_safe=0
+configure_options=--enable-snapshot-build --disable-zts --disable-isapi
--enable-debug-pack --disable-nsapi --without-mssql --without-pdo-mssql
--without-pi3web --enable-com-dotnet=shared --with-mcrypt=static
--disable-static-analyze
platform=windows
-[build-ts-windows-vc9-x86]
-name=ts-windows-vc9-x86
-compiler=vc9
+[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
+thread_safe=1
+configure_options=--enable-snapshot-build --disable-isapi --enable-debug-pack
--disable-nsapi --without-mssql --without-pdo-mssql --without-pi3web
--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 39ee88f..96d8cce 100644
--- a/client/include/BranchConfig.php
+++ b/client/include/BranchConfig.php
@@ -22,6 +22,7 @@ class BranchConfig {
'Debug' => 'debug',
'Appver' => 'appver',
'BuildSrcSubdir' => 'build_src_subdir',
+ 'PeclDepsBase' => 'pecl_deps_base',
);
function __construct($path)--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
