From bd07b390f157cacc83f5a6f915567321551db978 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Mon, 30 Jun 2003 12:32:19 +0000 Subject: [PATCH] Patch from Kirill Lapshin to improve msvc autoconfiguration. - use ProgramFiles environmental variable, if set, to handle localized Windows installation. - use VS71COMTTOOLS for detect vc 7.1 installation path. [SVN r18886] --- tools/msvc.jam | 27 ++++++++++++++++++++++++--- v2/tools/msvc.jam | 27 ++++++++++++++++++++++++--- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/tools/msvc.jam b/tools/msvc.jam index 5b3e5d300..342addbd6 100644 --- a/tools/msvc.jam +++ b/tools/msvc.jam @@ -153,10 +153,31 @@ local rule locate ( version ? : vendor ? ) # We know default locations only for msvc, not for alternative vendors if ! $(vendor) { - local version-6-path = "c:\\Program Files\\Microsoft Visual Studio\\VC98" ; - local version-7-path = "c:\\Program Files\\Microsoft Visual Studio .NET\\VC7" ; + local ProgramFiles = [ modules.peek : ProgramFiles ] ; + if $(ProgramFiles) + { + ProgramFiles = "$(ProgramFiles:J= )" ; + } + else + { + ProgramFiles = "c:\\Program Files" ; + } + + local version-6-path = $(ProgramFiles)"\\Microsoft Visual Studio\\VC98" ; + local version-7-path = $(ProgramFiles)"\\Microsoft Visual Studio .NET\\VC7" ; local version-7.0-path = $(version-7-path) ; - local version-7.1-path = "c:\\Program Files\\Microsoft Visual Studio .NET 2003\\VC7" ; + local version-7.1-path = $(ProgramFiles)"\\Microsoft Visual Studio .NET 2003\\VC7" ; + + local VS71COMNTOOLS = [ modules.peek : VS71COMNTOOLS ] ; + if $(VS71COMNTOOLS) + { + # VS71COMNTOOLS is set by VS .NET 2003 to \Common7\Tools + version-7.1-path = [ path.make "$(VS71COMNTOOLS:J= )" ] ; + version-7.1-path = [ path.parent $(version-7.1-path) ] ; + version-7.1-path = [ path.parent $(version-7.1-path) ] ; + version-7.1-path = [ path.join $(version-7.1-path) "VC7" ] ; + version-7.1-path = [ path.native $(version-7.1-path) ] ; + } if $(version) { diff --git a/v2/tools/msvc.jam b/v2/tools/msvc.jam index 5b3e5d300..342addbd6 100644 --- a/v2/tools/msvc.jam +++ b/v2/tools/msvc.jam @@ -153,10 +153,31 @@ local rule locate ( version ? : vendor ? ) # We know default locations only for msvc, not for alternative vendors if ! $(vendor) { - local version-6-path = "c:\\Program Files\\Microsoft Visual Studio\\VC98" ; - local version-7-path = "c:\\Program Files\\Microsoft Visual Studio .NET\\VC7" ; + local ProgramFiles = [ modules.peek : ProgramFiles ] ; + if $(ProgramFiles) + { + ProgramFiles = "$(ProgramFiles:J= )" ; + } + else + { + ProgramFiles = "c:\\Program Files" ; + } + + local version-6-path = $(ProgramFiles)"\\Microsoft Visual Studio\\VC98" ; + local version-7-path = $(ProgramFiles)"\\Microsoft Visual Studio .NET\\VC7" ; local version-7.0-path = $(version-7-path) ; - local version-7.1-path = "c:\\Program Files\\Microsoft Visual Studio .NET 2003\\VC7" ; + local version-7.1-path = $(ProgramFiles)"\\Microsoft Visual Studio .NET 2003\\VC7" ; + + local VS71COMNTOOLS = [ modules.peek : VS71COMNTOOLS ] ; + if $(VS71COMNTOOLS) + { + # VS71COMNTOOLS is set by VS .NET 2003 to \Common7\Tools + version-7.1-path = [ path.make "$(VS71COMNTOOLS:J= )" ] ; + version-7.1-path = [ path.parent $(version-7.1-path) ] ; + version-7.1-path = [ path.parent $(version-7.1-path) ] ; + version-7.1-path = [ path.join $(version-7.1-path) "VC7" ] ; + version-7.1-path = [ path.native $(version-7.1-path) ] ; + } if $(version) {