On Mon, Jul 7, 2008 at 3:23 AM, Steph Fox <[EMAIL PROTECTED]> wrote: > sfox Mon Jul 7 01:23:56 2008 UTC > > Modified files: (Branch: PHP_5_3) > /php-src/win32/build config.w32 confutils.js > Log: > - Fix up some bits and pieces.
For examples? Log message helps to see what has been changed, please be verbose. > - Head towards making it possible for all platforms to have compiler info in > phpinfo() output. It is already in php info: phpinfo() PHP Version => 5.3.0-dev System => Windows NT PIERREXP64 5.2 build 3790 Build Date => Jul 6 2008 11:50:59 Configure Command => cscript /nologo configure.js "--enable-snapshot-build" "--with-php-build=..\deps" "--with-gd=shared" "--disable-phar" "--with-mysqli" "--disable-apc" "--without-maxdb" Windows Compiler and Version => MSVC6 What is missing is the non windows platform part. As far as I remember someone is already working on it and will add this info as well. > - Make it possible to switch off configure summary (--without-summary). Talking about asking before committing, please do it next time (as I do). The idea is the other way round, to drop the noise or get it if enabled. > http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.20&r2=1.40.2.8.2.10.2.21&diff_format=u > Index: php-src/win32/build/config.w32 > +var VC_VERSIONS = new Array(); > +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)'; > + > // 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 > +VCVERS = probe_binary(CL).substr(0, 5).replace('.', ''); > +STDOUT.WriteLine(" Detected compiler " + VC_VERSIONS[VCVERS]); > +AC_DEFINE('COMPILER', VC_VERSIONS[VCVERS], "Detected compiler version"); <snip> > http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.19&r2=1.60.2.1.2.8.2.20&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.19 > php-src/win32/build/confutils.js:1.60.2.1.2.8.2.20 > --- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.19 Sat Jul 5 19:53:04 > 2008 > +++ php-src/win32/build/confutils.js Mon Jul 7 01:23:56 2008 > @@ -17,7 +17,7 @@ > +----------------------------------------------------------------------+ > */ > > -// $Id: confutils.js,v 1.60.2.1.2.8.2.19 2008/07/05 19:53:04 pajoye Exp $ > +// $Id: confutils.js,v 1.60.2.1.2.8.2.20 2008/07/07 01:23:56 sfox Exp $ > > var STDOUT = WScript.StdOut; > var STDERR = WScript.StdErr; > @@ -30,13 +30,6 @@ > 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'; Please leave the declaration here, it is in the top of the configure script where other globals are declared. Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
