Improved path defaults for msvc toolsets

From: Thomas Witt (witt_at_[hidden])
Date: 2003-07-29 15:36:08

Hi,

The attached patch makes the installation paths defaults work with non 
US/ non standard Windows installations.

The line:
ProgramFiles ?= $(PROGRAMFILES) ;

is needed, so that it works with CYGWIN bash too.

If nobody objects I am going to apply the patch tomorrow.

Thomas
 --------------090907030703050903050804 Content-Type: text/plain;
name="tools.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="tools.patch"

? tools.patch
? jam_src/bin.ntx86
? jam_src/bootstrap.vc7
? jam_src/vc70.pdb
Index: msvc-tools.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/msvc-tools.jam,v
retrieving revision 1.40
diff -u -3 -p -u -r1.40 msvc-tools.jam
--- msvc-tools.jam	19 Feb 2003 13:59:47 -0000	1.40
+++ msvc-tools.jam	29 Jul 2003 20:28:29 -0000
@@ -34,7 +34,9 @@ if ! $(MSVCDir)
# In case someone set VISUALC in order to build Jam, we can just use that.
MSVC_ROOT ?= $(VISUALC) ;
# Otherwise, guess a standard installation directory
- MSVC_ROOT ?= "C:\\Program Files\\Microsoft Visual Studio\\VC98" ;
+
+ ProgramFiles ?= $(PROGRAMFILES) ;
+ MSVC_ROOT ?= "$(ProgramFiles)\\Microsoft Visual Studio\\VC98" ;

# Reconstitutes paths containing spaces
MSVC_ROOT = $(MSVC_ROOT:J=" ") ;
Index: vc7-tools.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/vc7-tools.jam,v
retrieving revision 1.7
diff -u -3 -p -u -r1.7 vc7-tools.jam
--- vc7-tools.jam	4 Sep 2002 16:07:35 -0000	1.7
+++ vc7-tools.jam	29 Jul 2003 20:28:29 -0000
@@ -5,7 +5,8 @@ set-as-singleton VC7_ROOT ;

if ! $(MSVCDir)
{
- VC7_ROOT ?= "C:\\Program Files\\Microsoft Visual Studio .NET\\VC7" ;
+ ProgramFiles ?= $(PROGRAMFILES) ;
+ VC7_ROOT ?= "$(ProgramFiles)\\Microsoft Visual Studio .NET\\VC7" ;
VC_TOOL_PATH = "$(VC7_ROOT)"\\bin\\ ;
VC_SETUP = "CALL \"$(VC_TOOL_PATH)VCVARS32.BAT\" >nul" ;
}
Index: vc7.1-tools.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/vc7.1-tools.jam,v
retrieving revision 1.1
diff -u -3 -p -u -r1.1 vc7.1-tools.jam
--- vc7.1-tools.jam	27 Apr 2003 14:10:51 -0000	1.1
+++ vc7.1-tools.jam	29 Jul 2003 20:28:29 -0000
@@ -5,7 +5,8 @@ set-as-singleton VC71_ROOT ;

if ! $(MSVCDir)
{
- VC71_ROOT ?= "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\VC7" ;
+ ProgramFiles ?= $(PROGRAMFILES) ;
+ VC71_ROOT ?= "$(ProgramFiles)\\Microsoft Visual Studio .NET 2003\\VC7" ;
VC_TOOL_PATH = "$(VC71_ROOT)"\\bin\\ ;
VC_SETUP = "CALL \"$(VC_TOOL_PATH)VCVARS32.BAT\" >nul" ;
}
 --------------090907030703050903050804--