pajoye Mon Jun 23 08:11:31 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/build confutils.js
Log:
- add a MESSAGE function
[DOC] to be used instead of STDOUT in config.w32, it allows them to be
redirected (like in a quiet mode)
- add the list of enabled SAPI
- improve the table output
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.15&r2=1.60.2.1.2.8.2.16&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.15
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.16
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.15 Sun Jun 22 23:15:54 2008
+++ php-src/win32/build/confutils.js Mon Jun 23 08:11:31 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.60.2.1.2.8.2.15 2008/06/22 23:15:54 pajoye Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.16 2008/06/23 08:11:31 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -28,7 +28,7 @@
var PROGRAM_FILES = WshShell.Environment("Process").Item("ProgramFiles");
var extensions_enabled = new Array();
-
+var sapi_enabled = new Array();
if (PROGRAM_FILES == null) {
PROGRAM_FILES = "C:\\Program Files";
@@ -1008,6 +1008,7 @@
}
MFO.WriteBlankLines(1);
+ sapi_enabled[sapi_enabled.length] = [sapiname];
}
function ADD_DIST_FILE(filename)
@@ -1318,12 +1319,19 @@
max[j] = tmax;
min[j] = tmin;
}
+
sep = "";
- k = max[0] + max[1] + 7;
+ k = 0;
+ for (i = 0; i < l; i++) {
+ k += max[i] + 3;
+ }
+ k++;
+
for (j=0; j < k; j++) {
sep += "-";
}
+ STDOUT.WriteLine(sep);
out = "|";
for (j=0; j < l; j++) {
out += " " + header[j];
@@ -1384,9 +1392,16 @@
generate_internal_functions();
generate_config_h();
+ STDOUT.WriteBlankLines(2);
+
+ STDOUT.WriteLine("Enabled extensions:");
output_as_table(["Extension", "Mode"], extensions_enabled);
STDOUT.WriteBlankLines(2);
+ STDOUT.WriteLine("Enabled SAPI:");
+ output_as_table(["Sapi Name"], sapi_enabled);
+ STDOUT.WriteBlankLines(2);
+
STDOUT.WriteLine("Done.");
STDOUT.WriteBlankLines(1);
if (PHP_SNAPSHOT_BUILD != "no") {
@@ -1545,6 +1560,11 @@
}
}
+function MESSAGE(msg)
+{
+ STDERR.WriteLine("" + msg);
+}
+
function ERROR(msg)
{
STDERR.WriteLine("ERROR: " + msg);