Re: cvs: php-src(PHP_5_3) /win32/build confutils.js

Hello Pierre-Alain, Wednesday, July 2, 2008, 10:50:18 PM, you wrote: > pajoye Wed Jul 2 20:50:18 2008 UTC > Modified files: (Branch: PHP_5_3) > /php-src/win32/build confutils.js > Log: > - add summary function and VC version info > > > http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.17&r2=1.60.2.1.2.8.2.18&diff_format=uó6`øy o½ > ÄMÔÅõY¶ > Index: php-src/win32/build/confutils.js > diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.17 > php-src/win32/build/confutils.js:1.60.2.1.2.8.2.18 > --- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.17 Mon Jun 23 11:44:21 2008 > +++ php-src/win32/build/confutils.js Wed Jul 2 20:50:18 2008 > @@ -17,7 +17,7 @@ > +----------------------------------------------------------------------+ > */ > > -// $Id: confutils.js,v 1.60.2.1.2.8.2.17 2008/06/23 11:44:21 pajoye Exp $ > +// $Id: confutils.js,v 1.60.2.1.2.8.2.18 2008/07/02 20:50:18 pajoye Exp $ > > var STDOUT = WScript.StdOut; > var STDERR = WScript.StdErr; > @@ -30,6 +30,16 @@ > var extensions_enabled = new Array(); > var sapi_enabled = new Array(); > > +// 12 is VC6 > +// 13 is vs.net 2003 Iirc, then 1300 is VC 2002 and 1310 is VC 2003 marcus > +// 14 is vs.net 2005 > +// 15 is vs.net 2008 > +var VC_VERSIONS = new Array(); > +VC_VERSIONS[12] = 'VC6'; > +VC_VERSIONS[13] = 'Visual C++ 2003'; > +VC_VERSIONS[14] = 'Visual C++ 2005'; > +VC_VERSIONS[15] = 'Visual C++ 2008'; > + > if (PROGRAM_FILES == null) { > PROGRAM_FILES = "C:\\Program Files"; > } > @@ -1304,7 +1314,6 @@ > STDOUT.WriteLine("Invalid header argument, can't output > the table " + l + " " + ar_out[0].length ); > return; > } > - > for (j=0; j < l; j++) { > var tmax, tmin; > > @@ -1316,8 +1325,14 @@ > if (t > tmax) tmax = t; > else if (t < tmin) tmin = t; > } > - max[j] = tmax; > - min[j] = tmin; > + if (tmax > header[j].length) { > + max[j] = tmax; > + } else { > + max[j] = header[j].length; > + } > + if (tmin < header[j].length) { > + min[j] = header[j].length; > + } > } > > sep = ""; > @@ -1361,6 +1376,27 @@ > STDOUT.WriteLine(sep); > } > > +function write_summary() > +{ > + var ar = new Array(); > + > + 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); > + > + ar[0] = ['Compiler', VC_VERSIONS[VCVERS]]; > + ar[1] = ['Architecture', X64 ? 'x64' : 'x86']; > + > + output_as_table(["",""], ar); > + STDOUT.WriteBlankLines(2); > +} > + > function generate_files() > { > var i, dir, bd, last; > @@ -1386,24 +1422,16 @@ > FSO.CreateFolder(bd); > } > } > - > + > STDOUT.WriteLine("Generating files..."); > generate_makefile(); > 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); > + > + write_summary(); > + > if (PHP_SNAPSHOT_BUILD != "no") { > STDOUT.WriteLine("Type 'nmake snap' to build a PHP > snapshot"); > } else { Best regards, Marcus