diff options
| author | Wez Furlong <wez@php.net> | 2004-01-08 21:53:48 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2004-01-08 21:53:48 +0000 |
| commit | 510dd7cca578e097a3ba7f615a19820c1337d29a (patch) | |
| tree | 19911d4b312c5c2f7c27f781797c3167a4d4f686 /win32/build/buildconf.js | |
| parent | 3fc4dc44ae228c0eed2489dd82316babc4a44efa (diff) | |
| download | php-git-510dd7cca578e097a3ba7f615a19820c1337d29a.tar.gz | |
add optional dep on spl for simplexml.
Fix dep handling in buildconf
Diffstat (limited to 'win32/build/buildconf.js')
| -rw-r--r-- | win32/build/buildconf.js | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/win32/build/buildconf.js b/win32/build/buildconf.js index 1c28b420c0..b744fcd769 100644 --- a/win32/build/buildconf.js +++ b/win32/build/buildconf.js @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: buildconf.js,v 1.9 2004-01-08 17:33:29 sniper Exp $ */ +/* $Id: buildconf.js,v 1.10 2004-01-08 21:53:48 wez Exp $ */ // This generates a configure script for win32 build WScript.StdOut.WriteLine("Rebuilding configure.js"); @@ -53,7 +53,7 @@ function find_config_w32(dirname) var fc = new Enumerator(f.SubFolders); var c, i, ok, n; var item = null; - var re_dep_line = new RegExp("ADD_EXTENSION_DEP\\([^,]*\\s*,\\s*['\"]([^'\"]+)['\"]\\);", "gm"); + var re_dep_line = new RegExp("ADD_EXTENSION_DEP\\([^,]*\\s*,\\s*['\"]([^'\"]+)['\"].*\\);", "gm"); for (; !fc.atEnd(); fc.moveNext()) { @@ -108,17 +108,19 @@ function emit_dep_modules(module_names) { var i, mod_name, j; var output = ""; + var item = null; for (i in module_names) { mod_name = module_names[i]; - if (!MODULES.Exists(mod_name)) { + if (MODULES.Exists(mod_name)) { + item = MODULES.Item(mod_name); + MODULES.Remove(mod_name); + if (item.deps.length) { + output += emit_dep_modules(item.deps); + } output += emit_module(item); - continue; } - - item = MODULES.Item(mod_name); - output += emit_dep_modules(item.deps); } return output; |