- move common functions to confutil

- MFB: allow to disable the summary (and move test in the function)

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index cb56b9856109ec9507fe559a56443f469c1ce23a..46640060bb7f5b557b005364a24b02e5ff7eee65 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -8,38 +8,16 @@ CL = PATH_PROG('cl');
 if (!CL) {
        ERROR("MS C++ compiler is required");
 }
-// Which version of the compiler do we have ?
-function probe_binary(EXE, what)
-{
-       // tricky escapes to get stderr redirection to work
-       var command = 'cmd /c ""' + EXE;
-       if (what == "version") {
-               command = command + '" -v"';
-       }
-       var version = execute(command + '" 2>&1"');
-
-       if (what == "64") {
-               if (version.match(/x64/)) {
-                       return 1;
-               }
-       } else {
-               if (version.match(/(\d+\.\d+(\.\d+)?(\.\d+)?)/)) {
-                       return RegExp.$1;
-               }
-       }
-       return 0;
-}
-
-// Which version of the compiler do we have?
-VCVERS = probe_binary(CL);
-VCVERS = VCVERS.substr(0, 2) + VCVERS.substr(3, 2);
-STDOUT.WriteLine("Detected MS compiler version " + VCVERS);
 
 // 1200 is VC6
 // 1300 is vs.net 2002
 // 1310 is vs.net 2003
 // 1400 is vs.net 2005
 // 1500 is vs.net 2008
+// Which version of the compiler do we have?
+VCVERS = probe_binary(CL).substr(0, 5).replace('.', '');
+STDOUT.WriteLine("  Detected compiler " + VC_VERSIONS[VCVERS]);
+AC_DEFINE('COMPILER', VC_VERSIONS[VCVERS], "Detected compiler version");
 
 // do we use x64 or 80x86 version of compiler?
 X64 = probe_binary(CL, 64);
@@ -402,3 +380,5 @@ if (PHP_SNAPSHOT_TEMPLATE == "no") {
 }
 
 DEFINE('SNAPSHOT_TEMPLATE', PHP_SNAPSHOT_TEMPLATE);
+
+ARG_ENABLE('summary', 'Enable configuration summary', 'yes');

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index c7cfdd391107c2fa2b15e7a448fec52d8aee0e42..fedf0464654f01e5376392be033d52c48a8c0feb 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-// $Id: confutils.js,v 1.75 2008-07-05 19:52:45 pajoye Exp $
+// $Id: confutils.js,v 1.76 2008-07-07 13:48:23 pajoye Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -31,11 +31,11 @@ var extensions_enabled = new Array();
 var sapi_enabled = new Array();
 
 var VC_VERSIONS = new Array();
-VC_VERSIONS[1200] = 'VC6';
-VC_VERSIONS[1300] = 'Visual C++ 2002';
-VC_VERSIONS[1310] = 'Visual C++ 2003';
-VC_VERSIONS[1400] = 'Visual C++ 2005';
-VC_VERSIONS[1500] = 'Visual C++ 2008';
+VC_VERSIONS[1200] = 'MSVC6 (Visual C++ 6.0)';
+VC_VERSIONS[1300] = 'MSVC7 (Visual C++ 2002)';
+VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)';
+VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
+VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
 
 if (PROGRAM_FILES == null) {
        PROGRAM_FILES = "C:\\Program Files";
@@ -108,6 +108,27 @@ function execute(command_line)
        return ret;
 }
 
+function probe_binary(EXE, what)
+{
+       // tricky escapes to get stderr redirection to work
+       var command = 'cmd /c ""' + EXE;
+       if (what == "version") {
+               command = command + '" -v"';
+       }
+       var version = execute(command + '" 2>&1"');
+
+       if (what == "64") {
+               if (version.match(/x64/)) {
+                       return 1;
+               }
+       } else {
+               if (version.match(/(\d+\.\d+(\.\d+)?(\.\d+)?)/)) {
+                       return RegExp.$1;
+               }
+       }
+       return 0;
+}
+
 function condense_path(path)
 {
        path = FSO.GetAbsolutePathName(path);
@@ -1376,6 +1397,9 @@ function output_as_table(header, ar_out)
 function write_summary()
 {
        var ar = new Array();
+       if (PHP_SUMMARY == "no") {
+               return;
+       }
 
        STDOUT.WriteBlankLines(2);
 
@@ -1426,7 +1450,6 @@ function generate_files()
        generate_config_h();
        STDOUT.WriteLine("Done.");
        STDOUT.WriteBlankLines(1);
-
        write_summary();
 
        if (PHP_SNAPSHOT_BUILD != "no") {
@@ -1732,7 +1755,6 @@ function _inner_glob(base, p, parts)
        return items;
 }
 
-
 // for snapshot builders, this option will attempt to enable everything
 // and you can then build everything, ignoring fatal errors within a module
 // by running "nmake snap"
@@ -1743,5 +1765,3 @@ ARG_ENABLE('snapshot-build', 'Build a snapshot; turns on everything it can and i
 // several objects at once, reducing overhead of starting new
 // compiler processes.
 ARG_ENABLE('one-shot', 'Optimize for fast build - best for release and snapshot builders, not so hot for edit-and-rebuild hacking', 'no');
-
-