[Boost-commit] svn:boost r46719 - in branches/release: . boost

From: bdawes_at_[hidden]
Date: 2008-06-26 11:57:13

Author: bemandawes
Date: 2008-06-26 11:57:12 EDT (Thu, 26 Jun 2008)
New Revision: 46719
URL: http://svn.boost.org/trac/boost/changeset/46719

Log:
Merge changes from trunk root + boost/version.hpp
Text files modified: 
   branches/release/boost-build.jam   |    17 +++++++++++------                       
   branches/release/boost/version.hpp |    12 ++++++------                            
   branches/release/index.html        |     2 +-                                      
   3 files changed, 18 insertions(+), 13 deletions(-)

Modified: branches/release/boost-build.jam
==============================================================================
--- branches/release/boost-build.jam	(original)
+++ branches/release/boost-build.jam	2008-06-26 11:57:12 EDT (Thu, 26 Jun 2008)
@@ -1,10 +1,15 @@
-#~ Copyright (C) 2002-2003 David Abrahams.
-#~ Copyright (C) 2002-2003 Vladimir Prus.
-#~ Copyright (C) 2003,2007 Rene Rivera.
-#~ Use, modification and distribution are subject to 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)
+# Copyright (C) 2002-2003 David Abrahams.
+# Copyright (C) 2002-2003 Vladimir Prus.
+# Copyright (C) 2003,2007 Rene Rivera.
+# Use, modification and distribution are subject to 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)
 
+#   This is the initial file loaded by Boost Jam when run from any Boost library
+# folder. It allows us to choose which Boost Build installation to use for
+# building Boost libraries. Unless explicitly selected using a command-line
+# option, the version included with the Boost library distribution is used (as
+# opposed to any other Boost Build version installed on the user's sytem).
 BOOST_ROOT = $(.boost-build-file:D) ;
 BOOST_BUILD = [ MATCH --boost-build=(.*) : $(ARGV) ] ;
 BOOST_BUILD ?= tools/build/v2 ;

Modified: branches/release/boost/version.hpp
==============================================================================
--- branches/release/boost/version.hpp	(original)
+++ branches/release/boost/version.hpp	2008-06-26 11:57:12 EDT (Thu, 26 Jun 2008)
@@ -15,19 +15,19 @@
 //  will cause a recompile every time a new boost version is
 //  released.
 //
-//  BOOST_VERSION % 100 is the sub-minor version
+//  BOOST_VERSION % 100 is the patch level
 //  BOOST_VERSION / 100 % 1000 is the minor version
 //  BOOST_VERSION / 100000 is the major version
 
-#define BOOST_VERSION 103501
+#define BOOST_VERSION 103600
 
 //
 //  BOOST_LIB_VERSION must be defined to be the same as BOOST_VERSION
-//  but as a *string* in the form "x_y" where x is the major version
-//  number and y is the minor version number.  This is used by
-//  <config/auto_link.hpp> to select which library version to link to.
+//  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_35_1"
+#define BOOST_LIB_VERSION "1_36"
 
 #endif
 

Modified: branches/release/index.html
==============================================================================
--- branches/release/index.html	(original)
+++ branches/release/index.html	2008-06-26 11:57:12 EDT (Thu, 26 Jun 2008)
@@ -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.35.0</h2>
+      <h2 style="text-align: center">Release 1.36.0</h2>
       </td>
     </tr>
   </table>