diff --git a/boost-base.jam b/boost-base.jam index 937d5de73..45664b4ca 100644 --- a/boost-base.jam +++ b/boost-base.jam @@ -2129,8 +2129,6 @@ rule stage ( name : sources + : requirements * : local-build * ) local stage-id = [ grist-targets $(name) ] ; - local tags = - [ get-properties : $(requirements) ] ; # Supress the regular build of this target local gSUPPRESS_FAKE_TARGETS = [ get-values : $(local-build) ] ; @@ -2161,7 +2159,7 @@ rule stage ( name : sources + : requirements * : local-build * ) local target-subdir = [ simplify-path-tokens [ top-relative-tokens [ directory-of $(source) ] ] ] ; dependent-include $(source:G=) ; - local gIMPOSED_REQUIREMENTS($(target-id)) = $(tags) ; + local gIMPOSED_REQUIREMENTS($(target-id)) = $(requirements) ; local subvariants = [ expand-target-subvariants $(target-id) : $(local-build) : $(TOOLS) ] ; for local subvariant in $(subvariants) @@ -2171,7 +2169,7 @@ rule stage ( name : sources + : requirements * : local-build * ) local s-toolset = ; local s-variant = ; split-target-subvariant s-target s-properties s-toolset s-variant : $(subvariant) ; - + if ( $(s-toolset) = $(source-build[1]) || $(source-build[1]) = * ) && ( $(s-variant) = $(source-build[2]) || $(source-build[2]) = * ) { @@ -2194,7 +2192,7 @@ rule stage ( name : sources + : requirements * : local-build * ) for local sv in $(sv-files) { local renamed-target = - [ rename-target $(sv) : [ split-path $(s-properties[1]) ] : ] ; ## $(tags) ] ; + [ rename-target $(sv) : [ split-path $(s-properties[1]) ] : ] ; files += $(sv) ; file-mode($(sv)) = $($(gTARGET_TYPE($(s-target)))MODE) ; diff --git a/build_system.htm b/build_system.htm index ab9e60718..b0eee1194 100644 --- a/build_system.htm +++ b/build_system.htm @@ -950,7 +950,7 @@ exe test : test.cpp <lib>basic ;
main targets. But one additional type of requirement is possible: <tag>... A tag specifies how to "augment" the names of the copied files. This is needed to distinguish the various files if - your collecting different builds of the same targets. The syntax is: + you're collecting different builds of the same targets. The syntax is: 
@@ -1407,7 +1407,7 @@ flags msvc HDRS <include> ;
 
     
Revised 
     24 May, 2002 
+                                -->27 April, 2003 
     
     

diff --git a/index.html b/index.html
index 1fd8bb846..175968d84 100644
--- a/index.html
+++ b/index.html
@@ -245,11 +245,14 @@
       
       
         vc7
+        Microsoft Visual C++
+        command-line tools from Visual Studio .NET.
+      
+      
+        vc7.1
         Microsoft Visual
-        C++ command-line tools, in case you are using the msvc toolset for a Visual
-        C++ 6.x.
+        C++ command-line tools from Visual Studio .NET 2003.
       
     
     
Unless otherwise specified, the library is assumed to be the one
diff --git a/v1/boost-base.jam b/v1/boost-base.jam
index 937d5de73..45664b4ca 100644
--- a/v1/boost-base.jam
+++ b/v1/boost-base.jam
@@ -2129,8 +2129,6 @@ rule stage ( name : sources + : requirements * : local-build * )
 
     local stage-id =
         [ grist-targets $(name) ] ;
-    local tags =
-        [ get-properties  : $(requirements) ] ;
 
     # Supress the regular build of this target
     local gSUPPRESS_FAKE_TARGETS =  [ get-values  : $(local-build) ] ;
@@ -2161,7 +2159,7 @@ rule stage ( name : sources + : requirements * : local-build * )
             local target-subdir = [ simplify-path-tokens [ top-relative-tokens [ directory-of $(source) ] ] ] ;
 
             dependent-include $(source:G=) ;
-            local gIMPOSED_REQUIREMENTS($(target-id)) = $(tags) ;
+            local gIMPOSED_REQUIREMENTS($(target-id)) = $(requirements) ;
             local subvariants = [ expand-target-subvariants $(target-id) : $(local-build) : $(TOOLS) ] ;
 
             for local subvariant in $(subvariants)
@@ -2171,7 +2169,7 @@ rule stage ( name : sources + : requirements * : local-build * )
                 local s-toolset = ;
                 local s-variant = ;
                 split-target-subvariant s-target s-properties s-toolset s-variant : $(subvariant) ;
