[Boost-build] Autodetection for VC++ Express 2005 (Was: Response file woes in Windows)

From: Alexey Pakhunov (alexeypa_at_[hidden])
Date: 2005-11-15 14:29:16

Deane Yang wrote:
> But I'm still a little baffled by why when I try to run bjam.exe without 
>   running vsvars32.bat first, bjam can't find the vcvars32.bat or 
> vsvars32.bat script. Do I need to set something in my PATH variable or 
> something like that?

The attached patch fixed detection of VC++ Express 2005. Can you try it, 
please? It should detect it as 'msvc-8.0express'.

Best regards/Venlig hilsen,
   Alexey Pakhunov.

Index: msvc.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/msvc.jam,v
retrieving revision 1.63
diff -u -r1.63 msvc.jam
--- msvc.jam	9 Nov 2005 13:56:41 -0000	1.63
+++ msvc.jam	15 Nov 2005 19:24:31 -0000
@@ -670,7 +670,7 @@
 
 .ProgramFiles = [ path.make [ common.get-program-files-dir ] ] ;
 
-.known-versions = 8.0 7.1 7.1toolkit 7.0 6.0 ;
+.known-versions = 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ;
 
 # Version aliases
 .version-alias-6 = 6.0 ;
@@ -678,11 +678,12 @@
 .version-alias-8 = 8.0 ;
  
 # Name of the registry key that contains Visual C++ installation path
-#   (relative to "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft\VisualStudio\x.y\Setup"
-.version-6.0-reg = "Microsoft Visual C++" ;
-.version-7.0-reg = "VC" ;
-.version-7.1-reg = "VC" ;
-.version-8.0-reg = "VC" ;
+#   (relative to "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft"
+.version-6.0-reg = "VisualStudio\\6.0\\Setup\\Microsoft Visual C++" ;
+.version-7.0-reg = "VisualStudio\\7.0\\Setup\\VC" ;
+.version-7.1-reg = "VisualStudio\\7.1\\Setup\\VC" ;
+.version-8.0-reg = "VisualStudio\\8.0\\Setup\\VC" ;
+.version-8.0express-reg = "VCExpress\\8.0\\Setup\\VC" ;
 
 # Visual C++ Toolkit 2003 do not store its installation path in the registry.
 # The environment variable 'VCToolkitInstallDir' and the default installation 
@@ -725,7 +726,7 @@
         if $(.version-$(i)-reg)
         {
             local vc-path = [ W32_GETREG
-                "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\$(i)\\Setup\\"$(.version-$(i)-reg)
+                "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"$(.version-$(i)-reg)
                 : "ProductDir" ] ;
             
             if $(vc-path)