v1_32_0

Jamfile

@@ -1,7 +1,6 @@
-#~ Copyright 2003, 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 2003-2004, Rene Rivera.
+#~ Distributed under the Boost Software License, Version 1.0.
+#~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
 
 if --help in $(ARGV)
 {
@@ -14,32 +13,62 @@ Usage:
 
 Options:
     --help                  This message.
+
     -sTOOLS=<toolsets>      Indicates the tools to build with.
+
+    --layout=<layout>       Determines what kind of build layout to use. This
+                            allows one to control the naming of the resulting
+                            libraries, and the locations of the installed
+                            files. Default is 'versioned'. Possible values:
+
+                                versioned - Uses the Boost standard names
+                                which include version number for Boost the
+                                release and version and name of the
+                                compiler as part of the library names. Also
+                                installs the includes to a versioned
+                                sub-directory.
+
+                                system - Builds an install without the
+                                Boost standard names, and does not install
+                                includes to a versioned sub-directory. This
+                                is intended for system integrators to build
+                                for packaging of distributions.
 
 Locations:
     --prefix=PREFIX         Install architecture independent files here.
                             Default; C:\\Boost on Win32
                             Default; /usr/local on Unix. Linux, etc.
+
     --exec-prefix=EPREFIX   Install architecture dependent files here.
                             Default; PREFIX
+
     --libdir=DIR            Install libraries here.
                             Default; EPREFIX/lib
+
     --includedir=DIR        Install source headers here.
                             Default; PREFIX/include
+
     --builddir=DIR          Build in this location instead of building
                             within the distribution tree. Recomended!
+
     --stagedir=DIR          When staging only, stage to the location.
                             Default; ./stage
 
 Features:
+    --with-<library>        Build, stage, or install the specified <library>
+                            If used, teh default becomes to only build
+                            indicated libraries.
+
     --without-<library>     Do not build, stage, or install the specified
                             <library>. By default all libraries attempt to build.
+
     --with-python-root[=PYTHON_ROOT]
                             Build Boost.Python libraries with the Python
                             devel packages located at PYTHON_ROOT.
                             Default PYTHON_ROOT; C:\\tools\\python on Win32.
                             Default PYTHON_ROOT; /usr/local on Unix, Linux, etc.
                             Default PYTHON_ROOT; /usr on Cygwin.
+
     --with-pydebug          Build Boost.Python libraries using the
                             Python debug runtime.
 " ;
@@ -63,6 +92,11 @@ if stage in $(ARGV)
     with-install = ;
 }
 
+# what kind of layout are we doing?
+local layout = [ MATCH "^--layout=(.*)" : $(ARGV) ] ;
+layout ?= versioned ;
+layout-$(layout) = true ;
+
 # possible stage only location
 local stage-locate = [ MATCH "^--stagedir=(.*)" : $(ARGV) ] ;
 stage-locate ?= stage ;
@@ -102,6 +136,20 @@ if --with-pydebug in $(ARGV)
 # libraries to disable building, etc.
 local without-libraries = [ MATCH "^--without-(.*)" : $(ARGV) ] ;
 
+# libraries to enable
+local with-libraries ;
+for local arg in $(ARGV)
+{
+    switch $(arg)
+    {
+        case --with-python-root=* : local _ ;
+        case --with-pydebug : local _ ;
+
+        case --with-* :
+        with-libraries += [ MATCH "^--with-(.*)" : $(arg) ] ;
+    }
+}
+
 #
 project-root ;
 
@@ -115,13 +163,14 @@ version-tag = $(version-tag:J="_") ;
 #
 install-subinclude
     [ MATCH ^(.*build[/\\:]$(JAMFILE))$ : [ glob-tree $(BOOST_ROOT)/libs : $(JAMFILE) ] ]
-    : <exclude>$(without-libraries) ;
+    : <exclude>$(without-libraries) <include>$(with-libraries) ;
 
 local lib-sources = [ install-sources lib ] ;
 
 if $(lib-sources)
 {
     local gNOWARN_INCOMPATIBLE_BUILDS = TRUE ;
+    local gUNVERSIONED_VARIANT_TAG = [ cond $(layout-system) : TRUE ] ;
 
     local lib-build =
         debug release
@@ -145,7 +194,7 @@ if $(lib-sources)
                 $(lib-build)
                 [ unless $(with-install) $(with-stage) : <suppress>true ]
         ] ;
