pajoye Sat, 01 Jan 2011 20:00:21 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=306958
Log:
- fix ADD_EXTENSION_DEP detection
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/phpize.js.in
Modified: php/php-src/branches/PHP_5_3/win32/build/phpize.js.in
===================================================================
--- php/php-src/branches/PHP_5_3/win32/build/phpize.js.in 2011-01-01
20:00:10 UTC (rev 306957)
+++ php/php-src/branches/PHP_5_3/win32/build/phpize.js.in 2011-01-01
20:00:21 UTC (rev 306958)
@@ -59,6 +59,7 @@
{
var re_dep_line = new
RegExp("ADD_EXTENSION_DEP\\([^,]*\\s*,\\s*['\"]([^'\"]+)['\"].*\\)", "gm");
var calls = contents.match(re_dep_line);
+ var deps = new Array();
if (calls != null) {
for (i = 0; i < calls.length; i++) {
// now we need the extension name out of this thing
@@ -68,6 +69,7 @@
}
}
}
+ return deps;
}
function find_config_w32(dirname)
@@ -86,9 +88,8 @@
var dir_line = "configure_module_dirname =
condense_path(FSO.GetParentFolderName('"
+ c.replace(new
RegExp('(["\\\\])', "g"), '\\$1') + "'));\r\n";
var contents = file_get_contents(c);
- var deps = new Array();
- get_module_dep(contents);
+ deps = get_module_dep(contents);
item = new Module_Item(n, c, dir_line, deps, contents);
MODULES.Add(n, item);
@@ -107,9 +108,8 @@
var dir_line = "configure_module_dirname =
condense_path(FSO.GetParentFolderName('"
+ c.replace(new
RegExp('(["\\\\])', "g"), '\\$1') + "'));\r\n";
var contents = file_get_contents(c);
- var deps = new Array();
- get_module_dep(contents);
+ deps = get_module_dep(contents);
item = new Module_Item(n, c, dir_line, deps, contents);
MODULES.Add(n, item);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