-
+                
                 if  ( $(s-toolset) = $(source-build[1]) || $(source-build[1]) = * ) &&
                     ( $(s-variant) = $(source-build[2]) || $(source-build[2]) = * )
                 {
@@ -2194,7 +2192,7 @@ rule stage ( name : sources + : requirements * : local-build * )
                     for local sv in $(sv-files)
                     {
                         local renamed-target =
-                            [ rename-target $(sv) : [ split-path $(s-properties[1]) ] : ] ; ## $(tags) ] ;
+                            [ rename-target $(sv) : [ split-path $(s-properties[1]) ] : ] ;
 
                         files += $(sv) ;
                         file-mode($(sv)) = $($(gTARGET_TYPE($(s-target)))MODE) ;
diff --git a/v1/build_system.htm b/v1/build_system.htm
index ab9e60718..b0eee1194 100644
--- a/v1/build_system.htm
+++ b/v1/build_system.htm
@@ -950,7 +950,7 @@ exe test : test.cpp <lib>basic ;

         main targets. But one additional type of requirement is possible:
         <tag>... A tag specifies how to "augment" the names of
         the copied files. This is needed to distinguish the various files if
-        your collecting different builds of the same targets. The syntax is: 
+        you're collecting different builds of the same targets. The syntax is: 
 
         

 
@@ -1407,7 +1407,7 @@ flags msvc HDRS <include> ;
 
     
Revised 
     24 May, 2002 
+                                -->27 April, 2003 
     
     

diff --git a/v1/index.html b/v1/index.html
index 1fd8bb846..175968d84 100644
--- a/v1/index.html
+++ b/v1/index.html
@@ -245,11 +245,14 @@
       
       
         vc7
+        Microsoft Visual C++
+        command-line tools from Visual Studio .NET.
+      
+      
+        vc7.1
         Microsoft Visual
-        C++ command-line tools, in case you are using the msvc toolset for a Visual
-        C++ 6.x.
+        C++ command-line tools from Visual Studio .NET 2003.
       
     
     
Unless otherwise specified, the library is assumed to be the one
diff --git a/v1/vc7.1-tools.html b/v1/vc7.1-tools.html
new file mode 100755
index 000000000..bc4e9f214
--- /dev/null
+++ b/v1/vc7.1-tools.html
@@ -0,0 +1,58 @@
+
+
+
+
+Boost.Build - vc7.1 toolset
+
+
+
+   
+    
+    
+  
+
 
+      
C++ Boost

+    		 
+      
Boost.Build

+      
vc7.1 toolset

+    

+

+
+
Introduction

+
+
Boost.Build's vc7.1 toolset supports the
+Microsoft Visual C++ .NET tools. This toolset is an extention to the
+msvc toolset and is useful
+for when you need to have access to several versions of Visual C++.
+
+
Configuration Variables

+
+The vc7.1 toolset responds to the following variables which can be set in the
+environment or configured on the jam command-line using
+-sVARIABLE_NAME=value:
+
+
+
+
+    
Variable Name Semantics Default Notes
+
+
VC71_ROOT
+    Path to installation of VC7.1.
+    C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7
+    If MSVCDir is set in the environment, the toolset
+    will assume VCVARS32.BAThas already been called, and
+    will ignore this variable.
+
+

+
+

+
Revised 
+  
+  15 May, 2002 
+  
+

+
© Copyright Dave Abrahams 
+  2002. All Rights Reserved.

+
+
diff --git a/v1/vc7.1-tools.jam b/v1/vc7.1-tools.jam
new file mode 100755
index 000000000..79f1d7a1a
--- /dev/null
+++ b/v1/vc7.1-tools.jam
@@ -0,0 +1,21 @@
+extends-toolset msvc ;
+
+# singleton variables...
+set-as-singleton VC71_ROOT ;
+
+if ! $(MSVCDir)
+{
+    VC71_ROOT ?= "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\VC7" ;
+    VC_TOOL_PATH = "$(VC71_ROOT)"\\bin\\ ;
+    VC_SETUP = "CALL \"$(VC_TOOL_PATH)VCVARS32.BAT\" >nul" ;
+}
+VC_PDB_NAME = vc71 ;
+
+flags vc7.1 CFLAGS : /Op ;
+flags vc7.1 C++FLAGS : /Zc:wchar_t,forScope ;
+
+# The following #// line will be used by the regression test table generation
+# program as the column heading for HTML tables. Must not include version number.
+#//Micro-
soft
VC++
+
+
diff --git a/vc7.1-tools.html b/vc7.1-tools.html
new file mode 100755
index 000000000..bc4e9f214
--- /dev/null
+++ b/vc7.1-tools.html
@@ -0,0 +1,58 @@
+
+
+
+
+Boost.Build - vc7.1 toolset
+
+
+
+   
+    
+    
+  
+
 
+      
C++ Boost

+    		 
+      
Boost.Build

+      
vc7.1 toolset

+    

+

+
+
Introduction

+
+
Boost.Build's vc7.1 toolset supports the
+Microsoft Visual C++ .NET tools. This toolset is an extention to the
+msvc toolset and is useful
+for when you need to have access to several versions of Visual C++.
+
+
Configuration Variables

+
+The vc7.1 toolset responds to the following variables which can be set in the
+environment or configured on the jam command-line using
+-sVARIABLE_NAME=value:
+
+
+
+
+    
Variable Name Semantics Default Notes
+
+
VC71_ROOT
+    Path to installation of VC7.1.
+    C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7
+    If MSVCDir is set in the environment, the toolset
+    will assume VCVARS32.BAThas already been called, and
+    will ignore this variable.
+
+

+
+

+
Revised 
+  
+  15 May, 2002 
+  
+

+
© Copyright Dave Abrahams 
+  2002. All Rights Reserved.

+
+
diff --git a/vc7.1-tools.jam b/vc7.1-tools.jam
new file mode 100755
index 000000000..79f1d7a1a
--- /dev/null
+++ b/vc7.1-tools.jam
@@ -0,0 +1,21 @@
+extends-toolset msvc ;
+
+# singleton variables...
+set-as-singleton VC71_ROOT ;
+
+if ! $(MSVCDir)
+{
+    VC71_ROOT ?= "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\VC7" ;
+    VC_TOOL_PATH = "$(VC71_ROOT)"\\bin\\ ;
+    VC_SETUP = "CALL \"$(VC_TOOL_PATH)VCVARS32.BAT\" >nul" ;
+}
+VC_PDB_NAME = vc71 ;
+
+flags vc7.1 CFLAGS : /Op ;
+flags vc7.1 C++FLAGS : /Zc:wchar_t,forScope ;
+
+# The following #// line will be used by the regression test table generation
+# program as the column heading for HTML tables. Must not include version number.
+#//Micro-
soft
VC++
+
+