From d95e8638c1d76bca5d275833aae376abc39152f9 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Fri, 29 Aug 2003 07:17:18 +0000 Subject: [PATCH] Clarify instructions for installing from CVS. [SVN r19850] --- boost_build_v2.html | 55 +++++++++++++++++++++++------------------- v2/boost_build_v2.html | 55 +++++++++++++++++++++++------------------- 2 files changed, 60 insertions(+), 50 deletions(-) diff --git a/boost_build_v2.html b/boost_build_v2.html index 474fe3531..f308c18fc 100644 --- a/boost_build_v2.html +++ b/boost_build_v2.html @@ -22,12 +22,12 @@ div.alert { color: red } table { align: center; border: thin; } - + + - build request, build request expansion and directly requested targets + - conditional properties + -->

Installation

- Assuming you're installing Boost.Build from sources, the following steps - are needed. All paths are given relatively to Boost.Build root directory, - which is the directory with the document you are reading. When using - Boost distribution, Boost.Build root is located at - $boost_root/tools/build. + Assuming you're installing Boost.Build from released source distribution, + the following steps are needed. All paths are given relatively to + Boost.Build root directory, which is the directory with the document you + are reading.
  1. Go to "jam_src" directory and build Boost.Jam. Two convenient @@ -178,15 +177,21 @@ bjam there. A simple application will be built. You can also play with other projects in examples-v2. + it somewhere. + +

    It is slighly better way is to copy new/user-config.jam + into one of the locations where it can be found (given in this table). This prevent you from + accidentally overwriting your config when updating.

    -->
+

If you use Boost distribution, or Boost CVS, the Boost.Build root is + located at $boost_root/tools/build and the installation steps + are the same. However, don't skip the bjam rebuilding step, even if you + have a previous version. CVS version of Boost.Build requires CVS version + of Boost.Jam.

+

When starting a new project which uses Boost.Build, you need to make sure that build system can be found. There are two ways.

@@ -1016,17 +1021,17 @@ boost-build /path/to/boost.build ;
  • It allows to have main target names with slashes. + That makes good rationale for why main target must contain names. + -->
    • diff --git a/v2/boost_build_v2.html b/v2/boost_build_v2.html index 474fe3531..f308c18fc 100644 --- a/v2/boost_build_v2.html +++ b/v2/boost_build_v2.html @@ -22,12 +22,12 @@ div.alert { color: red } table { align: center; border: thin; } - + + - build request, build request expansion and directly requested targets + - conditional properties + -->

    Installation

    - Assuming you're installing Boost.Build from sources, the following steps - are needed. All paths are given relatively to Boost.Build root directory, - which is the directory with the document you are reading. When using - Boost distribution, Boost.Build root is located at - $boost_root/tools/build. + Assuming you're installing Boost.Build from released source distribution, + the following steps are needed. All paths are given relatively to + Boost.Build root directory, which is the directory with the document you + are reading.
    1. Go to "jam_src" directory and build Boost.Jam. Two convenient @@ -178,15 +177,21 @@ bjam there. A simple application will be built. You can also play with other projects in examples-v2. + it somewhere. + +

      It is slighly better way is to copy new/user-config.jam + into one of the locations where it can be found (given in this table). This prevent you from + accidentally overwriting your config when updating.

      -->
    +

    If you use Boost distribution, or Boost CVS, the Boost.Build root is + located at $boost_root/tools/build and the installation steps + are the same. However, don't skip the bjam rebuilding step, even if you + have a previous version. CVS version of Boost.Build requires CVS version + of Boost.Jam.

    +

    When starting a new project which uses Boost.Build, you need to make sure that build system can be found. There are two ways.

    @@ -1016,17 +1021,17 @@ boost-build /path/to/boost.build ;
  • It allows to have main target names with slashes. + That makes good rationale for why main target must contain names. + -->