Skip to content

Commit

Permalink
1.43.0 prep
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.boost.org/svn/boost/trunk@59687 b8fc166d-592f-0410-95f2-cb63ce0dd405
  • Loading branch information
bemandawes committed Feb 15, 2010
1 parent cb6ad05 commit c81fb7f
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 36 deletions.
2 changes: 1 addition & 1 deletion Jamroot
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ import option ;
import xsltproc ;

path-constant BOOST_ROOT : . ;
constant BOOST_VERSION : 1.42.0 ;
constant BOOST_VERSION : 1.43.0 ;
constant BOOST_JAMROOT_MODULE : $(__name__) ;

local version-tag = [ MATCH "^([^.]+)[.]([^.]+)[.]([^.]+)" : $(BOOST_VERSION) ]
Expand Down
4 changes: 2 additions & 2 deletions boost/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
// BOOST_VERSION / 100 % 1000 is the minor version
// BOOST_VERSION / 100000 is the major version

#define BOOST_VERSION 104200
#define BOOST_VERSION 104300

//
// BOOST_LIB_VERSION must be defined to be the same as BOOST_VERSION
// but as a *string* in the form "x_y[_z]" where x is the major version
// number, y is the minor version number, and z is the patch level if not 0.
// This is used by <config/auto_link.hpp> to select which library version to link to.

#define BOOST_LIB_VERSION "1_42"
#define BOOST_LIB_VERSION "1_43"

#endif

Expand Down
7 changes: 3 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.42.0</h2>
<h2 style="text-align: center">Release 1.43.0</h2>
</td>
</tr>
</table>
Expand Down Expand Up @@ -55,10 +55,9 @@ <h2 class="title">Welcome to the Boost C++ Libraries</h2>

<h3>Changes in this release</h3>

<p>This release includes 1 new
library (<a href="libs/uuid/index.html">uuid</a>) as well as
<p>This release includes ? new library as well as
updates to many existing libraries. See
<a href="http://www.boost.org/users/history/version_1_42_0">Release
<a href="http://www.boost.org/users/history/version_1_43_0">Release
History</a> for more information.</p>

<h3>Getting Started</h3>
Expand Down
6 changes: 3 additions & 3 deletions more/getting_started/detail/release-variables.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.42.0
.. |boost_ver| replace:: ``boost_1_42_0``
.. |boost_ver-bold| replace:: **boost_1_42_0**
.. |boost-version-number| replace:: 1.43.0
.. |boost_ver| replace:: ``boost_1_43_0``
.. |boost_ver-bold| replace:: **boost_1_43_0**

