pajoye Sat Jul 5 19:53:04 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/build config.w32 confutils.js
Log:
-MFH: improve detection of VC version and summary (2k2 and 2k3 are 1300 and
resp. 1310) (Thx Marcus)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.18&r2=1.40.2.8.2.10.2.19&diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.18
php-src/win32/build/config.w32:1.40.2.8.2.10.2.19
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.18 Wed Jul 2 20:49:12 2008
+++ php-src/win32/build/config.w32 Sat Jul 5 19:53:04 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.18 2008/07/02 20:49:12 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.19 2008/07/05 19:53:04 pajoye Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -31,13 +31,15 @@
}
// Which version of the compiler do we have?
-VCVERS = probe_binary(CL).substr(0, 2);
+VCVERS = probe_binary(CL);
+VCVERS = VCVERS.substr(0, 2) + VCVERS.substr(3, 2);
STDOUT.WriteLine("Detected MS compiler version " + VCVERS);
-// 12 is VC6
-// 13 is vs.net 2003
-// 14 is vs.net 2005
-// 15 is vs.net 2008
+// 1200 is VC6
+// 1300 is vs.net 2002
+// 1310 is vs.net 2003
+// 1400 is vs.net 2005
+// 1500 is vs.net 2008
// do we use x64 or 80x86 version of compiler?
X64 = probe_binary(CL, 64);
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.18&r2=1.60.2.1.2.8.2.19&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.18
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.18 Wed Jul 2 20:50:18 2008
+++ php-src/win32/build/confutils.js Sat Jul 5 19:53:04 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.60.2.1.2.8.2.18 2008/07/02 20:50:18 pajoye Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.19 2008/07/05 19:53:04 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -30,15 +30,12 @@
var extensions_enabled = new Array();
var sapi_enabled = new Array();
-// 12 is VC6
-// 13 is vs.net 2003
-// 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';
+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';
if (PROGRAM_FILES == null) {
PROGRAM_FILES = "C:\\Program Files";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
