summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel James <daniel@calamity.org.uk>2010-12-03 23:50:44 +0000
committerDaniel James <daniel@calamity.org.uk>2010-12-03 23:50:44 +0000
commit14507eb33d6a78c790d3680fea1602bc452913b3 (patch)
treefb3be10ca2b595a3f5f25a5ef9a5b38622fab0a4
parent28e567223a414770c340d005e015f006f69a397c (diff)
downloadboost-14507eb33d6a78c790d3680fea1602bc452913b3.tar.gz
Merge 1.46.0 prep.
[SVN r66993]
-rw-r--r--Jamroot2
-rw-r--r--index.html4
m---------libs/config0
-rw-r--r--more/getting_started/detail/release-variables.rst6
-rw-r--r--more/getting_started/unix-variants.html18
-rw-r--r--more/getting_started/windows.html28
6 files changed, 29 insertions, 29 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 @@
<a href="index.html">
<img src="boost.png" alt="boost.png (6897 bytes)" align="middle" width="277" height="86" border="0"></a></td>
<td width="337" align="middle">
- <h2 style="text-align: center">Release 1.45.0</h2>
+ <h2 style="text-align: center">Release 1.46.0</h2>
</td>
</tr>
</table>
@@ -57,7 +57,7 @@
<p>This release includes ? new libraries
as well as updates to many existing libraries. See
- <a href="http://www.boost.org/users/history/version_1_45_0">Release
+ <a href="http://www.boost.org/users/history/version_1_46_0">Release
History</a> for more information.</p>
<h3>Getting Started</h3>
diff --git a/libs/config b/libs/config
-Subproject c99164cf39d426d184b70da1328a380ce56f047
+Subproject bb3e68b516ffd40fd1f7a0f3e57a6e13d09808a
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 @@
<p>The most reliable way to get a copy of Boost is to download a
distribution from <a class="reference external" href="http://sourceforge.net/project/showfiles.php?group_id=7586&amp;package_id=8041">SourceForge</a>:</p>
<ol class="arabic">
-<li><p class="first">Download <a class="reference external" href="http://sourceforge.net/project/showfiles.php?group_id=7586&amp;package_id=8041"><tt class="docutils literal">boost_1_45_0</tt><tt class="docutils literal">.tar.bz2</tt></a>.</p>
+<li><p class="first">Download <a class="reference external" href="http://sourceforge.net/project/showfiles.php?group_id=7586&amp;package_id=8041"><tt class="docutils literal">boost_1_46_0</tt><tt class="docutils literal">.tar.bz2</tt></a>.</p>
</li>
<li><p class="first">In the directory where you want to put the Boost installation,
execute</p>
<pre class="literal-block">
-tar --bzip2 -xf <em>/path/to/</em><tt class="docutils literal">boost_1_45_0</tt>.tar.bz2
+tar --bzip2 -xf <em>/path/to/</em><tt class="docutils literal">boost_1_46_0</tt>.tar.bz2
</pre>
</li>
</ol>
@@ -91,7 +91,7 @@ from <a class="reference external" href="http://sourceforge.net/project/showfile
<h1><a class="toc-backref" href="#id21">2&nbsp;&nbsp;&nbsp;The Boost Distribution</a></h1>
<p>This is a sketch of the resulting directory structure:</p>
<pre class="literal-block">
-<strong>boost_1_45_0</strong><strong>/</strong> .................<em>The “boost root directory”</em>
+<strong>boost_1_46_0</strong><strong>/</strong> .................<em>The “boost root directory”</em>
<strong>index.htm</strong> .........<em>A copy of www.boost.org starts here</em>
<strong>boost</strong><strong>/</strong> .........................<em>All Boost Header files</em>
<tt class="docutils literal"> </tt>
@@ -136,7 +136,7 @@ anything you can use in these directories.</p>
</div>
<p>It's important to note the following:</p>
<ol class="arabic" id="boost-root-directory">
-<li><p class="first">The path to the <strong>boost root directory</strong> (often <tt class="docutils literal">/usr/local/</tt><tt class="docutils literal">boost_1_45_0</tt>) is
+<li><p class="first">The path to the <strong>boost root directory</strong> (often <tt class="docutils literal">/usr/local/</tt><tt class="docutils literal">boost_1_46_0</tt>) is
sometimes referred to as <tt class="docutils literal">$BOOST_ROOT</tt> in documentation and
mailing lists .</p>
</li>
@@ -237,7 +237,7 @@ int main()
<p>Now, in the directory where you saved <tt class="docutils literal">example.cpp</tt>, issue the
following command:</p>
<pre class="literal-block">
-c++ -I <em>path/to/</em><tt class="docutils literal">boost_1_45_0</tt> example.cpp -o example
+c++ -I <em>path/to/</em><tt class="docutils literal">boost_1_46_0</tt> example.cpp -o example
</pre>
<p>To test the result, type:</p>
<pre class="literal-block">
@@ -268,7 +268,7 @@ you'll need to acquire library binaries.</p>
<p>Issue the following commands in the shell (don't type <tt class="docutils literal">$</tt>; that
represents the shell's prompt):</p>
<pre class="literal-block">
-<strong>$</strong> cd <em>path/to/</em><tt class="docutils literal">boost_1_45_0</tt>
+<strong>$</strong> cd <em>path/to/</em><tt class="docutils literal">boost_1_46_0</tt>
<strong>$</strong> ./bootstrap.sh --help
</pre>
<p>Select your configuration options and invoke <tt class="docutils literal">./bootstrap.sh</tt> again
@@ -440,7 +440,7 @@ bjam <strong>--build-dir=</strong><a class="reference internal" href="#id11"><em
please see the <a class="reference external" href="http://www.boost.org/boost-build2/doc/html/bbv2/advanced/invocation.html">Boost.Build documentation</a>.</p>
<p>For example, your session might look like this:</p>
<pre class="literal-block">
-$ cd ~/<tt class="docutils literal">boost_1_45_0</tt>
+$ cd ~/<tt class="docutils literal">boost_1_46_0</tt>
$ bjam <strong>--build-dir=</strong>/tmp/build-boost <strong>toolset=</strong>gcc 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, “<tt class="docutils literal"><span class="pre">--build-type=complete</span></tt>”.</p>
@@ -556,14 +556,14 @@ project.</li>
<ol class="upperalpha">
<li><p class="first">You can specify the full path to each library:</p>
<pre class="literal-block">
-$ c++ -I <em>path/to/</em><tt class="docutils literal">boost_1_45_0</tt> example.cpp -o example <strong>\</strong>
+$ c++ -I <em>path/to/</em><tt class="docutils literal">boost_1_46_0</tt> example.cpp -o example <strong>\</strong>
<strong>~/boost/stage/lib/libboost_regex-gcc34-mt-d-1_36.a</strong>
</pre>
</li>
<li><p class="first">You can separately specify a directory to search (with <tt class="docutils literal"><span class="pre">-L</span></tt><em>directory</em>) and a library name to search for (with <tt class="docutils literal"><span class="pre">-l</span></tt><em>library</em>,<a class="footnote-reference" href="#lowercase-l" id="id15"><sup>2</sup></a> dropping the filename's leading <tt class="docutils literal">lib</tt> and trailing
suffix (<tt class="docutils literal">.a</tt> in this case):</p>
<pre class="literal-block">
-$ c++ -I <em>path/to/</em><tt class="docutils literal">boost_1_45_0</tt> example.cpp -o example <strong>\</strong>
+$ c++ -I <em>path/to/</em><tt class="docutils literal">boost_1_46_0</tt> example.cpp -o example <strong>\</strong>
<strong>-L~/boost/stage/lib/ -lboost_regex-gcc34-mt-d-1_36</strong>
</pre>
<p>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 <a class="reference exter
binaries when given the option.</p>
<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
-download <a class="reference external" href="http://sourceforge.net/project/showfiles.php?group_id=7586&amp;package_id=8041"><tt class="docutils literal">boost_1_45_0</tt><tt class="docutils literal">.7z</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">boost_1_45_0</tt><tt class="docutils literal">.zip</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">boost_1_46_0</tt><tt class="docutils literal">.7z</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">boost_1_46_0</tt><tt class="docutils literal">.zip</tt></a> and unpack it to install a complete Boost
distribution.<a class="footnote-reference" href="#zip" id="id2"><sup>1</sup></a></p>
<!-- Copyright David Abrahams 2006. Distributed under the Boost -->
<!-- Software License, Version 1.0. (See accompanying -->
@@ -83,7 +83,7 @@ distribution.<a class="footnote-reference" href="#zip" id="id2"><sup>1</sup></a>
<h1><a class="toc-backref" href="#id30">2&nbsp;&nbsp;&nbsp;The Boost Distribution</a></h1>
<p>This is a sketch of the resulting directory structure:</p>
<pre class="literal-block">
-<strong>boost_1_45_0</strong><strong>\</strong> .................<em>The “boost root directory”</em>
+<strong>boost_1_46_0</strong><strong>\</strong> .................<em>The “boost root directory”</em>
<strong>index.htm</strong> .........<em>A copy of www.boost.org starts here</em>
<strong>boost</strong><strong>\</strong> .........................<em>All Boost Header files</em>
<strong>lib</strong><strong>\</strong> .....................<em>precompiled library binaries</em>
@@ -128,7 +128,7 @@ anything you can use in these directories.</p>
</div>
<p>It's important to note the following:</p>
<ol class="arabic" id="boost-root-directory">
-<li><p class="first">The path to the <strong>boost root directory</strong> (often <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_45_0</tt>) is
+<li><p class="first">The path to the <strong>boost root directory</strong> (often <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_46_0</tt>) is
sometimes referred to as <tt class="docutils literal">$BOOST_ROOT</tt> in documentation and
mailing lists .</p>
</li>
@@ -259,7 +259,7 @@ cd <em>path</em>\<em>to</em>\<em>some</em>\<em>directory</em>
</pre>
<p>followed by Return. For example,</p>
<pre class="literal-block">
-cd <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_45_0</tt>
+cd <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_46_0</tt>
</pre>
<p class="last">Long commands can be continued across several lines by typing a
caret (<tt class="docutils literal">^</tt>) at the end of all but the last line. Some examples
@@ -284,7 +284,7 @@ select <em>Properties</em> from the resulting pop-up menu</p>
<li><p class="first">In <em>Configuration Properties</em> &gt; <em>C/C++</em> &gt; <em>General</em> &gt; <em>Additional Include
Directories</em>, enter the path to the Boost root directory, for example</p>
<blockquote>
-<p><tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_45_0</tt></p>
+<p><tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_46_0</tt></p>
</blockquote>
</li>
<li><p class="first">In <em>Configuration Properties</em> &gt; <em>C/C++</em> &gt; <em>Precompiled Headers</em>, change
@@ -322,7 +322,7 @@ Visual Studio compiler. In that window, set the <a class="reference internal" h
directory</a> to a suitable location for creating some temporary
files and type the following command followed by the Return key:</p>
<pre class="literal-block">
-cl /EHsc /I <em>path\to\</em><tt class="docutils literal">boost_1_45_0</tt> <em>path</em>\<em>to</em>\example.cpp
+cl /EHsc /I <em>path\to\</em><tt class="docutils literal">boost_1_46_0</tt> <em>path</em>\<em>to</em>\example.cpp
</pre>
<p>To test the result, type:</p>
<pre class="literal-block">
@@ -353,7 +353,7 @@ you'll need to acquire library binaries.</p>
<h2><a class="toc-backref" href="#id37">5.1&nbsp;&nbsp;&nbsp;Install Visual Studio Binaries</a></h2>
<p>The installers supplied by BoostPro Computing will download and
install pre-compiled binaries into the <tt class="docutils literal">lib\</tt> subdirectory of the
-boost root, typically <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_45_0</tt><tt class="docutils literal">\lib\</tt>. If you installed
+boost root, typically <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_46_0</tt><tt class="docutils literal">\lib\</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
step. Otherwise, please run the installer again and install them
now.</p>
@@ -524,8 +524,8 @@ bjam <strong>--build-dir=</strong><a class="reference internal" href="#id14"><em
please see the <a class="reference external" href="http://www.boost.org/boost-build2/doc/html/bbv2/advanced/invocation.html">Boost.Build documentation</a>.</p>
<p>For example, your session might look like this:<a class="footnote-reference" href="#continuation" id="id16"><sup>4</sup></a></p>
<pre class="literal-block">
-C:\WINDOWS&gt; cd <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_45_0</tt>
-<tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_45_0</tt>&gt; bjam <strong>^</strong>
+C:\WINDOWS&gt; cd <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_46_0</tt>
+<tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_46_0</tt>&gt; bjam <strong>^</strong>
More? <strong>--build-dir=</strong>&quot;C:\Documents and Settings\dave\build-boost&quot; <strong>^</strong>
More? <strong>--build-type=complete</strong> <strong>msvc</strong> stage
</pre>
@@ -664,7 +664,7 @@ earlier:</p>
select <em>Properties</em> from the resulting pop-up menu</li>
<li>In <em>Configuration Properties</em> &gt; <em>Linker</em> &gt; <em>Additional Library
Directories</em>, enter the path to the Boost binaries,
-e.g. <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_45_0</tt><tt class="docutils literal">\lib\</tt>.</li>
+e.g. <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_46_0</tt><tt class="docutils literal">\lib\</tt>.</li>
<li>From the <em>Build</em> menu, select <em>Build Solution</em>.</li>
</ol>
<p><a class="reference internal" href="#test-your-program"><em>skip to the next step</em></a></p>
@@ -674,10 +674,10 @@ e.g. <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boos
<p>For example, we can compile and link the above program from the
Visual C++ command-line by simply adding the <strong>bold</strong> text below to
the command line we used earlier, assuming your Boost binaries are
-in <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_45_0</tt><tt class="docutils literal">\lib</tt>:</p>
+in <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_46_0</tt><tt class="docutils literal">\lib</tt>:</p>
<pre class="literal-block">
-cl /EHsc /I <em>path\to\</em><tt class="docutils literal">boost_1_45_0</tt> example.cpp <strong>^</strong>
- <strong>/link /LIBPATH:</strong><strong>C:\Program Files\boost\</strong><strong>boost_1_45_0</strong><strong>\lib</strong>
+cl /EHsc /I <em>path\to\</em><tt class="docutils literal">boost_1_46_0</tt> example.cpp <strong>^</strong>
+ <strong>/link /LIBPATH:</strong><strong>C:\Program Files\boost\</strong><strong>boost_1_46_0</strong><strong>\lib</strong>
</pre>
</div>
<div class="section" id="library-naming">
@@ -835,7 +835,7 @@ mailing list</a>.</p>
<colgroup><col class="label" /><col /></colgroup>
<tbody valign="top">
<tr><td class="label"><a class="fn-backref" href="#id2">[1]</a></td><td>We recommend
-downloading <a class="reference external" href="http://sourceforge.net/project/showfiles.php?group_id=7586&amp;package_id=8041"><tt class="docutils literal">boost_1_45_0</tt><tt class="docutils literal">.7z</tt></a> and using <a class="reference external" href="http://www.7-zip.org">7-Zip</a> to decompress
+downloading <a class="reference external" href="http://sourceforge.net/project/showfiles.php?group_id=7586&amp;package_id=8041"><tt class="docutils literal">boost_1_46_0</tt><tt class="docutils literal">.7z</tt></a> and using <a class="reference external" href="http://www.7-zip.org">7-Zip</a> 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.</td></tr>