archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- improve detection of VC version and summary (2k2 and 2k3 are 1300 and resp. 1310) (Thx Marcus)

Browse source
This commit is contained in:
Pierre Joye 2008-07-05 19:52:45 +00:00
parent 1c82616c27
commit ddf346adbe
2 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
win32/build/config.w32
View file

@ -31,13 +31,15 @@ function probe_binary(EXE, what)
} }
// Which version of the compiler do we have? // 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); STDOUT.WriteLine("Detected MS compiler version " + VCVERS);
// 12 is VC6 // 1200 is VC6
// 13 is vs.net 2003 // 1300 is vs.net 2002
// 14 is vs.net 2005 // 1310 is vs.net 2003
// 15 is vs.net 2008 // 1400 is vs.net 2005
// 1500 is vs.net 2008
// do we use x64 or 80x86 version of compiler? // do we use x64 or 80x86 version of compiler?
X64 = probe_binary(CL, 64); X64 = probe_binary(CL, 64);

15
win32/build/confutils.js
View file

@ -17,7 +17,7 @@
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
*/ */
// $Id: confutils.js,v 1.74 2008-07-02 20:54:10 pajoye Exp $ // $Id: confutils.js,v 1.75 2008-07-05 19:52:45 pajoye Exp $
var STDOUT = WScript.StdOut; var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr; var STDERR = WScript.StdErr;
@ -30,15 +30,12 @@ var PROGRAM_FILES = WshShell.Environment("Process").Item("ProgramFiles");
var extensions_enabled = new Array(); var extensions_enabled = new Array();
var sapi_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(); var VC_VERSIONS = new Array();
VC_VERSIONS[12] = 'VC6'; VC_VERSIONS[1200] = 'VC6';
VC_VERSIONS[13] = 'Visual C++ 2003'; VC_VERSIONS[1300] = 'Visual C++ 2002';
VC_VERSIONS[14] = 'Visual C++ 2005'; VC_VERSIONS[1310] = 'Visual C++ 2003';
VC_VERSIONS[15] = 'Visual C++ 2008'; VC_VERSIONS[1400] = 'Visual C++ 2005';
VC_VERSIONS[1500] = 'Visual C++ 2008';
if (PROGRAM_FILES == null) { if (PROGRAM_FILES == null) {
PROGRAM_FILES = "C:\\Program Files"; PROGRAM_FILES = "C:\\Program Files";