Full merge from trunk at revision 41356 of entire boost-root tree.

[SVN r41377]

Jamroot

@@ -95,8 +95,11 @@ import regex ;
 import errors ;
 import "class" : new ;
 import common ;
+import sequence ;
 
-constant BOOST_VERSION : 1.34.1 ;
+path-constant BOOST_ROOT : . ;
+constant BOOST_VERSION : 1.35.0 ;
+constant BOOST_JAMROOT_MODULE : $(__name__) ;
 
 local version-tag = [ MATCH "^([^.]+)[.]([^.]+)[.]([^.]+)" : $(BOOST_VERSION) ] ;
 if $(version-tag[3]) = 0
@@ -165,8 +168,10 @@ project boost
 # Setup convenient aliases for all libraries.
 
 all-libraries =
-    [ MATCH .*libs/(.*)/build/.* : [ glob libs/*/build/Jamfile.v2 ] ]
+    [ MATCH .*libs/(.*)/build/.* : [ glob libs/*/build/Jamfile.v2 ] [ glob libs/*/build/Jamfile ] ]
     ;
+    
+all-libraries = [ sequence.unique $(all-libraries) ] ;    
 
 # First, the complicated libraries: where the target name in
 # Jamfile is different from directory name.
@@ -330,15 +335,6 @@ else if [ modules.peek : UNIX ]
 local headers =
     [ path.glob-tree boost : *.hpp *.ipp *.h *.inc : CVS ]
     [ path.glob-tree boost/compatibility/cpp_c_headers : c* : CVS ]
-    [ path.glob-tree boost/test/utils/runtime : *.cpp : CVS ]
-    [ path.glob-tree boost/spirit/tree :
-        parsetree.dtd : CVS ]
-    [ path.glob-tree boost/tr1/tr1 :
-        algorithm array bitset complex deque exception fstream functional
-        iomanip ios iostream istream iterator limits list locale map
-        memory new numeric ostream queue random regex set sstream stack
-        stdexcept streambuf string strstream tuple type_traits typeinfo
-        utility valarray vector *.SUNWCCh : CVS ]
     ;
 
 
@@ -447,7 +443,7 @@ alias build_all : libs/$(libraries)/build ;
 
 # This rule should be called from libraries' Jamfiles and will
 # create two targets, "install" and "stage", that will install
-# or stage that library. The --prefix option is respected, by
+# or stage that library. The --prefix option is respected, but
 # --with and --without options, naturally, are ignored.
 #
 # - libraries -- list of library targets to install.
@@ -467,6 +463,7 @@ rule boost-install ( libraries * )
     module $(project-module)
     {
         explicit stage ;
+        explicit install ;
     }
 }
 

Jamrules

@@ -1,15 +0,0 @@
-# Boost.Build top level Jamrules
-
-# See tools/build/index.html for documentation.
-project boost ;
-
-# Set some important global variables if they haven't already been set by the
-# user on the command-line or in the environment
-
-# Establish this as the root of the boost installation. Most targets will want
-# $(BOOST_ROOT) in their #include path.
-path-global BOOST_ROOT : . ;
-
-# The current version of Boost.
-BOOST_VERSION ?= 1.34.0 ;
-

project-root.jam

@@ -1,6 +0,0 @@
-# Copyright Rene Rivera, Vladimir Prus, 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)
-
-path-constant BOOST_ROOT : . ;