Update of /cvsroot/boost/boost/more/getting_started
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5110/getting_started

Modified Files:
      Tag: RC_1_34_0
        unix-variants.html windows.html windows.rst 
Log Message:
Add caveat about appending the version number of windows compilers for 
auto-link support.


Index: unix-variants.html
===================================================================
RCS file: /cvsroot/boost/boost/more/getting_started/unix-variants.html,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- unix-variants.html  28 Apr 2007 01:34:36 -0000      1.4.2.2
+++ unix-variants.html  8 May 2007 22:34:14 -0000       1.4.2.3
@@ -310,6 +310,12 @@
 <span id="toolset-name"></span><span id="toolset"></span><h3><a 
class="toc-backref" href="#id27">5.2.2&nbsp;&nbsp;&nbsp;Identify Your 
Toolset</a></h3>
 <p>First, find the toolset corresponding to your compiler in the
 following table.</p>
+<div class="note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you previously chose a toolset for the purposes of
+<a class="reference external" href="../../doc/html/jam/building.html">building 
bjam</a>, you should assume it won't work and instead
+choose newly from the table below.</p>
+</div>
 <table border="1" class="docutils">
 <colgroup>
 <col width="18%" />
@@ -398,15 +404,9 @@
 </tbody>
 </table>
 <p>If you have multiple versions of a particular compiler installed,
-you can append the version number to the toolset name, preceded by a
-hyphen, e.g. <tt class="docutils literal"><span 
class="pre">msvc-7.1</span></tt> or <tt class="docutils literal"><span 
class="pre">gcc-3.4</span></tt>.</p>
-<div class="note">
-<p class="first admonition-title">Note</p>
-<p class="last">if you built <tt class="docutils literal"><span 
class="pre">bjam</span></tt> yourself, you may
-have selected a toolset name for that purpose, but that does not
-affect this step in any way; you still need to select a Boost.Build
-toolset from the table.</p>
-</div>
+you can append the version number to the toolset name, preceded by
+a hyphen, e.g. <tt class="docutils literal"><span 
class="pre">intel-9.0</span></tt> or
+<tt class="docutils literal"><span class="pre">borland-5.4.3</span></tt>. <tt 
class="docutils literal"> </tt></p>
 </div>
 <div class="section" id="select-a-build-directory">
 <span id="id10"></span><span id="build-directory"></span><h3><a 
class="toc-backref" href="#id28">5.2.3&nbsp;&nbsp;&nbsp;Select a Build 
Directory</a></h3>

Index: windows.html
===================================================================
RCS file: /cvsroot/boost/boost/more/getting_started/windows.html,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- windows.html        28 Apr 2007 01:34:36 -0000      1.4.2.2
+++ windows.html        8 May 2007 22:34:14 -0000       1.4.2.3
@@ -373,6 +373,12 @@
 <span id="toolset-name"></span><span id="toolset"></span><h3><a 
class="toc-backref" href="#id33">5.2.2&nbsp;&nbsp;&nbsp;Identify Your 
Toolset</a></h3>
 <p>First, find the toolset corresponding to your compiler in the
 following table.</p>
+<div class="note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you previously chose a toolset for the purposes of
+<a class="reference external" href="../../doc/html/jam/building.html">building 
bjam</a>, you should assume it won't work and instead
+choose newly from the table below.</p>
+</div>
 <table border="1" class="docutils">
 <colgroup>
 <col width="18%" />
@@ -461,15 +467,12 @@
 </tbody>
 </table>
 <p>If you have multiple versions of a particular compiler installed,
-you can append the version number to the toolset name, preceded by a
-hyphen, e.g. <tt class="docutils literal"><span 
class="pre">msvc-7.1</span></tt> or <tt class="docutils literal"><span 
class="pre">gcc-3.4</span></tt>.</p>
-<div class="note">
-<p class="first admonition-title">Note</p>
-<p class="last">if you built <tt class="docutils literal"><span 
class="pre">bjam</span></tt> yourself, you may
-have selected a toolset name for that purpose, but that does not
-affect this step in any way; you still need to select a Boost.Build
-toolset from the table.</p>
-</div>
+you can append the version number to the toolset name, preceded by
+a hyphen, e.g. <tt class="docutils literal"><span 
class="pre">intel-9.0</span></tt> or
+<tt class="docutils literal"><span class="pre">borland-5.4.3</span></tt>. 
Unless you are using the
+msvc or gcc toolsets (which have special version detection code)
+<strong>you must append a version number even if you only have one
+version installed</strong>, or <a class="reference internal" 
href="#auto-linking">auto-linking</a> will fail.</p>
 </div>
 <div class="section" id="select-a-build-directory">
 <span id="id12"></span><span id="build-directory"></span><h3><a 
class="toc-backref" href="#id34">5.2.3&nbsp;&nbsp;&nbsp;Select a Build 
Directory</a></h3>
@@ -555,7 +558,7 @@
 the <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> 
file doesn't work for you, please address
 questions about configuring Boost for your compiler to the
 <a class="reference external" 
href="../../more/mailing_lists.htm#jamboost">Boost.Build mailing list</a>.</p>
-<!-- Copyright David Abrahams 2006. Distributed under the Boost -->
+<span class="target" id="auto-linking"></span><!-- Copyright David Abrahams 
2006. Distributed under the Boost -->
 <!-- Software License, Version 1.0. (See accompanying -->
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
 </div>

Index: windows.rst
===================================================================
RCS file: /cvsroot/boost/boost/more/getting_started/windows.rst,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- windows.rst 22 Dec 2006 15:00:01 -0000      1.2
+++ windows.rst 8 May 2007 22:34:14 -0000       1.2.2.1
@@ -206,6 +206,8 @@
 
 .. include:: detail/build-from-source-tail.rst
 
+.. _auto-linking:
+
 .. include:: detail/link-head.rst
 
 .. Admonition:: Auto-Linking


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs

Reply via email to