From 63224b4f7b1c0a5cf96094321dc5e3c3afc098f2 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 26 Aug 2010 22:44:53 +0000 Subject: [PATCH] Merge prep for 1.45 [SVN r65046] --- getting_started/detail/release-variables.rst | 6 ++-- getting_started/index.html | 8 ------ getting_started/unix-variants.html | 28 +++++++----------- getting_started/windows.html | 30 ++++++++++---------- 4 files changed, 28 insertions(+), 44 deletions(-) diff --git a/getting_started/detail/release-variables.rst b/getting_started/detail/release-variables.rst index b46ef18..27c3d4f 100644 --- a/getting_started/detail/release-variables.rst +++ b/getting_started/detail/release-variables.rst @@ -5,8 +5,8 @@ .. This file contains all the definitions that need to be updated .. for each new release of Boost. -.. |boost-version-number| replace:: 1.44.0 -.. |boost_ver| replace:: ``boost_1_44_0`` -.. |boost_ver-bold| replace:: **boost_1_44_0** +.. |boost-version-number| replace:: 1.45.0 +.. |boost_ver| replace:: ``boost_1_45_0`` +.. |boost_ver-bold| replace:: **boost_1_45_0** .. _sf-download: http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=8041 diff --git a/getting_started/index.html b/getting_started/index.html index 2dacec0..9a39aa6 100644 --- a/getting_started/index.html +++ b/getting_started/index.html @@ -2,21 +2,15 @@ - Boost Getting Started - -
-

Getting Started

- - @@ -58,7 +52,6 @@ your actual name.

Ready?

Let's go!

- - diff --git a/getting_started/unix-variants.html b/getting_started/unix-variants.html index e22087c..aaae8f3 100644 --- a/getting_started/unix-variants.html +++ b/getting_started/unix-variants.html @@ -2,22 +2,16 @@ - Boost Getting Started on Unix Variants - -
-

Getting Started on Unix Variants

- - @@ -69,12 +63,12 @@

The most reliable way to get a copy of Boost is to download a distribution from SourceForge:

    -
  1. Download boost_1_44_0.tar.bz2.

    +
  2. Download boost_1_45_0.tar.bz2.

  3. In the directory where you want to put the Boost installation, execute

    -tar --bzip2 -xf /path/to/boost_1_44_0.tar.bz2
    +tar --bzip2 -xf /path/to/boost_1_45_0.tar.bz2
     
@@ -97,7 +91,7 @@ from 2   The Boost Distribution

This is a sketch of the resulting directory structure:

-boost_1_44_0/ .................The “boost root directory”
+boost_1_45_0/ .................The “boost root directory”
    index.htm .........A copy of www.boost.org starts here
    boost/ .........................All Boost Header files
     
@@ -142,7 +136,7 @@ anything you can use in these directories.

