pajoye Wed Jul 2 20:53:36 2008 UTC Modified files: /php-src/win32/build buildconf.js Log: - MFB: improve ADD_EXTENSION_DEP detection http://cvs.php.net/viewvc.cgi/php-src/win32/build/buildconf.js?r1=1.17&r2=1.18&diff_format=u Index: php-src/win32/build/buildconf.js diff -u php-src/win32/build/buildconf.js:1.17 php-src/win32/build/buildconf.js:1.18 --- php-src/win32/build/buildconf.js:1.17 Wed May 14 11:32:28 2008 +++ php-src/win32/build/buildconf.js Wed Jul 2 20:53:36 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: buildconf.js,v 1.17 2008/05/14 11:32:28 mattwil Exp $ */ +/* $Id: buildconf.js,v 1.18 2008/07/02 20:53:36 pajoye Exp $ */ // This generates a configure script for win32 build WScript.StdOut.WriteLine("Rebuilding configure.js"); @@ -55,7 +55,7 @@ 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()) { @@ -73,7 +73,6 @@ continue; } - c = FSO.BuildPath(fc.item(), "config.w32"); if (FSO.FileExists(c)) { // WScript.StdOut.WriteLine(c); @@ -91,6 +90,7 @@ if (calls[i].match(re_dep_line)) { // WScript.StdOut.WriteLine("n depends on " + RegExp.$1); deps[deps.length] = RegExp.$1; + } } }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php