Главная Обзор Помощь
Регистрация Вход
samien
/
boost
зеркало из https://github.com/boostorg/boost
1
0
Ответвить 0
Файлы Задачи 0 Вики
Просмотр исходного кода

merged [49524] and [49525] from trunk

[SVN r49527]
Dave Abrahams 17 лет назад
Родитель
4b22c90e9c
Сommit
c6f59ab7c0
9 измененных файлов с 82 добавлено и 58 удалено
Единый вид Показать статистику Diff
  1. 6 3
      more/getting_started/detail/build-from-source-head.rst
  2. 5 0
      more/getting_started/detail/build-from-source-tail.rst
  3. 3 0
      more/getting_started/detail/common-unix.rst
  4. 4 0
      more/getting_started/detail/common-windows.rst
  5. 1 1
      more/getting_started/index.html
  6. 14 8
      more/getting_started/unix-variants.html
  7. 3 6
      more/getting_started/unix-variants.rst
  8. 29 21
      more/getting_started/windows.html
  9. 17 19
      more/getting_started/windows.rst

+ 6 - 3
more/getting_started/detail/build-from-source-head.rst
Просмотреть файл 

@@ -6,7 +6,7 @@ Boost.Build_ is a text-based system for developing, testing, and
 
 installing software.  To use it, you'll need an executable called
 
 installing software.  To use it, you'll need an executable called
 
 ``bjam``.
 
 ``bjam``.
 
 
 
-.. |precompiled-bjam| replace:: pre-compiled ``bjam`` executables
 
+.. |precompiled-bjam| replace:: download a pre-built ``bjam`` executable
 
 
 
 
 
 .. _precompiled-bjam: http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=72941
 
 .. _precompiled-bjam: http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=72941
 
@@ -22,12 +22,15 @@ Get ``bjam``
 
 system.  To build Boost binaries, you'll invoke ``bjam`` from the
 
 system.  To build Boost binaries, you'll invoke ``bjam`` from the
 
 Boost root.  
 Boost root.  
 
 
-Boost provides |precompiled-bjam|_ for a variety of platforms.
 
+We suggest you |precompiled-bjam|_ for your platform.
 
 Alternatively, you can build ``bjam`` yourself using `these
 
 Alternatively, you can build ``bjam`` yourself using `these
 
 instructions`__.
 
 instructions`__.
 
 
 
 __ `building bjam`_
 
 __ `building bjam`_
 
 
 
+Move the ``bjam`` executable into a directory in your PATH.  You can
 
+see the list of directories in your PATH, separated by |pathsep|\ s,
 
+by typing “\ |path|\ ” at the command prompt.
 
 
 
 .. _toolset:
 
 .. _toolset:
 
 .. _toolset-name:
 
 .. _toolset-name:
 
@@ -123,4 +126,4 @@ invoke ``bjam`` as follows:
 
 
 
 .. parsed-literal::
 
 .. parsed-literal::
 
 
 
-  bjam **--build-dir=**\ |build-directory|_ **--toolset=**\ |toolset-name|_ *[*\ **--build-type=complete**\ *]* stage
 
+  bjam **--build-dir=**\ |build-directory|_ **--toolset=**\ |toolset-name|_ |build-type-complete| stage

+ 5 - 0
more/getting_started/detail/build-from-source-tail.rst
Просмотреть файл 

@@ -23,6 +23,11 @@ be interested in:
 
 * choosing a specific build variant by adding ``release`` or
 
 * choosing a specific build variant by adding ``release`` or
 
   ``debug`` to the command line.
 
   ``debug`` to the command line.
 
 
 
+.. Note:: Boost.Build can produce a great deal of output, which can
 
+     make it easy to miss problems.  If you want to make sure
 
+     everything is went well, you might redirect the output into a
 
+     file by appending “``>build.log 2>&1``” to your command line.
 
+
 
 Expected Build Output
 
 Expected Build Output
 
 ---------------------
 
 ---------------------

+ 3 - 0
more/getting_started/detail/common-unix.rst
Просмотреть файл 

