|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r72866 - in branches/release: . more more/getting_started more/getting_started/detail
From: ghost_at_[hidden]
Date: 2011-07-03 04:09:00
Author: vladimir_prus
Date: 2011-07-03 04:08:57 EDT (Sun, 03 Jul 2011)
New Revision: 72866
URL: http://svn.boost.org/trac/boost/changeset/72866
Log:
Merge Boost.Build branding changes:
https://svn.boost.org/trac/boost/changeset/72773
https://svn.boost.org/trac/boost/changeset/72793
Authorized by Beman.
Properties modified:
branches/release/bootstrap.bat (contents, props changed)
branches/release/bootstrap.sh (contents, props changed)
branches/release/more/ (props changed)
Text files modified:
branches/release/bootstrap.bat | 12 ++++++++----
branches/release/bootstrap.sh | 4 ++--
branches/release/more/getting_started/detail/build-from-source-head.rst | 12 ++++++------
branches/release/more/getting_started/detail/build-from-source-tail.rst | 8 ++++----
branches/release/more/getting_started/detail/distro.rst | 2 +-
branches/release/more/getting_started/unix-variants.html | 28 ++++++++++++++--------------
branches/release/more/getting_started/unix-variants.rst | 4 ++--
branches/release/more/getting_started/windows.html | 32 ++++++++++++++++----------------
branches/release/more/getting_started/windows.rst | 8 ++++----
9 files changed, 57 insertions(+), 53 deletions(-)
Modified: branches/release/bootstrap.bat
==============================================================================
--- branches/release/bootstrap.bat (original)
+++ branches/release/bootstrap.bat 2011-07-03 04:08:57 EDT (Sun, 03 Jul 2011)
@@ -5,8 +5,10 @@
REM Distributed under the Boost Software License, Version 1.0.
REM (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
-ECHO Building Boost.Jam build engine
+ECHO Building Boost.Build engine
+if exist ".\tools\build\v2\engine\bin.ntx86\b2.exe" del tools\build\v2\engine\bin.ntx86\b2.exe
if exist ".\tools\build\v2\engine\bin.ntx86\bjam.exe" del tools\build\v2\engine\bin.ntx86\bjam.exe
+if exist ".\tools\build\v2\engine\bin.ntx86_64\b2.exe" del tools\build\v2\engine\bin.ntx86_64\b2.exe
if exist ".\tools\build\v2\engine\bin.ntx86_64\bjam.exe" del tools\build\v2\engine\bin.ntx86_64\bjam.exe
pushd tools\build\v2\engine
@@ -16,10 +18,12 @@
popd
if exist ".\tools\build\v2\engine\bin.ntx86\bjam.exe" (
+ copy .\tools\build\v2\engine\bin.ntx86\b2.exe . > nul
copy .\tools\build\v2\engine\bin.ntx86\bjam.exe . > nul
goto :bjam_built)
if exist ".\tools\build\v2\engine\bin.ntx86_64\bjam.exe" (
+ copy .\tools\build\v2\engine\bin.ntx86_64\b2.exe . > nul
copy .\tools\build\v2\engine\bin.ntx86_64\bjam.exe . > nul
goto :bjam_built)
@@ -43,13 +47,13 @@
ECHO.
ECHO Bootstrapping is done. To build, run:
ECHO.
-ECHO .\bjam
+ECHO .\b2
ECHO.
ECHO To adjust configuration, edit 'project-config.jam'.
ECHO Further information:
ECHO.
ECHO - Command line help:
-ECHO .\bjam --help
+ECHO .\b2 --help
ECHO.
ECHO - Getting started guide:
ECHO http://boost.org/more/getting_started/windows.html
@@ -62,7 +66,7 @@
:bjam_failure
ECHO.
-ECHO Failed to build Boost.Jam build engine.
+ECHO Failed to build Boost.Build engine.
ECHO Please consult bootstrap.log for furter diagnostics.
ECHO.
ECHO You can try to obtain a prebuilt binary from
Modified: branches/release/bootstrap.sh
==============================================================================
--- branches/release/bootstrap.sh (original)
+++ branches/release/bootstrap.sh 2011-07-03 04:08:57 EDT (Sun, 03 Jul 2011)
@@ -213,12 +213,12 @@
# Build bjam
if test "x$BJAM" = x; then
- echo -n "Building Boost.Jam with toolset $TOOLSET... "
+ echo -n "Building Boost.Build engine with toolset $TOOLSET... "
pwd=`pwd`
(cd "$my_dir/tools/build/v2/engine" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1
if [ $? -ne 0 ]; then
echo
- echo "Failed to build Boost.Jam"
+ echo "Failed to build Boost.Build build engine"
echo "Consult 'bootstrap.log' for more details"
exit 1
fi
Modified: branches/release/more/getting_started/detail/build-from-source-head.rst
==============================================================================
--- branches/release/more/getting_started/detail/build-from-source-head.rst (original)
+++ branches/release/more/getting_started/detail/build-from-source-head.rst 2011-07-03 04:08:57 EDT (Sun, 03 Jul 2011)
@@ -11,7 +11,7 @@
1. Go to the directory ``tools``\ |/|\ ``build``\ |/|\ ``v2``\ |/|.
2. Run ``bootstrap.bat``
-3. Run ``bjam install --prefix=``\ *PREFIX* where *PREFIX* is
+3. Run ``b2 install --prefix=``\ *PREFIX* where *PREFIX* is
the directory where you want Boost.Build to be installed
4. Add *PREFIX*\ |/|\ ``bin`` to your PATH environment variable.
@@ -31,10 +31,10 @@
__ http://www.boost.org/boost-build2/doc/html/bbv2/reference/tools.html
.. Note:: If you previously chose a toolset for the purposes of
- `building bjam`_, you should assume it won't work and instead
+ `building b2`_, you should assume it won't work and instead
choose newly from the table below.
-.. _building bjam: ../../doc/html/bbv2/installation.html
+.. _building b2: ../../doc/html/bbv2/installation.html
+-----------+--------------------+-----------------------------+
|Toolset |Vendor |Notes |
@@ -102,18 +102,18 @@
default Boost.Build will create a ``bin.v2/`` subdirectory for that
purpose in your current working directory.
-Invoke ``bjam``
+Invoke ``b2``
...............
.. |build-directory| replace:: *build-directory*
.. |toolset-name| replace:: *toolset-name*
Change your current directory to the Boost root directory and
-invoke ``bjam`` as follows:
+invoke ``b2`` as follows:
.. parsed-literal::
- bjam **--build-dir=**\ |build-directory|_ **toolset=**\ |toolset-name|_ |build-type-complete| stage
+ b2 **--build-dir=**\ |build-directory|_ **toolset=**\ |toolset-name|_ |build-type-complete| stage
For a complete description of these and other invocation options,
please see the `Boost.Build documentation`__.
Modified: branches/release/more/getting_started/detail/build-from-source-tail.rst
==============================================================================
--- branches/release/more/getting_started/detail/build-from-source-tail.rst (original)
+++ branches/release/more/getting_started/detail/build-from-source-tail.rst 2011-07-03 04:08:57 EDT (Sun, 03 Jul 2011)
@@ -5,15 +5,15 @@
Building the special ``stage`` target places Boost
library binaries in the ``stage``\ |/|\ ``lib``\ |/| subdirectory of
the Boost tree. To use a different directory pass the
-``--stagedir=``\ *directory* option to ``bjam``.
+``--stagedir=``\ *directory* option to ``b2``.
-.. Note:: ``bjam`` is case-sensitive; it is important that all the
+.. Note:: ``b2`` is case-sensitive; it is important that all the
parts shown in **bold** type above be entirely lower-case.
For a description of other options you can pass when invoking
-``bjam``, type::
+``b2``, type::
- bjam --help
+ b2 --help
In particular, to limit the amount of time spent building, you may
be interested in:
Modified: branches/release/more/getting_started/detail/distro.rst
==============================================================================
--- branches/release/more/getting_started/detail/distro.rst (original)
+++ branches/release/more/getting_started/detail/distro.rst 2011-07-03 04:08:57 EDT (Sun, 03 Jul 2011)
@@ -20,7 +20,7 @@
**array**\ |//|
*…more libraries…*
**status**\ |//| .........................\ *Boost-wide test suite*
- **tools**\ |//| ...........\ *Utilities, e.g. bjam, quickbook, bcp*
+ **tools**\ |//| ...........\ *Utilities, e.g. Boost.Build, quickbook, bcp*
**more**\ |//| ..........................\ *Policy documents, etc.*
**doc**\ |//| ...............\ *A subset of all Boost library docs*
Modified: branches/release/more/getting_started/unix-variants.html
==============================================================================
--- branches/release/more/getting_started/unix-variants.html (original)
+++ branches/release/more/getting_started/unix-variants.html 2011-07-03 04:08:57 EDT (Sun, 03 Jul 2011)
@@ -43,7 +43,7 @@
<li><a class="reference internal" href="#install-boost-build" id="id27">5.2.1 Install Boost.Build</a></li>
<li><a class="reference internal" href="#identify-your-toolset" id="id28">5.2.2 Identify Your Toolset</a></li>
<li><a class="reference internal" href="#select-a-build-directory" id="id29">5.2.3 Select a Build Directory</a></li>
-<li><a class="reference internal" href="#invoke-bjam" id="id30">5.2.4 Invoke <tt class="docutils literal">bjam</tt></a></li>
+<li><a class="reference internal" href="#invoke-b2" id="id30">5.2.4 Invoke <tt class="docutils literal">b2</tt></a></li>
</ul>
</li>
<li><a class="reference internal" href="#expected-build-output" id="id31">5.3 Expected Build Output</a></li>
@@ -102,7 +102,7 @@
<strong>array</strong><strong>/</strong>
<em>…more libraries…</em>
<strong>status</strong><strong>/</strong> .........................<em>Boost-wide test suite</em>
- <strong>tools</strong><strong>/</strong> ...........<em>Utilities, e.g. bjam, quickbook, bcp</em>
+ <strong>tools</strong><strong>/</strong> ...........<em>Utilities, e.g. Boost.Build, quickbook, bcp</em>
<strong>more</strong><strong>/</strong> ..........................<em>Policy documents, etc.</em>
<strong>doc</strong><strong>/</strong> ...............<em>A subset of all Boost library docs</em>
</pre>
@@ -282,7 +282,7 @@
<tt class="docutils literal"><span class="pre">--show-libraries</span></tt> and <tt class="docutils literal"><span class="pre">--with-libraries=</span></tt><em>library-name-list</em> options to limit the
long wait you'll experience if you build everything. Finally,</p>
<pre class="literal-block">
-<strong>$</strong> ./bjam install
+<strong>$</strong> ./b2 install
</pre>
<p>will leave Boost binaries in the <tt class="docutils literal">lib/</tt> subdirectory of your
installation prefix. You will also find a copy of the Boost
@@ -314,7 +314,7 @@
<ol class="arabic simple">
<li>Go to the directory <tt class="docutils literal">tools</tt><tt class="docutils literal">/</tt><tt class="docutils literal">build</tt><tt class="docutils literal">/</tt><tt class="docutils literal">v2</tt><tt class="docutils literal">/</tt>.</li>
<li>Run <tt class="docutils literal">bootstrap.bat</tt></li>
-<li>Run <tt class="docutils literal">bjam install <span class="pre">--prefix=</span></tt><em>PREFIX</em> where <em>PREFIX</em> is
+<li>Run <tt class="docutils literal">b2 install <span class="pre">--prefix=</span></tt><em>PREFIX</em> where <em>PREFIX</em> is
the directory where you want Boost.Build to be installed</li>
<li>Add <em>PREFIX</em><tt class="docutils literal">/</tt><tt class="docutils literal">bin</tt> to your PATH environment variable.</li>
</ol>
@@ -327,7 +327,7 @@
<div class="note">
<p class="first admonition-title">Note</p>
<p class="last">If you previously chose a toolset for the purposes of
-<a class="reference external" href="../../doc/html/bbv2/installation.html">building bjam</a>, you should assume it won't work and instead
+<a class="reference external" href="../../doc/html/bbv2/installation.html">building b2</a>, you should assume it won't work and instead
choose newly from the table below.</p>
</div>
<table border="1" class="docutils">
@@ -426,19 +426,19 @@
default Boost.Build will create a <tt class="docutils literal">bin.v2/</tt> subdirectory for that
purpose in your current working directory.</p>
</div>
-<div class="section" id="invoke-bjam">
-<h3><a class="toc-backref" href="#id30">5.2.4 Invoke <tt class="docutils literal">bjam</tt></a></h3>
+<div class="section" id="invoke-b2">
+<h3><a class="toc-backref" href="#id30">5.2.4 Invoke <tt class="docutils literal">b2</tt></a></h3>
<p>Change your current directory to the Boost root directory and
-invoke <tt class="docutils literal">bjam</tt> as follows:</p>
+invoke <tt class="docutils literal">b2</tt> as follows:</p>
<pre class="literal-block">
-bjam <strong>--build-dir=</strong><a class="reference internal" href="#id10"><em>build-directory</em></a> <strong>toolset=</strong><a class="reference internal" href="#toolset-name"><em>toolset-name</em></a> <tt class="docutils literal"> </tt> stage
+b2 <strong>--build-dir=</strong><a class="reference internal" href="#id10"><em>build-directory</em></a> <strong>toolset=</strong><a class="reference internal" href="#toolset-name"><em>toolset-name</em></a> <tt class="docutils literal"> </tt> stage
</pre>
<p>For a complete description of these and other invocation options,
please see the <a class="reference external" href="http://www.boost.org/boost-build2/doc/html/bbv2/advanced/invocation.html">Boost.Build documentation</a>.</p>
<p>For example, your session might look like this:</p>
<pre class="literal-block">
$ cd ~/<tt class="docutils literal">boost_1_47_0</tt>
-$ bjam <strong>--build-dir=</strong>/tmp/build-boost <strong>toolset=</strong>gcc stage
+$ b2 <strong>--build-dir=</strong>/tmp/build-boost <strong>toolset=</strong>gcc stage
</pre>
<p>That will build static and shared non-debug multi-threaded variants of the libraries. To build all variants, pass the additional option, “<tt class="docutils literal"><span class="pre">--build-type=complete</span></tt>â€.</p>
<!-- Copyright David Abrahams 2006. Distributed under the Boost -->
@@ -447,16 +447,16 @@
<p>Building the special <tt class="docutils literal">stage</tt> target places Boost
library binaries in the <tt class="docutils literal">stage</tt><tt class="docutils literal">/</tt><tt class="docutils literal">lib</tt><tt class="docutils literal">/</tt> subdirectory of
the Boost tree. To use a different directory pass the
-<tt class="docutils literal"><span class="pre">--stagedir=</span></tt><em>directory</em> option to <tt class="docutils literal">bjam</tt>.</p>
+<tt class="docutils literal"><span class="pre">--stagedir=</span></tt><em>directory</em> option to <tt class="docutils literal">b2</tt>.</p>
<div class="note">
<p class="first admonition-title">Note</p>
-<p class="last"><tt class="docutils literal">bjam</tt> is case-sensitive; it is important that all the
+<p class="last"><tt class="docutils literal">b2</tt> is case-sensitive; it is important that all the
parts shown in <strong>bold</strong> type above be entirely lower-case.</p>
</div>
<p>For a description of other options you can pass when invoking
-<tt class="docutils literal">bjam</tt>, type:</p>
+<tt class="docutils literal">b2</tt>, type:</p>
<pre class="literal-block">
-bjam --help
+b2 --help
</pre>
<p>In particular, to limit the amount of time spent building, you may
be interested in:</p>
Modified: branches/release/more/getting_started/unix-variants.rst
==============================================================================
--- branches/release/more/getting_started/unix-variants.rst (original)
+++ branches/release/more/getting_started/unix-variants.rst 2011-07-03 04:08:57 EDT (Sun, 03 Jul 2011)
@@ -113,7 +113,7 @@
.. parsed-literal::
- **$** ./bjam install
+ **$** ./b2 install
will leave Boost binaries in the ``lib/`` subdirectory of your
installation prefix. You will also find a copy of the Boost
@@ -150,7 +150,7 @@
.. parsed-literal::
$ cd ~/|boost_ver|
- $ bjam **--build-dir=**\ /tmp/build-boost **toolset=**\ gcc stage
+ $ b2 **--build-dir=**\ /tmp/build-boost **toolset=**\ gcc stage
That will build static and shared non-debug multi-threaded variants of the libraries. To build all variants, pass the additional option, “``--build-type=complete``â€.
Modified: branches/release/more/getting_started/windows.html
==============================================================================
--- branches/release/more/getting_started/windows.html (original)
+++ branches/release/more/getting_started/windows.html 2011-07-03 04:08:57 EDT (Sun, 03 Jul 2011)
@@ -42,7 +42,7 @@
<li><a class="reference internal" href="#install-boost-build" id="id39">5.3.1 Install Boost.Build</a></li>
<li><a class="reference internal" href="#identify-your-toolset" id="id40">5.3.2 Identify Your Toolset</a></li>
<li><a class="reference internal" href="#select-a-build-directory" id="id41">5.3.3 Select a Build Directory</a></li>
-<li><a class="reference internal" href="#invoke-bjam" id="id42">5.3.4 Invoke <tt class="docutils literal">bjam</tt></a></li>
+<li><a class="reference internal" href="#invoke-b2" id="id42">5.3.4 Invoke <tt class="docutils literal">b2</tt></a></li>
</ul>
</li>
<li><a class="reference internal" href="#expected-build-output" id="id43">5.4 Expected Build Output</a></li>
@@ -94,7 +94,7 @@
<strong>array</strong><strong>\</strong>
<em>…more libraries…</em>
<strong>status</strong><strong>\</strong> .........................<em>Boost-wide test suite</em>
- <strong>tools</strong><strong>\</strong> ...........<em>Utilities, e.g. bjam, quickbook, bcp</em>
+ <strong>tools</strong><strong>\</strong> ...........<em>Utilities, e.g. Boost.Build, quickbook, bcp</em>
<strong>more</strong><strong>\</strong> ..........................<em>Policy documents, etc.</em>
<strong>doc</strong><strong>\</strong> ...............<em>A subset of all Boost library docs</em>
</pre>
@@ -367,12 +367,12 @@
the following commands:</p>
<pre class="literal-block">
bootstrap
-.\bjam
+.\b2
</pre>
<p>The first command prepares the Boost.Build system for use. The second
command invokes Boost.Build to build the separately-compiled Boost
libraries. Please consult the <a class="reference external" href="http://www.boost.org/boost-build2/doc/html/bbv2/overview/invocation.html">Boost.Build documentation</a> for a list
-of options that can be passed to <tt class="docutils literal">bjam</tt>.</p>
+of allowed options.</p>
</div>
<div class="section" id="or-build-binaries-from-source">
<h2><a class="toc-backref" href="#id38">5.3 Or, Build Binaries From Source</a></h2>
@@ -395,7 +395,7 @@
<ol class="arabic simple">
<li>Go to the directory <tt class="docutils literal">tools</tt><tt class="docutils literal">\</tt><tt class="docutils literal">build</tt><tt class="docutils literal">\</tt><tt class="docutils literal">v2</tt><tt class="docutils literal">\</tt>.</li>
<li>Run <tt class="docutils literal">bootstrap.bat</tt></li>
-<li>Run <tt class="docutils literal">bjam install <span class="pre">--prefix=</span></tt><em>PREFIX</em> where <em>PREFIX</em> is
+<li>Run <tt class="docutils literal">b2 install <span class="pre">--prefix=</span></tt><em>PREFIX</em> where <em>PREFIX</em> is
the directory where you want Boost.Build to be installed</li>
<li>Add <em>PREFIX</em><tt class="docutils literal">\</tt><tt class="docutils literal">bin</tt> to your PATH environment variable.</li>
</ol>
@@ -408,7 +408,7 @@
<div class="note">
<p class="first admonition-title">Note</p>
<p class="last">If you previously chose a toolset for the purposes of
-<a class="reference external" href="../../doc/html/bbv2/installation.html">building bjam</a>, you should assume it won't work and instead
+<a class="reference external" href="../../doc/html/bbv2/installation.html">building b2</a>, you should assume it won't work and instead
choose newly from the table below.</p>
</div>
<table border="1" class="docutils">
@@ -510,25 +510,25 @@
default Boost.Build will create a <tt class="docutils literal">bin.v2/</tt> subdirectory for that
purpose in your current working directory.</p>
</div>
-<div class="section" id="invoke-bjam">
-<h3><a class="toc-backref" href="#id42">5.3.4 Invoke <tt class="docutils literal">bjam</tt></a></h3>
+<div class="section" id="invoke-b2">
+<h3><a class="toc-backref" href="#id42">5.3.4 Invoke <tt class="docutils literal">b2</tt></a></h3>
<p>Change your current directory to the Boost root directory and
-invoke <tt class="docutils literal">bjam</tt> as follows:</p>
+invoke <tt class="docutils literal">b2</tt> as follows:</p>
<pre class="literal-block">
-bjam <strong>--build-dir=</strong><a class="reference internal" href="#id13"><em>build-directory</em></a> <strong>toolset=</strong><a class="reference internal" href="#toolset-name"><em>toolset-name</em></a> <strong>--build-type=complete</strong> stage
+b2 <strong>--build-dir=</strong><a class="reference internal" href="#id13"><em>build-directory</em></a> <strong>toolset=</strong><a class="reference internal" href="#toolset-name"><em>toolset-name</em></a> <strong>--build-type=complete</strong> stage
</pre>
<p>For a complete description of these and other invocation options,
please see the <a class="reference external" href="http://www.boost.org/boost-build2/doc/html/bbv2/advanced/invocation.html">Boost.Build documentation</a>.</p>
<p>For example, your session might look like this:<a class="footnote-reference" href="#continuation" id="id15"><sup>4</sup></a></p>
<pre class="literal-block">
C:\WINDOWS> cd <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_47_0</tt>
-<tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_47_0</tt>> bjam <strong>^</strong>
+<tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_47_0</tt>> b2 <strong>^</strong>
More? <strong>--build-dir=</strong>"C:\Documents and Settings\dave\build-boost" <strong>^</strong>
More? <strong>--build-type=complete</strong> <strong>msvc</strong> stage
</pre>
<p>Be sure to read <a class="reference internal" href="#continuation">this note</a> about the appearance of <tt class="docutils literal">^</tt>,
<tt class="docutils literal">More?</tt> and quotation marks (<tt class="docutils literal">"</tt>) in that line.</p>
-<p>The option “<strong>--build-type=complete</strong>†causes <tt class="docutils literal">bjam</tt> to build
+<p>The option “<strong>--build-type=complete</strong>†causes Boost.Build to build
all supported variants of the libraries. For instructions on how to
build only specific variants, please ask on the <a class="reference external" href="http://www.boost.org/more/mailing_lists.htm#jamboost">Boost.Build mailing
list</a>.</p>
@@ -538,16 +538,16 @@
<p>Building the special <tt class="docutils literal">stage</tt> target places Boost
library binaries in the <tt class="docutils literal">stage</tt><tt class="docutils literal">\</tt><tt class="docutils literal">lib</tt><tt class="docutils literal">\</tt> subdirectory of
the Boost tree. To use a different directory pass the
-<tt class="docutils literal"><span class="pre">--stagedir=</span></tt><em>directory</em> option to <tt class="docutils literal">bjam</tt>.</p>
+<tt class="docutils literal"><span class="pre">--stagedir=</span></tt><em>directory</em> option to <tt class="docutils literal">b2</tt>.</p>
<div class="note">
<p class="first admonition-title">Note</p>
-<p class="last"><tt class="docutils literal">bjam</tt> is case-sensitive; it is important that all the
+<p class="last"><tt class="docutils literal">b2</tt> is case-sensitive; it is important that all the
parts shown in <strong>bold</strong> type above be entirely lower-case.</p>
</div>
<p>For a description of other options you can pass when invoking
-<tt class="docutils literal">bjam</tt>, type:</p>
+<tt class="docutils literal">b2</tt>, type:</p>
<pre class="literal-block">
-bjam --help
+b2 --help
</pre>
<p>In particular, to limit the amount of time spent building, you may
be interested in:</p>
Modified: branches/release/more/getting_started/windows.rst
==============================================================================
--- branches/release/more/getting_started/windows.rst (original)
+++ branches/release/more/getting_started/windows.rst 2011-07-03 04:08:57 EDT (Sun, 03 Jul 2011)
@@ -208,12 +208,12 @@
the following commands::
bootstrap
- .\bjam
+ .\b2
The first command prepares the Boost.Build system for use. The second
command invokes Boost.Build to build the separately-compiled Boost
libraries. Please consult the `Boost.Build documentation`__ for a list
-of options that can be passed to ``bjam``.
+of allowed options.
__ http://www.boost.org/boost-build2/doc/html/bbv2/overview/invocation.html
@@ -239,14 +239,14 @@
.. parsed-literal::
C:\\WINDOWS> cd |default-root|
- |default-root|> bjam **^**
+ |default-root|> b2 **^**
More? **--build-dir=**\ "C:\\Documents and Settings\\dave\\build-boost" **^**
More? **--build-type=complete** **msvc** stage
Be sure to read `this note`__ about the appearance of ``^``,
``More?`` and quotation marks (``"``) in that line.
-The option “\ **--build-type=complete**\ †causes ``bjam`` to build
+The option “\ **--build-type=complete**\ †causes Boost.Build to build
all supported variants of the libraries. For instructions on how to
build only specific variants, please ask on the `Boost.Build mailing
list`_.
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk