diff --git a/Jamroot b/Jamroot index 412630e320..05af735927 100644 --- a/Jamroot +++ b/Jamroot @@ -4,8 +4,8 @@ # Copyright Douglas Gregor 2005. # # 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) +# (See accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) # Usage: # @@ -31,93 +31,91 @@ # --includedir= Install header files here. # Default; /include # -# stage Build and install only compiled library files -# ===== to the stage directory. +# stage Build and install only compiled library files to the +# ===== stage directory. # # --stagedir= Install library files here # Default; ./stage # # Other Options: # -# --build-type= Build the specified pre-defined set of variations -# of the libraries. Note, that which variants get -# built depends on what each library supports. +# --build-type= Build the specified pre-defined set of variations of +# the libraries. Note, that which variants get built +# depends on what each library supports. # -# minimal (default) - Builds a minimal set of -# variants. On Windows, these are static +# -- minimal -- (default) Builds a minimal set of +# variants. On Windows, these are static # multithreaded libraries in debug and release -# modes, using shared runtime. On Linux, these -# are static and shared multithreaded libraries -# in release mode. +# modes, using shared runtime. On Linux, these are +# static and shared multithreaded libraries in +# release mode. # -# complete - Build all possible variations. +# -- complete -- Build all possible variations. # -# --build-dir=DIR Build in this location instead of building -# within the distribution tree. Recommended! +# --build-dir=DIR Build in this location instead of building within +# the distribution tree. Recommended! # -# --show-libraries Displays the list of Boost libraries that require -# build and installation steps, then exit. +# --show-libraries Display the list of Boost libraries that require +# build and installation steps, and then exit. # -# --layout= Determines whether to choose library names -# and header locations such that multiple -# versions of Boost or multiple compilers can -# be used on the same system. +# --layout= Determine whether to choose library names and header +# locations such that multiple versions of Boost or +# multiple compilers can be used on the same system. # -# versioned - Names of boost binaries -# include the Boost version number, name and -# version of the compiler and encoded build -# properties. Boost headers are installed in a -# subdirectory of whose name contains -# the Boost version number. +# -- versioned -- Names of boost binaries include +# the Boost version number, name and version of +# the compiler and encoded build properties. Boost +# headers are installed in a subdirectory of +# whose name contains the Boost version +# number. # -# tagged -- Names of boost binaries include the +# -- tagged -- Names of boost binaries include the # encoded build properties such as variant and # threading, but do not including compiler name # and version, or Boost version. This option is # useful if you build several variants of Boost, # using the same compiler. # -# system - Binaries names do not include the +# -- system -- Binaries names do not include the # Boost version number or the name and version -# number of the compiler. Boost headers are -# installed directly into . This option -# is intended for system integrators who are -# building distribution packages. +# number of the compiler. Boost headers are +# installed directly into . This option is +# intended for system integrators building +# distribution packages. # # The default value is 'versioned' on Windows, and # 'system' on Unix. # -# --buildid=ID Adds the specified ID to the name of built -# libraries. The default is to not add anything. -# -# --python-buildid=ID Adds the specified ID to the name of built -# libraries that depend on Python. The default -# is to not add anything. This ID is added in -# addition to --buildid. +# --buildid=ID Add the specified ID to the name of built libraries. +# The default is to not add anything. # +# --python-buildid=ID Add the specified ID to the name of built libraries +# that depend on Python. The default is to not add +# anything. This ID is added in addition to --buildid. # # --help This message. # -# --with- Build and install the specified -# If this option is used, only libraries -# specified using this option will be built. +# --with- Build and install the specified . If this +# option is used, only libraries specified using this +# option will be built. # # --without- Do not build, stage, or install the specified # . By default, all libraries are built. # # Properties: # -# toolset=toolset Indicates the toolset to build with. +# toolset=toolset Indicate the toolset to build with. # # variant=debug|release Select the build variant # # link=static|shared Whether to build static or shared libraries # # threading=single|multi Whether to build single or multithreaded binaries -# -# runtime-link=static|shared -# Whether to link to static or shared C and C++ runtime. -# +# +# runtime-link=static|shared +# Whether to link to static or shared C and C++ +# runtime. +# # TODO: # - handle boost version @@ -132,7 +130,7 @@ import set ; import path ; path-constant BOOST_ROOT : . ; -constant BOOST_VERSION : 1.53.0 ; +constant BOOST_VERSION : 1.54.0 ; constant BOOST_JAMROOT_MODULE : $(__name__) ; boostcpp.set-version $(BOOST_VERSION) ; @@ -165,12 +163,12 @@ rule tag ( name : type ? : property-set ) { return [ boostcpp.tag $(name) : $(type) : $(property-set) ] ; } - + rule handle-static-runtime ( properties * ) { - # Using static runtime with shared libraries is impossible on Linux, - # and dangerous on Windows. Therefore, we disallow it. This might - # be drastic, but it was disabled for a while with nobody complaining. + # Using static runtime with shared libraries is impossible on Linux, and + # dangerous on Windows. Therefore, we disallow it. This might be drastic, + # but it was disabled for a while without anybody complaining. # For CW, static runtime is needed so that std::locale works. if shared in $(properties) && static in $(properties) && @@ -184,8 +182,7 @@ rule handle-static-runtime ( properties * ) } all-libraries = [ MATCH .*libs/(.*)/build/.* : [ glob libs/*/build/Jamfile.v2 ] - [ glob libs/*/build/Jamfile ] ] - ; + [ glob libs/*/build/Jamfile ] ] ; all-libraries = [ sequence.unique $(all-libraries) ] ; # The function_types library has a Jamfile, but it's used for maintenance @@ -251,10 +248,10 @@ rule boost-install ( libraries * ) } headers = - # The .SUNWCCh files are present in tr1 include directory and have to be installed, - # see http://lists.boost.org/Archives/boost/2007/05/121430.php + # The .SUNWCCh files are present in tr1 include directory and have to be + # installed (see http://lists.boost.org/Archives/boost/2007/05/121430.php). [ path.glob-tree $(BOOST_ROOT)/boost : *.hpp *.ipp *.h *.inc *.SUNWCCh : CVS .svn ] - [ path.glob-tree $(BOOST_ROOT)/boost/compatibility/cpp_c_headers : c* : CVS .svn ] + [ path.glob-tree $(BOOST_ROOT)/boost/compatibility/cpp_c_headers : c* : CVS .svn ] [ path.glob boost/tr1/tr1 : * : bcc32 sun CVS .svn ] ; diff --git a/index.html b/index.html index 9c2369e31c..a215e8c8c5 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@ boost.png (6897 bytes) -