@@ -20,5 +20,8 @@
 
 
 
 .. |command-line tool| replace:: command-line tool
 
 .. |command-line tool| replace:: command-line tool
 
 
 
+.. |pathsep| replace:: colon
 
+
 
+.. |path| replace:: ``echo $PATH``
 
 
 
 .. include:: common.rst
 
 .. include:: common.rst

+ 4 - 0
more/getting_started/detail/common-windows.rst
Просмотреть файл 

@@ -31,4 +31,8 @@
 
 
 
 .. |command-line tool| replace:: `command-line tool`_
 
 .. |command-line tool| replace:: `command-line tool`_
 
 
 
+.. |pathsep| replace:: semicolon
 
+
 
+.. |path| replace:: ``PATH``
 
+
 
 .. include:: common.rst
 
 .. include:: common.rst

+ 1 - 1
more/getting_started/index.html
Просмотреть файл 

@@ -3,7 +3,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
 <head>
 
 <head>
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-<meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
 
+<meta name="generator" content="Docutils 0.6: http://docutils.sourceforge.net/" />
 
 <title>Boost Getting Started</title>
 
 <title>Boost Getting Started</title>
 
 <link rel="stylesheet" href="../../rst.css" type="text/css" />
 
 <link rel="stylesheet" href="../../rst.css" type="text/css" />
 
 </head>
 
 </head>

+ 14 - 8
more/getting_started/unix-variants.html
Просмотреть файл 

@@ -3,7 +3,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
 <head>
 
 <head>
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-<meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
 
+<meta name="generator" content="Docutils 0.6: http://docutils.sourceforge.net/" />
 
 <title>Boost Getting Started on Unix Variants</title>
 
 <title>Boost Getting Started on Unix Variants</title>
 
 <meta content="Getting Started with Boost on Unix Variants (including Linux and MacOS)" name="description" />
 
 <meta content="Getting Started with Boost on Unix Variants (including Linux and MacOS)" name="description" />
 
 <link rel="stylesheet" href="../../rst.css" type="text/css" />
 
 <link rel="stylesheet" href="../../rst.css" type="text/css" />
 
@@ -302,9 +302,12 @@ installing software.  To use it, you'll need an executable called
 
 <p><tt class="docutils literal"><span class="pre">bjam</span></tt> is the command-line tool that drives the Boost Build
 
 <p><tt class="docutils literal"><span class="pre">bjam</span></tt> is the command-line tool that drives the Boost Build
 
 system.  To build Boost binaries, you'll invoke <tt class="docutils literal"><span class="pre">bjam</span></tt> from the
 
 system.  To build Boost binaries, you'll invoke <tt class="docutils literal"><span class="pre">bjam</span></tt> from the
 
 Boost root.</p>
 
 Boost root.</p>
 
-<p>Boost provides <a class="reference external" href="http://sourceforge.net/project/showfiles.php?group_id=7586&amp;package_id=72941">pre-compiled <tt class="docutils literal"><span class="pre">bjam</span></tt> executables</a> for a variety of platforms.
 
+<p>We suggest you <a class="reference external" href="http://sourceforge.net/project/showfiles.php?group_id=7586&amp;package_id=72941">download a pre-built <tt class="docutils literal"><span class="pre">bjam</span></tt> executable</a> for your platform.
 
 Alternatively, you can build <tt class="docutils literal"><span class="pre">bjam</span></tt> yourself using <a class="reference external" href="../../doc/html/jam/building.html">these
 
 Alternatively, you can build <tt class="docutils literal"><span class="pre">bjam</span></tt> yourself using <a class="reference external" href="../../doc/html/jam/building.html">these
 
 instructions</a>.</p>
 
 instructions</a>.</p>
 
+<p>Move the <tt class="docutils literal"><span class="pre">bjam</span></tt> executable into a directory in your PATH.  You can
 
+see the list of directories in your PATH, separated by colons,
 
