]> granicus.if.org Git - php/commitdiff
- fix ADD_EXTENSION_DEP detection so it can match it anywhere in a line
authorPierre Joye <pajoye@php.net>
Mon, 23 Jun 2008 07:55:03 +0000 (07:55 +0000)
committerPierre Joye <pajoye@php.net>
Mon, 23 Jun 2008 07:55:03 +0000 (07:55 +0000)
win32/build/buildconf.js

index d04f192cde99852eeba9059981fca837dffb7bcc..641758bb94646b527099b794b04ea9a4dd27bf66 100644 (file)
@@ -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 @@ 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())
        {
@@ -73,7 +73,6 @@ function find_config_w32(dirname)
                        continue;
                }
 
-                       
                c = FSO.BuildPath(fc.item(), "config.w32");
                if (FSO.FileExists(c)) {
 //                     WScript.StdOut.WriteLine(c);
@@ -91,6 +90,7 @@ function find_config_w32(dirname)
                                        if (calls[i].match(re_dep_line)) {
 //                                             WScript.StdOut.WriteLine("n depends on " + RegExp.$1);
                                                deps[deps.length] = RegExp.$1;
+
                                        }
                                }
                        }