-    if ! $(gIN_LIB_INCLUDE)
+    if ! $(gIN_LIB_INCLUDE) && $(layout-versioned)
     {
         local unversioned-files ;
         if $(with-install) || $(with-stage)
@@ -187,10 +236,10 @@ if $(lib-sources)
     }
 }
 
-stage $(include-locate:D=)/boost-$(version-tag)
+stage [ cond $(layout-versioned) : $(include-locate:D=)/boost-$(version-tag) : $(include-locate:D=) ]
     :
         [ glob-tree $(BOOST_ROOT)/boost/compatibility/cpp_c_headers : c* ]
-        [ glob-tree $(BOOST_ROOT)/boost : *.hpp *.ipp *.h ]
+        [ glob-tree $(BOOST_ROOT)/boost : *.hpp *.ipp *.h *.inc ]
     :
         <locate>$(include-locate:D)
         <tree-subdirs>$(BOOST_ROOT)

Jamfile.v2

@@ -10,9 +10,14 @@
 
 
 project boost
-    : requirements <include>.
-    : usage-requirements <include>.
+    : requirements <include>$(BOOST_ROOT)
+      # disable auto-linking for all targets here,
+      # primarily because it caused troubles with V2
+      <define>BOOST_ALL_NO_LIB=1
+    : usage-requirements <include>$(BOOST_ROOT)
+    : build-dir bin.v2	
     ;
+
 
 build-project libs/test/build ;
 build-project libs/date_time/build ;
@@ -24,4 +29,4 @@ build-project libs/graph/build ;
 build-project libs/python/build ;
 build-project libs/thread/build ;
 build-project libs/filesystem/build ;
-
+build-project libs/program_options/build ;

Jamrules

@@ -11,4 +11,5 @@ project boost ;
 path-global BOOST_ROOT : . ;
 
 # The current version of Boost.
-BOOST_VERSION ?= 1.31.0 ;
+BOOST_VERSION ?= 1.32.0 ;
+

boost.css

@@ -23,11 +23,16 @@ BODY
 PRE
 {
     MARGIN-LEFT: 2em;
-    FONT-FAMILY: Courier;
+    FONT-FAMILY: Courier,
+                 monospace;
 }
 CODE
 {
-    FONT-FAMILY: Courier;
+    FONT-FAMILY: Courier,
+                 monospace;
+}
+CODE.as_pre
+{
     white-space: pre;
 }
 .index

boost/algorithm/minmax.hpp

@@ -0,0 +1,47 @@
+//  (C) Copyright Herve Bronnimann 2004.
+//  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)
+
+/*
+ Revision history:
+   1 July 2004
+      Split the code into two headers to lessen dependence on
+      Boost.tuple. (Herve)
+   26 June 2004
+      Added the code for the boost minmax library. (Herve)
+*/
+
+#ifndef BOOST_ALGORITHM_MINMAX_HPP
+#define BOOST_ALGORITHM_MINMAX_HPP
+
+/* PROPOSED STANDARD EXTENSIONS:
+ *
+ * minmax(a, b)
+ * Effect: (b<a) ? std::make_pair(b,a) : std::make_pair(a,b);
+ *
+ * minmax(a, b, comp)
+ * Effect: comp(b,a) ? std::make_pair(b,a) : std::make_pair(a,b);
+ *
+ */
+
+#include <boost/tuple/tuple.hpp> // for using pairs with boost::cref
+#include <boost/ref.hpp>
+
+namespace boost {
+
+  template <typename T>
+  tuple< T const&, T const& >
+  minmax(T const& a, T const& b) {
+    return (b<a) ? make_tuple(cref(b),cref(a)) : make_tuple(cref(a),cref(b));
+  }
+
+  template <typename T, class BinaryPredicate>
+  tuple< T const&, T const& >
+  minmax(T const& a, T const& b, BinaryPredicate comp) {
+    return comp(b,a) ? make_tuple(cref(b),cref(a)) : make_tuple(cref(a),cref(b));
+  }
+
+} // namespace boost
+
+#endif // BOOST_ALGORITHM_MINMAX_HPP