From ef9f5c95690964acd9fa95dfa1f4a5a9d9eb5ea9 Mon Sep 17 00:00:00 2001
From: Beman Dawes <bdawes@acm.org>
Date: Tue, 29 Jul 2003 15:05:06 +0000
Subject: [PATCH] Allow como-win32 backend compiler to be specified via
 COMO_BACKEND_PATH

[SVN r19344]
---
 como-tools.html         | 10 ++++++++--
 como-win32-tools.jam    |  9 ++++-----
 v1/como-tools.html      | 10 ++++++++--
 v1/como-win32-tools.jam |  9 ++++-----
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/como-tools.html b/como-tools.html
index 252d933b4..69a5e61ff 100644
--- a/como-tools.html
+++ b/como-tools.html
@@ -13,7 +13,7 @@
     </td>
     <td valign="top"> 
       <h1 align="center">Boost.Build</h1>
-      <h2 align="center">como toolset</h2>
+      <h2 align="center">como and como-win32 toolsets</h2>
     </td>
   </tr>
 </table>
@@ -64,12 +64,18 @@ environment or configured on the jam command-line using
     <td><code>$(COMO_PATH)/libcomo</code>
     <td>&nbsp;
 
+<tr>
+    <td><code>COMO_BACKEND_PATH</code>
+    <td>Path to backend compiler.
+    <td><code>$(VC7_TOOLS)</code>
+    <td>como-win32 toolset only.
+
 </table>
 
 <hr>
 <p>Revised 
   <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  28 May, 2003 
+  29 July, 2003 
   <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
 </p>
 <p><i>&copy; Copyright <a href="../../people/dave_abrahams.htm">Dave Abrahams</a> 
diff --git a/como-win32-tools.jam b/como-win32-tools.jam
index 53fbbd596..5bcf1c4e9 100644
--- a/como-win32-tools.jam
+++ b/como-win32-tools.jam
@@ -18,6 +18,7 @@ free-feature no-warn ;
 # COMO_BIN_PATH - path to como executable, defaults to $(COMO_PATH)/bin/
 # COMO_INCLUDE_PATH - path to libcomo headers, defaults to $(COMO_PATH)/libcomo
 # COMO_STDLIB_PATH - path to built libcomo object, defaults to $(COMO_PATH)/libcomo
+# COMO_BACKEND_PATH - path to backend compiler root directory, defaults to $(VC7_ROOT)
 
 # Keep using COMO_BASE for backward compatibility
 set-as-singleton COMO_BASE ;
@@ -40,14 +41,12 @@ if ! $(COMO_PATH_SETUP) # do this once
     COMO_BACKEND_SETUP = $(COMO_BACKEND_SETUP) ;
     newline = "
 " ;
-    COMO_BACKEND = $(VC7_ROOT) ;
-    COMO_BACKEND_INCLUDE_SETUP ?= "set \"COMO_MS_INCLUDE="$(VC7_ROOT)"/include\"" ;
+    COMO_BACKEND_PATH ?= $(VC7_ROOT) ;
+    COMO_BACKEND_INCLUDE_SETUP ?= "set \"COMO_MS_INCLUDE="$(COMO_BACKEND_PATH)"/include\"" ;
     COMO_BACKEND_LIB_SETUP ?= "set \"LIB="$(COMO_STDLIB_PATH)";%LIB%\"" ;
     COMO_PATH_SETUP ?= "set \"PATH="$(COMO_BIN_DIRECTORY)";%PATH%\"" ;
-    COMO_BACKEND_SETUP ?= "call "\"$(VSCOMNTOOLS)vsvars32"\" >nul" ;
-    COMO_BACKEND_SETUP ?= REM set VC7_ROOT or COMO_BACKEND_SETUP to set up the back end ;
+    COMO_BACKEND_SETUP ?= "call "\"$(COMO_BACKEND_PATH)\\..\\Common7\\Tools\\vsvars32"\" >nul" ;
     COMO_BASE_SETUP ?= "set \"COMO_BASE=$(COMO_BASE)\"" ;
