diff --git a/bootstrap.bat b/bootstrap.bat index 121ff6d4e2..a327ac0e88 100644 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -5,8 +5,10 @@ REM 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 @@ call .\build.bat %* > ..\..\..\..\bootstrap.log 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. >> project-config.jam 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 @@ goto :end :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 diff --git a/bootstrap.sh b/bootstrap.sh index 8dea77f30a..2723f287b9 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -213,12 +213,12 @@ rm -f config.log # 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 diff --git a/more/getting_started/detail/build-from-source-head.rst b/more/getting_started/detail/build-from-source-head.rst index 4d63c08843..d1bb9c240b 100644 --- a/more/getting_started/detail/build-from-source-head.rst +++ b/more/getting_started/detail/build-from-source-head.rst @@ -11,7 +11,7 @@ install it. To do this: 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 @@ Boost.Build documentation`__). __ 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 @@ directory is writable, this step isn't strictly necessary: by 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`__. diff --git a/more/getting_started/detail/build-from-source-tail.rst b/more/getting_started/detail/build-from-source-tail.rst index 78035c3c7b..dd782ac6c5 100644 --- a/more/getting_started/detail/build-from-source-tail.rst +++ b/more/getting_started/detail/build-from-source-tail.rst @@ -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: diff --git a/more/getting_started/detail/distro.rst b/more/getting_started/detail/distro.rst index 708dfd1ab6..939efe2609 100644 --- a/more/getting_started/detail/distro.rst +++ b/more/getting_started/detail/distro.rst @@ -20,7 +20,7 @@ This is a sketch of the resulting directory structure: **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* diff --git a/more/getting_started/unix-variants.html b/more/getting_started/unix-variants.html index 164764a3e4..3c55d77df3 100644 --- a/more/getting_started/unix-variants.html +++ b/more/getting_started/unix-variants.html @@ -43,7 +43,7 @@
  • 5.2.1   Install Boost.Build
  • 5.2.2   Identify Your Toolset
  • 5.2.3   Select a Build Directory
    • -
  • 5.2.4   Invoke bjam
    • +
  • 5.2.4   Invoke b2
  • 5.3   Expected Build Output
    • @@ -102,7 +102,7 @@ from --show-libraries and --with-libraries=library-name-list options to limit the long wait you'll experience if you build everything. Finally,

    -$ ./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 @@ -314,7 +314,7 @@ install it. To do this:

    1. Go to the directory tools/build/v2/.
    2. Run bootstrap.bat
      3. -
    3. Run bjam install --prefix=PREFIX where PREFIX is +
    4. Run b2 install --prefix=PREFIX where PREFIX is the directory where you want Boost.Build to be installed
    5. Add PREFIX/bin to your PATH environment variable.
    @@ -327,7 +327,7 @@ Boost.Build documentation    ).

    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.

    @@ -426,19 +426,19 @@ directory is writable, this step isn't strictly necessary: by default Boost.Build will create a bin.v2/ subdirectory for that purpose in your current working directory.

    -
    -

    5.2.4   Invoke bjam

    +
    +

    5.2.4   Invoke b2

    Change your current directory to the Boost root directory and -invoke bjam as follows:

    +invoke b2 as follows:

    -bjam --build-dir=build-directory toolset=toolset-name   stage
+b2 --build-dir=build-directory toolset=toolset-name   stage

    For a complete description of these and other invocation options, please see the Boost.Build documentation.

    For example, your session might look like this:

     $ cd ~/boost_1_47_0
-$ 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”.

    @@ -447,16 +447,16 @@ $ bjam --build-dir=/tmp/build-boost toolset=gc

    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 +

    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:

    diff --git a/more/getting_started/unix-variants.rst b/more/getting_started/unix-variants.rst index e80378884c..40f6f228d4 100644 --- a/more/getting_started/unix-variants.rst +++ b/more/getting_started/unix-variants.rst @@ -113,7 +113,7 @@ long wait you'll experience if you build everything. Finally, .. 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 @@ For example, your session might look like this: .. 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``”. diff --git a/more/getting_started/windows.html b/more/getting_started/windows.html index 4e77e2c10e..3b37985270 100644 --- a/more/getting_started/windows.html +++ b/more/getting_started/windows.html @@ -42,7 +42,7 @@ not supported—they may or may not work.

  • 5.3.1   Install Boost.Build
  • 5.3.2   Identify Your Toolset
  • 5.3.3   Select a Build Directory
    • -
  • 5.3.4   Invoke bjam
    • +
  • 5.3.4   Invoke b2
  • 5.4   Expected Build Output
    • @@ -94,7 +94,7 @@ distribution.1 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 @@ -367,12 +367,12 @@ and change your current directory to the Boost root directory. Then, type 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.

    5.3   Or, Build Binaries From Source

    @@ -395,7 +395,7 @@ install it. To do this:

    1. Go to the directory tools\build\v2\.
    2. Run bootstrap.bat
      3. -
    3. Run bjam install --prefix=PREFIX where PREFIX is +
    4. Run b2 install --prefix=PREFIX where PREFIX is the directory where you want Boost.Build to be installed
    5. Add PREFIX\bin to your PATH environment variable.
    @@ -408,7 +408,7 @@ Boost.Build documentation).

    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.

    @@ -510,25 +510,25 @@ directory is writable, this step isn't strictly necessary: by default Boost.Build will create a bin.v2/ subdirectory for that purpose in your current working directory.

    -
    -

    5.3.4   Invoke bjam

    +
    +

    5.3.4   Invoke b2

    Change your current directory to the Boost root directory and -invoke bjam as follows:

    +invoke b2 as follows:

    -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.

    For example, your session might look like this:4

     C:\WINDOWS> cd C:\Program Files\boost\boost_1_47_0
-C:\Program Files\boost\boost_1_47_0> bjam ^
+C:\Program Files\boost\boost_1_47_0> 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.

    @@ -538,16 +538,16 @@ list.

    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 +

    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:

    diff --git a/more/getting_started/windows.rst b/more/getting_started/windows.rst index 280373cfe7..2a396a8651 100644 --- a/more/getting_started/windows.rst +++ b/more/getting_started/windows.rst @@ -208,12 +208,12 @@ and change your current directory to the Boost root directory. Then, type 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 @@ For example, your session might look like this: [#continuation]_ .. 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`_.