From 14507eb33d6a78c790d3680fea1602bc452913b3 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Fri, 3 Dec 2010 23:50:44 +0000 Subject: Merge 1.46.0 prep. [SVN r66993] --- Jamroot | 2 +- index.html | 4 ++-- libs/config | 2 +- more/getting_started/detail/release-variables.rst | 6 ++--- more/getting_started/unix-variants.html | 18 +++++++-------- more/getting_started/windows.html | 28 +++++++++++------------ 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Jamroot b/Jamroot index 978c5e02a7..d238fc3b01 100644 --- a/Jamroot +++ b/Jamroot @@ -145,7 +145,7 @@ import build-system ; import configure ; path-constant BOOST_ROOT : . ; -constant BOOST_VERSION : 1.45.0 ; +constant BOOST_VERSION : 1.46.0 ; constant BOOST_JAMROOT_MODULE : $(__name__) ; local version-tag = [ MATCH "^([^.]+)[.]([^.]+)[.]([^.]+)" : $(BOOST_VERSION) ] diff --git a/index.html b/index.html index b6d0cc5022..d489d10937 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@ boost.png (6897 bytes) -

Release 1.45.0

+

Release 1.46.0

@@ -57,7 +57,7 @@

This release includes ? new libraries as well as updates to many existing libraries. See - Release + Release History for more information.

Getting Started

diff --git a/libs/config b/libs/config index c99164cf39..bb3e68b516 160000 --- a/libs/config +++ b/libs/config @@ -1 +1 @@ -Subproject commit c99164cf39d426d184b70da1328a380ce56f0471 +Subproject commit bb3e68b516ffd40fd1f7a0f3e57a6e13d09808a5 diff --git a/more/getting_started/detail/release-variables.rst b/more/getting_started/detail/release-variables.rst index 27c3d4f64d..373d595c88 100644 --- a/more/getting_started/detail/release-variables.rst +++ b/more/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.45.0 -.. |boost_ver| replace:: ``boost_1_45_0`` -.. |boost_ver-bold| replace:: **boost_1_45_0** +.. |boost-version-number| replace:: 1.46.0 +.. |boost_ver| replace:: ``boost_1_46_0`` +.. |boost_ver-bold| replace:: **boost_1_46_0** .. _sf-download: http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=8041 diff --git a/more/getting_started/unix-variants.html b/more/getting_started/unix-variants.html index aaae8f304c..dc6574e486 100644 --- a/more/getting_started/unix-variants.html +++ b/more/getting_started/unix-variants.html @@ -63,12 +63,12 @@

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

    -

  1. Download boost_1_45_0.tar.bz2.

    +

  2. Download boost_1_46_0.tar.bz2.

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

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

This is a sketch of the resulting directory structure:

-boost_1_45_0/ .................The “boost root directory”
+boost_1_46_0/ .................The “boost root directory”
    index.htm .........A copy of www.boost.org starts here
    boost/ .........................All Boost Header files
     
@@ -136,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_45_0) is
+
  2. The path to the boost root directory (often /usr/local/boost_1_46_0) is
 sometimes referred to as $BOOST_ROOT in documentation and
 mailing lists .
    
 
    3. 
@@ -237,7 +237,7 @@ int main()
 
    Now, in the directory where you saved example.cpp, issue the
 following command:
    
 
    -c++ -I path/to/boost_1_45_0 example.cpp -o example
+c++ -I path/to/boost_1_46_0 example.cpp -o example
 
    
 
    To test the result, type:
    
 
    @@ -268,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_45_0
+$ cd path/to/boost_1_46_0
 $ ./bootstrap.sh --help
 
    
 
    Select your configuration options and invoke ./bootstrap.sh again
@@ -440,7 +440,7 @@ bjam --build-dir=Boost.Build documentation.
    
 
    For example, your session might look like this:
    
 
    -$ cd ~/boost_1_45_0
+$ cd ~/boost_1_46_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”.
    
@@ -556,14 +556,14 @@ project.
 
      
 
    1. You can specify the full path to each library:
      
 
      -$ c++ -I path/to/boost_1_45_0 example.cpp -o example \
+$ c++ -I path/to/boost_1_46_0 example.cpp -o example \
    ~/boost/stage/lib/libboost_regex-gcc34-mt-d-1_36.a
 
      
 
      2. 
 
    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_45_0 example.cpp -o example \
+$ c++ -I path/to/boost_1_46_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
diff --git a/more/getting_started/windows.html b/more/getting_started/windows.html
index 8f003410d0..bada346f3b 100644
--- a/more/getting_started/windows.html
+++ b/more/getting_started/windows.html
@@ -73,7 +73,7 @@ least install the Static Multithreaded variants of the boost_1_45_0.7z or boost_1_45_0.zip and unpack it to install a complete Boost
+download boost_1_46_0.7z or boost_1_46_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_45_0\ .................The “boost root directory”
+boost_1_46_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_45_0) is
+
      2. The path to the boost root directory (often C:\Program Files\boost\boost_1_46_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_45_0
+cd C:\Program Files\boost\boost_1_46_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
      
 
    3. 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_45_0
      
+
      C:\Program Files\boost\boost_1_46_0
      
 
      
 
      4. 
 
    4. 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_45_0 path\to\example.cpp
+cl /EHsc /I path\to\boost_1_46_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_45_0\lib\.  If you installed
+boost root, typically C:\Program Files\boost\boost_1_46_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_45_0
-C:\Program Files\boost\boost_1_45_0> bjam ^
+C:\WINDOWS> cd C:\Program Files\boost\boost_1_46_0
+C:\Program Files\boost\boost_1_46_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
      5. 
 
    5. In Configuration Properties > Linker > Additional Library
 Directories, enter the path to the Boost binaries,
-e.g. C:\Program Files\boost\boost_1_45_0\lib\.
      6. 
+e.g. C:\Program Files\boost\boost_1_46_0\lib\.
 
    6. From the Build menu, select Build Solution.
      7. 
 
    
 
    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_45_0\lib:
    
+in C:\Program Files\boost\boost_1_46_0\lib:
    
 
    -cl /EHsc /I path\to\boost_1_45_0 example.cpp   ^
-     /link /LIBPATH:C:\Program Files\boost\boost_1_45_0\lib
+cl /EHsc /I path\to\boost_1_46_0 example.cpp   ^
+     /link /LIBPATH:C:\Program Files\boost\boost_1_46_0\lib
 
    
 
 
    
@@ -835,7 +835,7 @@ mailing list.
    
 
 
 [1]We recommend
-downloading boost_1_45_0.7z and using 7-Zip to decompress
+downloading boost_1_46_0.7z and using 7-Zip to decompress
 it.  We no longer recommend .zip files for Boost because they are twice
 as large as the equivalent .7z files.  We don't recommend using Windows'
 built-in decompression as it can be painfully slow for large archives.
-- 
cgit v1.2.1