It's important to note the following:

    -
  1. The path to the boost root directory (often /usr/local/boost_1_44_0) is +

  2. The path to the boost root directory (often /usr/local/boost_1_45_0) is sometimes referred to as $BOOST_ROOT in documentation and mailing lists .

  3. @@ -243,7 +237,7 @@ int main()

    Now, in the directory where you saved example.cpp, issue the following command:

    -c++ -I path/to/boost_1_44_0 example.cpp -o example
    +c++ -I path/to/boost_1_45_0 example.cpp -o example
     

    To test the result, type:

    @@ -274,7 +268,7 @@ you'll need to acquire library binaries.

    Issue the following commands in the shell (don't type $; that represents the shell's prompt):

    -$ cd path/to/boost_1_44_0
    +$ cd path/to/boost_1_45_0
     $ ./bootstrap.sh --help
     

    Select your configuration options and invoke ./bootstrap.sh again @@ -446,7 +440,7 @@ bjam --build-dir=Boost.Build documentation.

    For example, your session might look like this:

    -$ cd ~/boost_1_44_0
    +$ cd ~/boost_1_45_0
     $ bjam --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”.

    @@ -562,14 +556,14 @@ project.
    1. You can specify the full path to each library:

      -$ c++ -I path/to/boost_1_44_0 example.cpp -o example \
      +$ c++ -I path/to/boost_1_45_0 example.cpp -o example \
          ~/boost/stage/lib/libboost_regex-gcc34-mt-d-1_36.a
       
    2. You can separately specify a directory to search (with -Ldirectory) and a library name to search for (with -llibrary,2 dropping the filename's leading lib and trailing suffix (.a in this case):

      -$ c++ -I path/to/boost_1_44_0 example.cpp -o example \
      +$ c++ -I path/to/boost_1_45_0 example.cpp -o example \
          -L~/boost/stage/lib/ -lboost_regex-gcc34-mt-d-1_36
       

      As you can see, this method is just as terse as method A for one @@ -731,7 +725,7 @@ make this document clearer, please post it to the .

      • Boost.Build reference manual
      • -
      • Boost.Jam reference manual
      • +
      • Boost.Jam reference manual
      • Boost Users' mailing list
      • Boost.Build mailing list
      • Boost.Build Wiki
      • @@ -817,8 +811,6 @@ recommend it. - - diff --git a/getting_started/windows.html b/getting_started/windows.html index b887979..8f00341 100644 --- a/getting_started/windows.html +++ b/getting_started/windows.html @@ -73,7 +73,7 @@ least install the Static Multithreaded variants of the boost_1_44_0.7z or boost_1_44_0.zip and unpack it to install a complete Boost +download boost_1_45_0.7z or boost_1_45_0.zip and unpack it to install a complete Boost distribution.1

        @@ -83,7 +83,7 @@ distribution.1

        2   The Boost Distribution

        This is a sketch of the resulting directory structure:

        -boost_1_44_0\ .................The “boost root directory”
        +boost_1_45_0\ .................The “boost root directory”
            index.htm .........A copy of www.boost.org starts here
            boost\ .........................All Boost Header files
            lib\ .....................precompiled library binaries
        @@ -128,7 +128,7 @@ anything you can use in these directories.

        It's important to note the following:

          -
        1. The path to the boost root directory (often C:\Program Files\boost\boost_1_44_0) is +

        2. The path to the boost root directory (often C:\Program Files\boost\boost_1_45_0) is sometimes referred to as $BOOST_ROOT in documentation and mailing lists .

        3. @@ -259,7 +259,7 @@ cd path\to\some\directory

        followed by Return. For example,

        -cd C:\Program Files\boost\boost_1_44_0
        +cd C:\Program Files\boost\boost_1_45_0
         

        Long commands can be continued across several lines by typing a caret (^) at the end of all but the last line. Some examples @@ -284,7 +284,7 @@ select Properties from the resulting pop-up menu

      • In Configuration Properties > C/C++ > General > Additional Include Directories, enter the path to the Boost root directory, for example

        -

        C:\Program Files\boost\boost_1_44_0

        +

        C:\Program Files\boost\boost_1_45_0

      • In Configuration Properties > C/C++ > Precompiled Headers, change @@ -322,7 +322,7 @@ Visual Studio compiler. In that window, set the to a suitable location for creating some temporary files and type the following command followed by the Return key:

        -cl /EHsc /I path\to\boost_1_44_0 path\to\example.cpp
        +cl /EHsc /I path\to\boost_1_45_0 path\to\example.cpp
         

        To test the result, type:

        @@ -353,7 +353,7 @@ you'll need to acquire library binaries.

        5.1   Install Visual Studio Binaries

        The installers supplied by BoostPro Computing will download and install pre-compiled binaries into the lib\ subdirectory of the -boost root, typically C:\Program Files\boost\boost_1_44_0\lib\. If you installed +boost root, typically C:\Program Files\boost\boost_1_45_0\lib\. If you installed all variants of the Boost.Regex binary, you're done with this step. Otherwise, please run the installer again and install them now.

        @@ -524,8 +524,8 @@ bjam --build-dir=Boost.Build documentation.

        For example, your session might look like this:4

        -C:\WINDOWS> cd C:\Program Files\boost\boost_1_44_0
        -C:\Program Files\boost\boost_1_44_0> bjam ^
        +C:\WINDOWS> cd C:\Program Files\boost\boost_1_45_0
        +C:\Program Files\boost\boost_1_45_0> bjam ^
         More? --build-dir="C:\Documents and Settings\dave\build-boost" ^
         More? --build-type=complete msvc stage
         
        @@ -664,7 +664,7 @@ earlier:

        select Properties from the resulting pop-up menu
      • In Configuration Properties > Linker > Additional Library Directories, enter the path to the Boost binaries, -e.g. C:\Program Files\boost\boost_1_44_0\lib\.
      • +e.g. C:\Program Files\boost\boost_1_45_0\lib\.
      • From the Build menu, select Build Solution.

    skip to the next step

    @@ -674,10 +674,10 @@ e.g. C:\Program Files\boos

    For example, we can compile and link the above program from the Visual C++ command-line by simply adding the bold text below to the command line we used earlier, assuming your Boost binaries are -in C:\Program Files\boost\boost_1_44_0\lib:

    +in C:\Program Files\boost\boost_1_45_0\lib:

    -cl /EHsc /I path\to\boost_1_44_0 example.cpp   ^
    -     /link /LIBPATH:C:\Program Files\boost\boost_1_44_0\lib
    +cl /EHsc /I path\to\boost_1_45_0 example.cpp   ^
    +     /link /LIBPATH:C:\Program Files\boost\boost_1_45_0\lib
     
    @@ -817,7 +817,7 @@ make this document clearer, please post it to the .