pajoye Mon Jun 23 07:55:03 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/build buildconf.js
Log:
- fix ADD_EXTENSION_DEP detection so it can match it anywhere in a line
http://cvs.php.net/viewvc.cgi/php-src/win32/build/buildconf.js?r1=1.13.2.2.2.1.2.1&r2=1.13.2.2.2.1.2.2&diff_format=u
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.13.2.2.2.1.2.1
php-src/win32/build/buildconf.js:1.13.2.2.2.1.2.2
--- php-src/win32/build/buildconf.js:1.13.2.2.2.1.2.1 Tue Mar 18 03:23:14 2008
+++ php-src/win32/build/buildconf.js Mon Jun 23 07:55:03 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: buildconf.js,v 1.13.2.2.2.1.2.1 2008/03/18 03:23:14 sfox Exp $ */
+/* $Id: buildconf.js,v 1.13.2.2.2.1.2.2 2008/06/23 07:55:03 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