-    COMO_PATH_SETUP ?= REM set COMO_PATH to set up the path for Comeau ;
     COMO_PATH_SETUP ?= "" ;
 }
 
diff --git a/v1/como-tools.html b/v1/como-tools.html
index 252d933b4..69a5e61ff 100644
--- a/v1/como-tools.html
+++ b/v1/como-tools.html
@@ -13,7 +13,7 @@
     </td>
     <td valign="top"> 
       <h1 align="center">Boost.Build</h1>
-      <h2 align="center">como toolset</h2>
+      <h2 align="center">como and como-win32 toolsets</h2>
     </td>
   </tr>
 </table>
@@ -64,12 +64,18 @@ environment or configured on the jam command-line using
     <td><code>$(COMO_PATH)/libcomo</code>
     <td>&nbsp;
 
+<tr>
+    <td><code>COMO_BACKEND_PATH</code>
+    <td>Path to backend compiler.
+    <td><code>$(VC7_TOOLS)</code>
+    <td>como-win32 toolset only.
+
 </table>
 
 <hr>
 <p>Revised 
   <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  28 May, 2003 
+  29 July, 2003 
   <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
 </p>
 <p><i>&copy; Copyright <a href="../../people/dave_abrahams.htm">Dave Abrahams</a> 
diff --git a/v1/como-win32-tools.jam b/v1/como-win32-tools.jam
index 53fbbd596..5bcf1c4e9 100644
--- a/v1/como-win32-tools.jam
+++ b/v1/como-win32-tools.jam
@@ -18,6 +18,7 @@ free-feature no-warn ;
 # COMO_BIN_PATH - path to como executable, defaults to $(COMO_PATH)/bin/
 # COMO_INCLUDE_PATH - path to libcomo headers, defaults to $(COMO_PATH)/libcomo
 # COMO_STDLIB_PATH - path to built libcomo object, defaults to $(COMO_PATH)/libcomo
+# COMO_BACKEND_PATH - path to backend compiler root directory, defaults to $(VC7_ROOT)
 
 # Keep using COMO_BASE for backward compatibility
 set-as-singleton COMO_BASE ;
@@ -40,14 +41,12 @@ if ! $(COMO_PATH_SETUP) # do this once
     COMO_BACKEND_SETUP = $(COMO_BACKEND_SETUP) ;
     newline = "
 " ;
-    COMO_BACKEND = $(VC7_ROOT) ;
-    COMO_BACKEND_INCLUDE_SETUP ?= "set \"COMO_MS_INCLUDE="$(VC7_ROOT)"/include\"" ;
+    COMO_BACKEND_PATH ?= $(VC7_ROOT) ;
+    COMO_BACKEND_INCLUDE_SETUP ?= "set \"COMO_MS_INCLUDE="$(COMO_BACKEND_PATH)"/include\"" ;
     COMO_BACKEND_LIB_SETUP ?= "set \"LIB="$(COMO_STDLIB_PATH)";%LIB%\"" ;
     COMO_PATH_SETUP ?= "set \"PATH="$(COMO_BIN_DIRECTORY)";%PATH%\"" ;
-    COMO_BACKEND_SETUP ?= "call "\"$(VSCOMNTOOLS)vsvars32"\" >nul" ;
-    COMO_BACKEND_SETUP ?= REM set VC7_ROOT or COMO_BACKEND_SETUP to set up the back end ;
+    COMO_BACKEND_SETUP ?= "call "\"$(COMO_BACKEND_PATH)\\..\\Common7\\Tools\\vsvars32"\" >nul" ;
     COMO_BASE_SETUP ?= "set \"COMO_BASE=$(COMO_BASE)\"" ;
-    COMO_PATH_SETUP ?= REM set COMO_PATH to set up the path for Comeau ;
     COMO_PATH_SETUP ?= "" ;
 }