+by typing “<tt class="docutils literal"><span class="pre">echo</span> <span class="pre">$PATH</span></tt>” at the command prompt.</p>
 
 </div>
 
 </div>
 
 <div class="section" id="identify-your-toolset">
 
 <div class="section" id="identify-your-toolset">
 
 <span id="toolset-name"></span><span id="toolset"></span><h3><a class="toc-backref" href="#id27">5.2.2&nbsp;&nbsp;&nbsp;Identify Your Toolset</a></h3>
 
 <span id="toolset-name"></span><span id="toolset"></span><h3><a class="toc-backref" href="#id27">5.2.2&nbsp;&nbsp;&nbsp;Identify Your Toolset</a></h3>
 
@@ -421,18 +424,14 @@ purpose in your current working directory.</p>
 
 <p>Change your current directory to the Boost root directory and
 
 <p>Change your current directory to the Boost root directory and
 
 invoke <tt class="docutils literal"><span class="pre">bjam</span></tt> as follows:</p>
 
 invoke <tt class="docutils literal"><span class="pre">bjam</span></tt> as follows:</p>
 
 <pre class="literal-block">
 
 <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> <em>[</em><strong>--build-type=complete</strong><em>]</em> stage
 
+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
 
 </pre>
 
 </pre>
 
 <p>For example, your session might look like this:</p>
 
 <p>For example, your session might look like this:</p>
 
 <pre class="literal-block">
 
 <pre class="literal-block">
 
 $ cd ~/<tt class="docutils literal"><span class="pre">boost_1_37_0</span></tt>
 
 $ cd ~/<tt class="docutils literal"><span class="pre">boost_1_37_0</span></tt>
 
 $ bjam <strong>--build-dir=</strong>/tmp/build-boost <strong>--toolset=</strong>gcc stage
 
 $ bjam <strong>--build-dir=</strong>/tmp/build-boost <strong>--toolset=</strong>gcc stage
 
 </pre>
 
 </pre>
 
-<p>That will build static and shared non-debug multi-threaded variations of the libraries. To build all variations:</p>
 
-<pre class="literal-block">
 
-$ cd ~/<tt class="docutils literal"><span class="pre">boost_1_37_0</span></tt>
 