Release 1.53.0

+

Release 1.54.0

@@ -62,7 +62,7 @@ Multiprecision and Numeric/Odeint), as well as updates to many existing libraries. See - Release + Release History for more information.

Getting Started

diff --git a/libs/config b/libs/config index c8e0bbdd8a..d6a0e39484 160000 --- a/libs/config +++ b/libs/config @@ -1 +1 @@ -Subproject commit c8e0bbdd8aed95d6298ca5e52c51d730f7e0a4c8 +Subproject commit d6a0e3948495958bfe66a5ae04e4d335e6d8f48a diff --git a/more/getting_started/detail/release-variables.rst b/more/getting_started/detail/release-variables.rst index 4f971d2d0b..ef3483347b 100644 --- a/more/getting_started/detail/release-variables.rst +++ b/more/getting_started/detail/release-variables.rst @@ -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.53.0 -.. |boost_ver| replace:: ``boost_1_53_0`` -.. |boost_ver-bold| replace:: **boost_1_53_0** +.. |boost-version-number| replace:: 1.54.0 +.. |boost_ver| replace:: ``boost_1_54_0`` +.. |boost_ver-bold| replace:: **boost_1_54_0** -.. _sf-download: http://www.boost.org/users/history/version_1_53_0.html +.. _sf-download: http://www.boost.org/users/history/version_1_54_0.html