svn: /php/php-src/ branches/PHP_5_3/win32/build/confutils.js trunk/win32/build/confutils.js
| From: | Pierre Joye | Date: | Sun, 02 Jan 2011 18:29:56 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/win32/build/confutils.js trunk/win32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64242@lists.php.net to get a copy of this message | ||
pajoye Sun, 02 Jan 2011 18:29:56 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307000
Log:
- use the ext deps list for phpize's ADD_EXTENSION_DEP function
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
U php/php-src/trunk/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===================================================================
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02 18:14:50 UTC (rev 306999)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02 18:29:56 UTC (rev 307000)
@@ -1129,6 +1129,11 @@
var dep_present = false;
var dep_shared = false;
+ if (MODE_PHPIZE) {
+ ext_deps_js = file_get_contents(PHP_DIR + "\\script\\ext_deps.js");
+ eval(ext_deps_js);
+ }
+
try {
dep_present = eval("PHP_" + DEP);
@@ -1681,7 +1686,8 @@
var count = extensions_enabled.length;
for (i in extensions_enabled) {
- out = "PHP_" + extensions_enabled[i][0].toUpperCase() + "_SHARED=" +
(extensions_enabled[i][1] == 'shared' ? 'True' : 'False');
+ out = "PHP_" + extensions_enabled[i][0].toUpperCase() + "_SHARED=" +
(extensions_enabled[i][1] == 'shared' ? 'true' : 'false') +
";";
+ DEPS.WriteLine("PHP_" + extensions_enabled[i][0].toUpperCase() + "=true;");
DEPS.WriteLine(out);
MF.WriteLine(out);
}
Modified: php/php-src/trunk/win32/build/confutils.js
===================================================================
--- php/php-src/trunk/win32/build/confutils.js 2011-01-02 18:14:50 UTC (rev 306999)
+++ php/php-src/trunk/win32/build/confutils.js 2011-01-02 18:29:56 UTC (rev 307000)
@@ -1129,6 +1129,11 @@
var dep_present = false;
var dep_shared = false;
+ if (MODE_PHPIZE) {
+ ext_deps_js = file_get_contents(PHP_DIR + "\\script\\ext_deps.js");
+ eval(ext_deps_js);
+ }
+
try {
dep_present = eval("PHP_" + DEP);
@@ -1681,7 +1686,8 @@
var count = extensions_enabled.length;
for (i in extensions_enabled) {
- out = "PHP_" + extensions_enabled[i][0].toUpperCase() + "_SHARED=" +
(extensions_enabled[i][1] == 'shared' ? 'True' : 'False');
+ out = "PHP_" + extensions_enabled[i][0].toUpperCase() + "_SHARED=" +
(extensions_enabled[i][1] == 'shared' ? 'true' : 'false') +
";";
+ DEPS.WriteLine("PHP_" + extensions_enabled[i][0].toUpperCase() + "=true;");
DEPS.WriteLine(out);
MF.WriteLine(out);
}