-$ bjam <strong>--build-dir=</strong>/tmp/build-boost <strong>--toolset=</strong>gcc <strong>--build-type=complete</strong> 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, “``--build-type=complete``”.</p>
 
 <!-- Copyright David Abrahams 2006. Distributed under the Boost -->
 
 <!-- Copyright David Abrahams 2006. Distributed under the Boost -->
 
 <!-- Software License, Version 1.0. (See accompanying -->
 
 <!-- Software License, Version 1.0. (See accompanying -->
 
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
 
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
 
@@ -457,6 +456,13 @@ be interested in:</p>
 
 <li>choosing a specific build variant by adding <tt class="docutils literal"><span class="pre">release</span></tt> or
 
 <li>choosing a specific build variant by adding <tt class="docutils literal"><span class="pre">release</span></tt> or
 
 <tt class="docutils literal"><span class="pre">debug</span></tt> to the command line.</li>
 
 <tt class="docutils literal"><span class="pre">debug</span></tt> to the command line.</li>
 
 </ul>
 
 </ul>
 
+<div class="note">
 
+<p class="first admonition-title">Note</p>
 
+<p class="last">Boost.Build can produce a great deal of output, which can
 
+make it easy to miss problems.  If you want to make sure
 
+everything is went well, you might redirect the output into a
 
+file by appending “``&gt;build.log 2&gt;&amp;1``” to your command line.</p>
 
+</div>
 
 </div>
 
 </div>
 
 </div>
 
 </div>
 
 <div class="section" id="expected-build-output">
 
 <div class="section" id="expected-build-output">

+ 3 - 6
more/getting_started/unix-variants.rst
Просмотреть файл 

@@ -142,12 +142,7 @@ For example, your session might look like this:
 
    $ cd ~/|boost_ver|
 
    $ cd ~/|boost_ver|
 
    $ bjam **--build-dir=**\ /tmp/build-boost **--toolset=**\ gcc stage
 
    $ bjam **--build-dir=**\ /tmp/build-boost **--toolset=**\ gcc stage
 
 
 
-That will build static and shared non-debug multi-threaded variations of the libraries. To build all variations:
 
-
 
-.. parsed-literal::
 
-
 
-   $ cd ~/|boost_ver|
 
-   $ bjam **--build-dir=**\ /tmp/build-boost **--toolset=**\ gcc **--build-type=complete** 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``”.
 
 
 
 .. include:: detail/build-from-source-tail.rst
 
 .. include:: detail/build-from-source-tail.rst
 
 
 
@@ -237,6 +232,8 @@ Spoil Rock Hunter?”
 
 .. [#lowercase-l] That option is a dash followed by a lowercase “L”
 
 .. [#lowercase-l] That option is a dash followed by a lowercase “L”
 
    character, which looks very much like a numeral 1 in some fonts.
 
    character, which looks very much like a numeral 1 in some fonts.
 
 
 
+.. |build-type-complete| replace:: `` `` 
+
 
 .. include:: detail/common-footnotes.rst
 
 .. include:: detail/common-footnotes.rst
 
 .. include:: detail/release-variables.rst
 
 .. include:: detail/release-variables.rst
 
 .. include:: detail/common-unix.rst
 
 .. include:: detail/common-unix.rst

+ 29 - 21
more/getting_started/windows.html
Просмотреть файл 

@@ -3,7 +3,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
 <head>
 
 <head>
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-<meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
 
+<meta name="generator" content="Docutils 0.6: http://docutils.sourceforge.net/" />
 
 <title>Boost Getting Started on Windows</title>
 
 <title>Boost Getting Started on Windows</title>
 
 <link rel="stylesheet" href="../../rst.css" type="text/css" />
 
 <link rel="stylesheet" href="../../rst.css" type="text/css" />
 
 </head>
 
 </head>
 
@@ -60,14 +60,16 @@ not supported—they may or may not work.</p>
 
 </div>
 
 </div>
 
 <div class="section" id="get-boost">
 
 <div class="section" id="get-boost">
 
 <h1><a class="toc-backref" href="#id26">1&nbsp;&nbsp;&nbsp;Get Boost</a></h1>
 
 <h1><a class="toc-backref" href="#id26">1&nbsp;&nbsp;&nbsp;Get Boost</a></h1>
 
-<p>The easiest way to get a copy of Boost is to use an installer.
 
-The <a class="reference external" href="http://www.boost.org/doc/libs/1_36_0/more/getting_started/index.html">Boost website version of this Getting Started guide</a> will
 
-have undated information on installers as they become available,
 
-or see <a class="reference external" href="http://sourceforge.net/project/showfiles.php?group_id=7586&amp;package_id=8041">Boost downloads</a> or the <a class="reference external" href="http://www.boostpro.com/products/free">installer</a> provided by <a class="reference external" href="http://www.boostpro.com">BoostPro Computing</a>.  We especially recommend using
 
-an installer if you use Microsoft Visual Studio, because the installer can download and install
 
-precompiled library binaries, saving you the trouble of building
 
-them yourself.  To complete this tutorial, you'll need to at least
 
-install the <a class="reference external" href="../../libs/regex/index.html">Boost.Regex</a> binaries when given the option.</p>
 
+<p>The easiest way to get a copy of Boost is to use an installer.  The
 
+<a class="reference external" href="http://www.boost.org/doc/libs/1_36_0/more/getting_started/index.html">Boost website version of this Getting Started guide</a> will have
 
+undated information on installers as they become available, or see
 
+<a class="reference external" href="http://sourceforge.net/project/showfiles.php?group_id=7586&amp;package_id=8041">Boost downloads</a> or the <a class="reference external" href="http://www.boostpro.com/products/free">installer</a> provided by <a class="reference external" href="http://www.boostpro.com">BoostPro
 
+Computing</a>.  We especially recommend using an installer if you use
 
+Microsoft Visual Studio, because the installer can download and
 
+install precompiled library binaries, saving you the trouble of
 
+building them yourself.  To complete this tutorial, you'll need to at
 
+least install the Static Multithreaded variants of the <a class="reference external" href="../../libs/regex/index.html">Boost.Regex</a>
 
+binaries when given the option.</p>
 
 <p>If you're using an earlier version of Visual Studio or some other
 
 <p>If you're using an earlier version of Visual Studio or some other
 
 compiler, or if you prefer to build everything yourself, you can
 
 compiler, or if you prefer to build everything yourself, you can
 
 download <a class="reference external" href="http://sourceforge.net/project/showfiles.php?group_id=7586&amp;package_id=8041"><tt class="docutils literal"><span class="pre">boost_1_37_0</span></tt><tt class="docutils literal"><span class="pre">.7z</span></tt></a> or <a class="reference external" href="http://sourceforge.net/project/showfiles.php?group_id=7586&amp;package_id=8041"><tt class="docutils literal"><span class="pre">boost_1_37_0</span></tt><tt class="docutils literal"><span class="pre">.zip</span></tt></a> and unpack it to install a complete Boost
 
 download <a class="reference external" href="http://sourceforge.net/project/showfiles.php?group_id=7586&amp;package_id=8041"><tt class="docutils literal"><span class="pre">boost_1_37_0</span></tt><tt class="docutils literal"><span class="pre">.7z</span></tt></a> or <a class="reference external" href="http://sourceforge.net/project/showfiles.php?group_id=7586&amp;package_id=8041"><tt class="docutils literal"><span class="pre">boost_1_37_0</span></tt><tt class="docutils literal"><span class="pre">.zip</span></tt></a> and unpack it to install a complete Boost
 
@@ -341,7 +343,7 @@ correctly identified the <a class="reference internal" href="#boost-root-directo
 
 you'll need to acquire library binaries.</p>
 
 you'll need to acquire library binaries.</p>
 
 <div class="section" id="install-visual-studio-binaries">
 
 <div class="section" id="install-visual-studio-binaries">
 
 <h2><a class="toc-backref" href="#id34">5.1&nbsp;&nbsp;&nbsp;Install Visual Studio Binaries</a></h2>
 
 <h2><a class="toc-backref" href="#id34">5.1&nbsp;&nbsp;&nbsp;Install Visual Studio Binaries</a></h2>
 
-<p>The installers will download and
 
+<p>The installers supplied by BoostPro Computing will download and
 
 install pre-compiled binaries into the <tt class="docutils literal"><span class="pre">lib\</span></tt> subdirectory of the
 
 install pre-compiled binaries into the <tt class="docutils literal"><span class="pre">lib\</span></tt> subdirectory of the
 
 boost root, typically <tt class="docutils literal"><span class="pre">C:\Program</span> <span class="pre">Files\boost\</span></tt><tt class="docutils literal"><span class="pre">boost_1_37_0</span></tt><tt class="docutils literal"><span class="pre">\lib\</span></tt>.  If you installed
 
 boost root, typically <tt class="docutils literal"><span class="pre">C:\Program</span> <span class="pre">Files\boost\</span></tt><tt class="docutils literal"><span class="pre">boost_1_37_0</span></tt><tt class="docutils literal"><span class="pre">\lib\</span></tt>.  If you installed
 
 all variants of the <a class="reference external" href="../../libs/regex/index.html">Boost.Regex</a> binary, you're done with this
 
 all variants of the <a class="reference external" href="../../libs/regex/index.html">Boost.Regex</a> binary, you're done with this
 
@@ -366,9 +368,12 @@ installing software.  To use it, you'll need an executable called
 
 <p><tt class="docutils literal"><span class="pre">bjam</span></tt> is the <a class="reference internal" href="#command-line-tool">command-line tool</a> that drives the Boost Build
 
 <p><tt class="docutils literal"><span class="pre">bjam</span></tt> is the <a class="reference internal" href="#command-line-tool">command-line tool</a> that drives the Boost Build
 
 system.  To build Boost binaries, you'll invoke <tt class="docutils literal"><span class="pre">bjam</span></tt> from the
 
 system.  To build Boost binaries, you'll invoke <tt class="docutils literal"><span class="pre">bjam</span></tt> from the
 
 Boost root.</p>
 
 Boost root.</p>
 
-<p>Boost provides <a class="reference external" href="http://sourceforge.net/project/showfiles.php?group_id=7586&amp;package_id=72941">pre-compiled <tt class="docutils literal"><span class="pre">bjam</span></tt> executables</a> for a variety of platforms.
 
+<p>We suggest you <a class="reference external" href="http://sourceforge.net/project/showfiles.php?group_id=7586&amp;package_id=72941">download a pre-built <tt class="docutils literal"><span class="pre">bjam</span></tt> executable</a> for your platform.
 
 Alternatively, you can build <tt class="docutils literal"><span class="pre">bjam</span></tt> yourself using <a class="reference external" href="../../doc/html/jam/building.html">these
 
 Alternatively, you can build <tt class="docutils literal"><span class="pre">bjam</span></tt> yourself using <a class="reference external" href="../../doc/html/jam/building.html">these
 
 instructions</a>.</p>
 
 instructions</a>.</p>
 
+<p>Move the <tt class="docutils literal"><span class="pre">bjam</span></tt> executable into a directory in your PATH.  You can
 
+see the list of directories in your PATH, separated by semicolons,
 
+by typing “<tt class="docutils literal"><span class="pre">PATH</span></tt>” at the command prompt.</p>
 
 </div>
 
 </div>
 
 <div class="section" id="identify-your-toolset">
 
 <div class="section" id="identify-your-toolset">
 
 <span id="toolset-name"></span><span id="toolset"></span><h3><a class="toc-backref" href="#id37">5.2.2&nbsp;&nbsp;&nbsp;Identify Your Toolset</a></h3>
 
 <span id="toolset-name"></span><span id="toolset"></span><h3><a class="toc-backref" href="#id37">5.2.2&nbsp;&nbsp;&nbsp;Identify Your Toolset</a></h3>
 
@@ -488,25 +493,21 @@ purpose in your current working directory.</p>
 
 <p>Change your current directory to the Boost root directory and
 
 <p>Change your current directory to the Boost root directory and
 
 invoke <tt class="docutils literal"><span class="pre">bjam</span></tt> as follows:</p>
 
 invoke <tt class="docutils literal"><span class="pre">bjam</span></tt> as follows:</p>
 
 <pre class="literal-block">
 
 <pre class="literal-block">
 
-bjam <strong>--build-dir=</strong><a class="reference internal" href="#id12"><em>build-directory</em></a> <strong>--toolset=</strong><a class="reference internal" href="#toolset-name"><em>toolset-name</em></a> <em>[</em><strong>--build-type=complete</strong><em>]</em> stage
 
+bjam <strong>--build-dir=</strong><a class="reference internal" href="#id12"><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>
 
 </pre>
 
 <p>For example, your session might look like this:<a class="footnote-reference" href="#continuation" id="id13"><sup>4</sup></a></p>
 
 <p>For example, your session might look like this:<a class="footnote-reference" href="#continuation" id="id13"><sup>4</sup></a></p>
 
 <pre class="literal-block">
 
 <pre class="literal-block">
 
 C:\WINDOWS&gt; cd <tt class="docutils literal"><span class="pre">C:\Program</span> <span class="pre">Files\boost\</span></tt><tt class="docutils literal"><span class="pre">boost_1_37_0</span></tt>
 
 C:\WINDOWS&gt; cd <tt class="docutils literal"><span class="pre">C:\Program</span> <span class="pre">Files\boost\</span></tt><tt class="docutils literal"><span class="pre">boost_1_37_0</span></tt>
 
 <tt class="docutils literal"><span class="pre">C:\Program</span> <span class="pre">Files\boost\</span></tt><tt class="docutils literal"><span class="pre">boost_1_37_0</span></tt>&gt; bjam <strong>^</strong>
 
 <tt class="docutils literal"><span class="pre">C:\Program</span> <span class="pre">Files\boost\</span></tt><tt class="docutils literal"><span class="pre">boost_1_37_0</span></tt>&gt; bjam <strong>^</strong>
 
 More? <strong>--build-dir=</strong>&quot;C:\Documents and Settings\dave\build-boost&quot; <strong>^</strong>
 
 More? <strong>--build-dir=</strong>&quot;C:\Documents and Settings\dave\build-boost&quot; <strong>^</strong>
 
-More? <strong>--toolset=</strong>msvc stage
 
+More? <strong>--toolset=</strong> <strong>--build-type=complete</strong> msvc stage
 
 </pre>
 
 </pre>
 
 <p>Be sure to read <a class="reference internal" href="#continuation">this note</a> about the appearance of <tt class="docutils literal"><span class="pre">^</span></tt>,
 
 <p>Be sure to read <a class="reference internal" href="#continuation">this note</a> about the appearance of <tt class="docutils literal"><span class="pre">^</span></tt>,
 
 <tt class="docutils literal"><span class="pre">More?</span></tt> and quotation marks (<tt class="docutils literal"><span class="pre">&quot;</span></tt>) in that line.</p>
 
 <tt class="docutils literal"><span class="pre">More?</span></tt> and quotation marks (<tt class="docutils literal"><span class="pre">&quot;</span></tt>) in that line.</p>
 
-<p>The above example session will build static and shared non-debug multi-threaded
 
-variations of the libraries. To build all variations:</p>
 
-<pre class="literal-block">
 
-C:\WINDOWS&gt; cd <tt class="docutils literal"><span class="pre">C:\Program</span> <span class="pre">Files\boost\</span></tt><tt class="docutils literal"><span class="pre">boost_1_37_0</span></tt>
 
-<tt class="docutils literal"><span class="pre">C:\Program</span> <span class="pre">Files\boost\</span></tt><tt class="docutils literal"><span class="pre">boost_1_37_0</span></tt>&gt; bjam <strong>^</strong>
 
-More? <strong>--build-dir=</strong>&quot;C:\Documents and Settings\dave\build-boost&quot; <strong>^</strong>
 
-More? <strong>--toolset=</strong>msvc <strong>--build-type=complete</strong> stage
 
-</pre>
 
+<p>The option “<strong>--build-type=complete</strong>” causes <tt class="docutils literal"><span class="pre">bjam</span></tt> 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>
 
 <!-- Copyright David Abrahams 2006. Distributed under the Boost -->
 
 <!-- Copyright David Abrahams 2006. Distributed under the Boost -->
 
 <!-- Software License, Version 1.0. (See accompanying -->
 
 <!-- Software License, Version 1.0. (See accompanying -->
 
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
 
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
 
@@ -531,6 +532,13 @@ be interested in:</p>
 
 <li>choosing a specific build variant by adding <tt class="docutils literal"><span class="pre">release</span></tt> or
 
 <li>choosing a specific build variant by adding <tt class="docutils literal"><span class="pre">release</span></tt> or
 
 <tt class="docutils literal"><span class="pre">debug</span></tt> to the command line.</li>
 
 <tt class="docutils literal"><span class="pre">debug</span></tt> to the command line.</li>
 
 </ul>
 
 </ul>
 
+<div class="note">
 
+<p class="first admonition-title">Note</p>
 
+<p class="last">Boost.Build can produce a great deal of output, which can
 
+make it easy to miss problems.  If you want to make sure
 
+everything is went well, you might redirect the output into a
 
+file by appending “``&gt;build.log 2&gt;&amp;1``” to your command line.</p>
 
+</div>
 
 </div>
 
 </div>
 
 </div>
 
 </div>
 
 <div class="section" id="expected-build-output">
 
 <div class="section" id="expected-build-output">

+ 17 - 19
more/getting_started/windows.rst
Просмотреть файл 

@@ -35,14 +35,16 @@ __ ../../index.htm
 
 Get Boost
 
 Get Boost
 
 =========
 
 =========
 
 
 
-The easiest way to get a copy of Boost is to use an installer.
 
-The `Boost website version of this Getting Started guide`_ will
 
-have undated information on installers as they become available,
 
-or see `Boost downloads`_ or the installer_ provided by `BoostPro Computing`_.  We especially recommend using
 
-an installer if you use Microsoft Visual Studio, because the installer can download and install
 
-precompiled library binaries, saving you the trouble of building
 
-them yourself.  To complete this tutorial, you'll need to at least
 
-install the Boost.Regex_ binaries when given the option.
 
+The easiest way to get a copy of Boost is to use an installer.  The
 
+`Boost website version of this Getting Started guide`_ will have
 
+undated information on installers as they become available, or see
 
+`Boost downloads`_ or the installer_ provided by `BoostPro
 
+Computing`_.  We especially recommend using an installer if you use
 
+Microsoft Visual Studio, because the installer can download and
 
+install precompiled library binaries, saving you the trouble of
 
+building them yourself.  To complete this tutorial, you'll need to at
 
+least install the Static Multithreaded variants of the Boost.Regex_
 
+binaries when given the option.
 
 
 
 .. _`Boost website version of this Getting Started guide`:
 
 .. _`Boost website version of this Getting Started guide`:
 
        http://www.boost.org/doc/libs/1_36_0/more/getting_started/index.html
 
        http://www.boost.org/doc/libs/1_36_0/more/getting_started/index.html
 
@@ -186,7 +188,7 @@ To test the result, type:
 
 Install Visual Studio Binaries
 
 Install Visual Studio Binaries
 
 ------------------------------
 
 ------------------------------
 
 
 
-The installers will download and
 
+The installers supplied by BoostPro Computing will download and
 
 install pre-compiled binaries into the ``lib\`` subdirectory of the
 
 install pre-compiled binaries into the ``lib\`` subdirectory of the
 
 boost root, typically |default-root|\ ``\lib\``.  If you installed
 
 boost root, typically |default-root|\ ``\lib\``.  If you installed
 
 all variants of the Boost.Regex_ binary, you're done with this
 
 all variants of the Boost.Regex_ binary, you're done with this
 
@@ -213,20 +215,15 @@ For example, your session might look like this: [#continuation]_
 
    C:\\WINDOWS> cd |default-root|
 
    C:\\WINDOWS> cd |default-root|
 
    |default-root|> bjam **^**
 
    |default-root|> bjam **^**
 
    More? **--build-dir=**\ "C:\\Documents and Settings\\dave\\build-boost" **^**
 
    More? **--build-dir=**\ "C:\\Documents and Settings\\dave\\build-boost" **^**
 
-   More? **--toolset=**\ msvc stage
 
+   More? **--toolset=**\  **--build-type=complete** msvc stage
 
 
 
 Be sure to read `this note`__ about the appearance of ``^``,
 
 Be sure to read `this note`__ about the appearance of ``^``,
 
 ``More?`` and quotation marks (``"``) in that line.
 
 ``More?`` and quotation marks (``"``) in that line.
 
 
 
-The above example session will build static and shared non-debug multi-threaded
 
-variations of the libraries. To build all variations:
 
-
 
-.. parsed-literal::
 
-
 
-   C:\\WINDOWS> cd |default-root|
 
-   |default-root|> bjam **^**
 
-   More? **--build-dir=**\ "C:\\Documents and Settings\\dave\\build-boost" **^**
 
-   More? **--toolset=**\ msvc **--build-type=complete** stage
 
+The option “\ **--build-type=complete**\ ” causes ``bjam`` 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`_.
 
 
 
 __ continuation_
 
 __ continuation_
 
 
 
@@ -355,6 +352,7 @@ Spoil Rock Hunter?”
 
 
 
 .. _`boost.zip`: `sf-download`_
 
 .. _`boost.zip`: `sf-download`_
 
 
 
+.. |build-type-complete| replace:: **--build-type=complete**
 
 
 
 .. include:: detail/common-footnotes.rst
 
 .. include:: detail/common-footnotes.rst
 
 .. include:: detail/release-variables.rst
 
 .. include:: detail/release-variables.rst

粤ICP备19079148号