boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-16 01:12:13 +00:00
Code Issues Projects Releases Wiki Activity

Patched boost-base.jam to allow rules in stage target requirements

Browse Source 
Fixed grammar in build_system.htm
Added vc7.1-tools.jam/.html for msvc 7.1
Updated the regex lib Jamfile to build correctly-named libraries


[SVN r18319]
This commit is contained in:
Dave Abrahams
2003-04-27 14:10:52 +00:00
parent 69e76f312f
commit 098bd7ebb1
10 changed files with 182 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
boost-base.jam
View File

@@ -2129,8 +2129,6 @@ rule stage ( name : sources + : requirements * : local-build * )
local stage-id =
[ grist-targets $(name) ] ;
local tags =
[ get-properties <tag> : $(requirements) ] ;
# Supress the regular build of this target
local gSUPPRESS_FAKE_TARGETS = [ get-values <suppress> : $(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) ;

4
build_system.htm
View File

@@ -950,7 +950,7 @@ exe test : test.cpp &lt;lib&gt;basic ;<br>
main targets. But one additional type of requirement is possible:
<tt>&lt;tag&gt;</tt>... 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:
<blockquote>
<pre>
@@ -1407,7 +1407,7 @@ flags msvc HDRS &lt;include&gt; ;
<p>Revised
<!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %B, %Y" startspan
-->24 May, 2002
-->27 April, 2003
<!--webbot bot="Timestamp" endspan i-checksum="13972"
-->
</p>

11
index.html
View File

@@ -245,11 +245,14 @@
</tr>
<tr>
<td><a href="vc7-tools.html"><code>vc7</code></a></td>
<td>Microsoft <a
href="http://msdn.microsoft.com/visualc/">Visual C++</a>
command-line tools from Visual Studio .NET.</td>
</tr>
<tr>
<td><a href="vc7.1-tools.html"><code>vc7.1</code></a></td>
<td>Microsoft <a href="http://msdn.microsoft.com/visualc/">Visual
C++</a> command-line tools, in case you are using the <a href=
"msvc-tools.html"><code>msvc</code></a> toolset for a <a href=
"http://msdn.microsoft.com/visualc/productinfo/previous/default.asp">Visual
C++ 6.x</a>.</td>
C++</a> command-line tools from Visual Studio .NET 2003.</td>
</tr>
</table>
<p>Unless otherwise specified, the library is assumed to be the one

8
v1/boost-base.jam
View File

@@ -2129,8 +2129,6 @@ rule stage ( name : sources + : requirements * : local-build * )
local stage-id =
[ grist-targets $(name) ] ;
local tags =
[ get-properties <tag> : $(requirements) ] ;
# Supress the regular build of this target
local gSUPPRESS_FAKE_TARGETS = [ get-values <suppress> : $(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) ;

4
v1/build_system.htm
View File

@@ -950,7 +950,7 @@ exe test : test.cpp &lt;lib&gt;basic ;<br>
main targets. But one additional type of requirement is possible:
<tt>&lt;tag&gt;</tt>... 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:
<blockquote>
<pre>
@@ -1407,7 +1407,7 @@ flags msvc HDRS &lt;include&gt; ;
<p>Revised
<!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %B, %Y" startspan
-->24 May, 2002
-->27 April, 2003
<!--webbot bot="Timestamp" endspan i-checksum="13972"
-->
</p>

11
v1/index.html
View File

@@ -245,11 +245,14 @@
</tr>
<tr>
<td><a href="vc7-tools.html"><code>vc7</code></a></td>
<td>Microsoft <a
href="http://msdn.microsoft.com/visualc/">Visual C++</a>
command-line tools from Visual Studio .NET.</td>
</tr>
<tr>
<td><a href="vc7.1-tools.html"><code>vc7.1</code></a></td>
<td>Microsoft <a href="http://msdn.microsoft.com/visualc/">Visual
C++</a> command-line tools, in case you are using the <a href=
"msvc-tools.html"><code>msvc</code></a> toolset for a <a href=
"http://msdn.microsoft.com/visualc/productinfo/previous/default.asp">Visual
C++ 6.x</a>.</td>
C++</a> command-line tools from Visual Studio .NET 2003.</td>
</tr>
</table>
<p>Unless otherwise specified, the library is assumed to be the one

58
v1/vc7.1-tools.html Executable file
View File

@@ -0,0 +1,58 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" type="text/css" href="boost.css">
<title>Boost.Build - vc7.1 toolset</title>
</head>
<body link="#0000ff" vlink="#800080">
<table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
"header">
<tr>
<td valign="top" width="300">
<h3><a href="http://www.boost.org"><img height="86" width="277" alt="C++ Boost" src="../../c++boost.gif" border="0"></a></h3>
</td>
<td valign="top">
<h1 align="center">Boost.Build</h1>
<h2 align="center">vc7.1 toolset</h2>
</td>
</tr>
</table>
<hr>
<h2>Introduction</h2>
<p>Boost.Build's <a href="http://msdn.microsoft.com/visualc/">vc7.1</a> toolset supports the
Microsoft Visual C++ .NET tools. This toolset is an extention to the
<code><a href="msvc-tools.html">msvc</a></code> toolset and is useful
for when you need to have access to several versions of Visual C++.
<h2>Configuration Variables</h2>
The vc7.1 toolset responds to the following variables which can be set in the
environment or configured on the jam command-line using
<code>-s<i>VARIABLE_NAME</i>=</code><i>value</i>:
<table border="1">
<tr><th>Variable Name <th>Semantics <th>Default <th>Notes
<tr>
<td><code>VC71_ROOT</code>
<td>Path to installation of VC7.1.
<td><code>C:\Program&nbsp;Files\Microsoft&nbsp;Visual&nbsp;Studio&nbsp;.NET 2003\Vc7</code>
<td>If <code>MSVCDir</code> is set in the environment, the toolset
will assume <code>VCVARS32.BAT</code>has already been called, and
will ignore this variable.
</table>
<hr>
<p>Revised
<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
15 May, 2002
<!--webbot bot="Timestamp" endspan i-checksum="39359" -->
</p>
<p><i>&copy; Copyright <a href="../../people/dave_abrahams.htm">Dave Abrahams</a>
2002. All Rights Reserved.</i></p>
</body>
</html>

21
v1/vc7.1-tools.jam Executable file
View File

@@ -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.
#//<a href="http://msdn.microsoft.com/vstudio/default.asp">Micro-<br>soft<br>VC++</a>

58
vc7.1-tools.html Executable file
View File

@@ -0,0 +1,58 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" type="text/css" href="boost.css">
<title>Boost.Build - vc7.1 toolset</title>
</head>
<body link="#0000ff" vlink="#800080">
<table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
"header">
<tr>
<td valign="top" width="300">
<h3><a href="http://www.boost.org"><img height="86" width="277" alt="C++ Boost" src="../../c++boost.gif" border="0"></a></h3>
</td>
<td valign="top">
<h1 align="center">Boost.Build</h1>
<h2 align="center">vc7.1 toolset</h2>
</td>
</tr>
</table>
<hr>
<h2>Introduction</h2>
<p>Boost.Build's <a href="http://msdn.microsoft.com/visualc/">vc7.1</a> toolset supports the
Microsoft Visual C++ .NET tools. This toolset is an extention to the
<code><a href="msvc-tools.html">msvc</a></code> toolset and is useful
for when you need to have access to several versions of Visual C++.
<h2>Configuration Variables</h2>
The vc7.1 toolset responds to the following variables which can be set in the
environment or configured on the jam command-line using
<code>-s<i>VARIABLE_NAME</i>=</code><i>value</i>:
<table border="1">
<tr><th>Variable Name <th>Semantics <th>Default <th>Notes
<tr>
<td><code>VC71_ROOT</code>
<td>Path to installation of VC7.1.
<td><code>C:\Program&nbsp;Files\Microsoft&nbsp;Visual&nbsp;Studio&nbsp;.NET 2003\Vc7</code>
<td>If <code>MSVCDir</code> is set in the environment, the toolset
will assume <code>VCVARS32.BAT</code>has already been called, and
will ignore this variable.
</table>
<hr>
<p>Revised
<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
15 May, 2002
<!--webbot bot="Timestamp" endspan i-checksum="39359" -->
</p>
<p><i>&copy; Copyright <a href="../../people/dave_abrahams.htm">Dave Abrahams</a>
2002. All Rights Reserved.</i></p>
</body>
</html>

21
vc7.1-tools.jam Executable file
View File

@@ -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.
#//<a href="http://msdn.microsoft.com/vstudio/default.asp">Micro-<br>soft<br>VC++</a>