.. _sf-download: http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=8041
2 changes: 1 addition & 1 deletion more/getting_started/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" />
<meta name="generator" content="Docutils 0.6: http://docutils.sourceforge.net/" />
<title>Boost Getting Started</title>
<link rel="stylesheet" href="../../rst.css" type="text/css" />
</head>
Expand Down
20 changes: 10 additions & 10 deletions more/getting_started/unix-variants.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" />
<meta name="generator" content="Docutils 0.6: http://docutils.sourceforge.net/" />
<title>Boost Getting Started on Unix Variants</title>
<meta content="Getting Started with Boost on Unix Variants (including Linux and MacOS)" name="description" />
<link rel="stylesheet" href="../../rst.css" type="text/css" />
Expand Down Expand Up @@ -63,12 +63,12 @@ <h1><a class="toc-backref" href="#id21">1&nbsp;&nbsp;&nbsp;Get Boost</a></h1>
<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_42_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_43_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_42_0</tt>.tar.bz2
tar --bzip2 -xf <em>/path/to/</em><tt class="docutils literal">boost_1_43_0</tt>.tar.bz2
</pre>
</li>
</ol>
Expand All @@ -91,7 +91,7 @@ <h1><a class="toc-backref" href="#id21">1&nbsp;&nbsp;&nbsp;Get Boost</a></h1>
<h1><a class="toc-backref" href="#id22">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_42_0</strong><strong>/</strong> .................<em>The “boost root directory”</em>
<strong>boost_1_43_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>
Expand Down Expand Up @@ -136,7 +136,7 @@ <h1><a class="toc-backref" href="#id22">2&nbsp;&nbsp;&nbsp;The Boost Distributio
</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_42_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_43_0</tt>) is
sometimes referred to as <tt class="docutils literal">$BOOST_ROOT</tt> in documentation and
mailing lists .</p>
</li>
Expand Down Expand Up @@ -231,7 +231,7 @@ <h1><a class="toc-backref" href="#id24">4&nbsp;&nbsp;&nbsp;Build a Simple Progra
<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_42_0</tt> example.cpp -o example
c++ -I <em>path/to/</em><tt class="docutils literal">boost_1_43_0</tt> example.cpp -o example
</pre>
<p>To test the result, type:</p>
<pre class="literal-block">
Expand Down Expand Up @@ -262,7 +262,7 @@ <h2><a class="toc-backref" href="#id27">5.1&nbsp;&nbsp;&nbsp;Easy Build and Inst
<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_42_0</tt>
<strong>$</strong> cd <em>path/to/</em><tt class="docutils literal">boost_1_43_0</tt>
<strong>$</strong> ./bootstrap.sh --help
</pre>
<p>Select your configuration options and invoke <tt class="docutils literal">./bootstrap.sh</tt> again
Expand Down Expand Up @@ -434,7 +434,7 @@ <h3><a class="toc-backref" href="#id32">5.2.4&nbsp;&nbsp;&nbsp;Invoke <tt class=
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_42_0</tt>
$ cd ~/<tt class="docutils literal">boost_1_43_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>
Expand Down Expand Up @@ -549,14 +549,14 @@ <h1><a class="toc-backref" href="#id35">6&nbsp;&nbsp;&nbsp;Link Your Program to
<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_42_0</tt> example.cpp -o example <strong>\</strong>
$ c++ -I <em>path/to/</em><tt class="docutils literal">boost_1_43_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_42_0</tt> example.cpp -o example <strong>\</strong>
$ c++ -I <em>path/to/</em><tt class="docutils literal">boost_1_43_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
Expand Down
30 changes: 15 additions & 15 deletions more/getting_started/windows.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" />
<meta name="generator" content="Docutils 0.6: http://docutils.sourceforge.net/" />
<title>Boost Getting Started on Windows</title>
<link rel="stylesheet" href="../../rst.css" type="text/css" />
</head>
Expand Down Expand Up @@ -73,7 +73,7 @@ <h1><a class="toc-backref" href="#id30">1&nbsp;&nbsp;&nbsp;Get Boost</a></h1>
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_42_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_42_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_43_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_43_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 -->
Expand All @@ -83,7 +83,7 @@ <h1><a class="toc-backref" href="#id30">1&nbsp;&nbsp;&nbsp;Get Boost</a></h1>
<h1><a class="toc-backref" href="#id31">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_42_0</strong><strong>\</strong> .................<em>The “boost root directory”</em>
<strong>boost_1_43_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>
Expand Down Expand Up @@ -128,7 +128,7 @@ <h1><a class="toc-backref" href="#id31">2&nbsp;&nbsp;&nbsp;The Boost Distributio
</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_42_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_43_0</tt>) is
sometimes referred to as <tt class="docutils literal">$BOOST_ROOT</tt> in documentation and
mailing lists .</p>
</li>
Expand Down Expand Up @@ -253,7 +253,7 @@ <h1><a class="toc-backref" href="#id33">4&nbsp;&nbsp;&nbsp;Build a Simple Progra
</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_42_0</tt>
cd <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_43_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
Expand All @@ -278,7 +278,7 @@ <h1><a class="toc-backref" href="#id33">4&nbsp;&nbsp;&nbsp;Build a Simple Progra
<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_42_0</tt></p>
<p><tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_43_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
Expand Down Expand Up @@ -316,7 +316,7 @@ <h2><a class="toc-backref" href="#id35">4.2&nbsp;&nbsp;&nbsp;Or, Build From the
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_42_0</tt> <em>path</em>\<em>to</em>\example.cpp
cl /EHsc /I <em>path\to\</em><tt class="docutils literal">boost_1_43_0</tt> <em>path</em>\<em>to</em>\example.cpp
</pre>
<p>To test the result, type:</p>
<pre class="literal-block">
Expand Down Expand Up @@ -347,7 +347,7 @@ <h1><a class="toc-backref" href="#id37">5&nbsp;&nbsp;&nbsp;Prepare to Use a Boos
<h2><a class="toc-backref" href="#id38">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_42_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_43_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>
Expand Down Expand Up @@ -518,8 +518,8 @@ <h3><a class="toc-backref" href="#id44">5.3.4&nbsp;&nbsp;&nbsp;Invoke <tt class=
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_42_0</tt>
<tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_42_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_43_0</tt>
<tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_43_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>
Expand Down Expand Up @@ -657,7 +657,7 @@ <h2><a class="toc-backref" href="#id48">6.1&nbsp;&nbsp;&nbsp;Link From Within th
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_42_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_43_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>
Expand All @@ -667,10 +667,10 @@ <h2><a class="toc-backref" href="#id49">6.2&nbsp;&nbsp;&nbsp;Or, Link From the C
<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_42_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_43_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_42_0</tt> example.cpp <strong>^</strong>
<strong>/link /LIBPATH:</strong> <strong>C:\Program Files\boost\</strong><strong>boost_1_42_0</strong><strong>\lib</strong>
cl /EHsc /I <em>path\to\</em><tt class="docutils literal">boost_1_43_0</tt> example.cpp <strong>^</strong>
<strong>/link /LIBPATH:</strong> <strong>C:\Program Files\boost\</strong><strong>boost_1_43_0</strong><strong>\lib</strong>
</pre>
</div>
<div class="section" id="library-naming">
Expand Down Expand Up @@ -824,7 +824,7 @@ <h1><a class="toc-backref" href="#id52">7&nbsp;&nbsp;&nbsp;Conclusion and Furthe
<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_42_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_43_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>
Expand Down

0 comments on commit c81fb7f

Please sign in to comment.