Re-enable tools/ testing

Update variant from develop
Update contract from develop
2019-01-08 18:02:32 +02:00 · 2019-01-08 11:30:05 +00:00 · 2019-01-08 04:30:05 +00:00 · 2019-01-08 04:00:21 +00:00 · 2019-01-08 02:00:08 +00:00 · 2019-01-08 01:45:04 +00:00
120 changed files with 813 additions and 1208 deletions
@@ -9,6 +9,7 @@ branches:
  only:
    - master
    - develop
+    - /feature\/.*/

 dist: trusty

@@ -19,23 +19,28 @@
 #   =======                 configured locations (below).
 #
 #   --prefix=<PREFIX>       Install architecture independent files here.
-#                           Default; C:\Boost on Win32
-#                           Default; /usr/local on Unix. Linux, etc.
+#                           Default: C:\Boost on Windows
+#                           Default: /usr/local on Unix, Linux, etc.
 #
 #   --exec-prefix=<EPREFIX> Install architecture dependent files here.
-#                           Default; <PREFIX>
+#                           Default: <PREFIX>
 #
-#   --libdir=<DIR>          Install library files here.
-#                           Default; <EPREFIX>/lib
+#   --libdir=<LIBDIR>       Install library files here.
+#                           Default: <EPREFIX>/lib
 #
 #   --includedir=<HDRDIR>   Install header files here.
-#                           Default; <PREFIX>/include
+#                           Default: <PREFIX>/include
+#
+#   --cmakedir=<CMAKEDIR>   Install CMake configuration files here.
+#                           Default: <LIBDIR>/cmake
+#
+#   --no-cmake-config       Do not install CMake configuration files.
 #
 #   stage                   Build and install only compiled library files to the
 #   =====                   stage directory.
 #
 #   --stagedir=<STAGEDIR>   Install library files here
-#                           Default; ./stage
+#                           Default: ./stage
 #
 # Other Options:
 #
@@ -135,9 +140,10 @@ import "class" : new ;
 import property-set ;
 import threadapi-feature ;
 import option ;
+import tools/boost_install/boost-install ;

 path-constant BOOST_ROOT : . ;
-constant BOOST_VERSION : 1.69.0 ;
+constant BOOST_VERSION : 1.70.0 ;
 constant BOOST_JAMROOT_MODULE : $(__name__) ;

 boostcpp.set-version $(BOOST_VERSION) ;
@@ -179,6 +185,7 @@ project boost
    : usage-requirements <include>.
    : default-build
      <visibility>hidden
+      <threading>multi
    : build-dir bin.v2
    ;

@@ -244,7 +251,7 @@ explicit-alias serialization : libs/serialization/build//boost_serialization ;
 explicit-alias wserialization : libs/serialization/build//boost_wserialization ;
 for local l in $(all-libraries)
 {
-    if ! $(l) in test graph serialization
+    if ! $(l) in test graph serialization headers
    {
        explicit-alias $(l) : libs/$(l)/build//boost_$(l) ;
    }
@@ -286,31 +293,18 @@ if [ path.exists $(BOOST_ROOT)/libs/wave/tool/build ]
    use-project /boost/libs/wave/tool : libs/wave/tool/build ;
 }

+# Make the boost-install rule visible in subprojects
+
 # 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, but --with and --without options, naturally, are
 # ignored.
 #
 # - libraries -- list of library targets to install.
-#
+
 rule boost-install ( libraries * )
 {
-    package.install install
-        : <dependency>/boost//install-proper-headers $(install-requirements)
-        : # No binaries
-        : $(libraries)
-        : # No headers, it is handled by the dependency.
-    ;
-
-    local stage-locate = [ option.get stagedir : $(BOOST_ROOT)/stage ] ;
-
-    install stage : $(libraries) : <location>$(stage-locate)/lib ;
-
-    module [ CALLER_MODULE ]
-    {
-        explicit stage ;
-        explicit install ;
-    }
+    boost-install.boost-install $(libraries) ;
 }

 # Creates a library target, adding autolink support and also creates
@@ -329,14 +323,6 @@ rule boost-lib ( name : sources * : requirements * : default-build * : usage-req
 }


-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).
-    [ 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 $(BOOST_ROOT)/boost/tr1/tr1 : * : bcc32 sun CVS .svn ]
-    ;
-
 # Declare special top-level targets that build and install the desired variants
 # of the libraries.
-boostcpp.declare-targets $(all-libraries) : $(headers) : $(all-headers) ;
+boostcpp.declare-targets $(all-libraries) ;
@@ -109,7 +109,16 @@ if $(layout) = system && $(build-type) = complete

 # Possible stage only location.
 stage-locate = [ option.get stagedir ] ;
-stage-locate ?= stage ;
+
+if $(stage-locate)
+{
+    stage-locate = [ path.root [ path.make $(stage-locate) ] [ path.pwd ] ] ;
+}
+else
+{
+    stage-locate = $(BOOST_ROOT)/stage ;
+}
+
 BOOST_STAGE_LOCATE = $(stage-locate) ;

 # Custom build ID.
@@ -213,9 +222,27 @@ rule tag ( name : type ? : property-set )
 rule python-tag ( name : type ? : property-set )
 {
    local result = $(name) ;
-    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB && $(PYTHON_ID)
+
+    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
    {
-        result = $(result)-$(PYTHON_ID) ;
+        # Add Python version suffix
+
+        local version = [ $(property-set).get <python> ] ;
+
+        local major-minor = [ MATCH "^([0-9]+)\.([0-9]+)" : $(version) ] ;
+        local suffix = $(major-minor:J="") ;
+
+        if $(suffix)
+        {
+            result = $(result)$(suffix) ;
+        }
+
+        # Add PYTHON_ID if supplied
+
+        if $(PYTHON_ID)
+        {
+            result = $(result)-$(PYTHON_ID) ;
+        }
    }

    # forward to the boost tagging rule
@@ -231,118 +258,14 @@ rule python-tag ( name : type ? : property-set )
 #
 ################################################################################

-rule filtered-target ( name : message + : sources + : requirements * )
-{
-    message $(name)-message : warning\: $(message) ;
-    alias $(name) : $(sources) : $(requirements) ;
-    alias $(name) : $(name)-message ;
-
-    local p = [ project.current ] ;
-    $(p).mark-target-as-explicit $(name) ;
-    $(p).mark-target-as-explicit $(name)-message ;
-}
-
-rule declare_install_and_stage_proper_targets ( libraries * : headers * : modular-headers * )
+rule declare_install_and_stage_proper_targets ( libraries * )
 {
    local p = [ project.current ] ;
-    for local l in $(libraries)
-    {
-        if $(l) = locale
-        {
-            filtered-target $(l)-for-install :
-                Skipping Boost.Locale library with threading=single. :
-                libs/$(l)/build : <threading>multi ;
-        }
-        else if $(l) = wave
-        {
-            filtered-target $(l)-for-install :
-                Skipping Boost.Wave library with threading=single. :
-                libs/$(l)/build : <threading>multi ;
-        }
-        else if $(l) = thread
-        {
-            filtered-target $(l)-for-install :
-                Skipping Boost.Thread library with threading=single. :
-                libs/$(l)/build : <threading>multi ;
-        }
-        else
-        {
-            alias $(l)-for-install : libs/$(l)/build ; 
-            $(p).mark-target-as-explicit $(l)-for-install ;
-        }
-    }
-    local library-targets = $(libraries)-for-install ;

-    local install-requirements ;
-
-    if $(layout-versioned)
-    {
-        install-requirements +=
-            <install-header-subdir>boost-$(BOOST_VERSION_TAG)/boost ;
-    }
-    else
-    {
-        install-requirements += <install-header-subdir>boost ;
-    }
-
-    if [ os.name ] = NT
-    {
-        install-requirements += <install-default-prefix>C:/Boost ;
-    }
-    else
-    {
-        install-requirements += <install-default-prefix>/usr/local ;
-    }
-
-    p = [ project.current ] ;
-
-    # These headers will be installed from the modular
-    # layout, and should be ignored in the global boost/
-    local skip-headers ;
-    # Install modular headers.
-    for local lib in $(modular-headers)
-    {
-        local header-root = $(BOOST_ROOT)/libs/$(lib)/include/boost ;
-        local lib-headers =
-            [ path.glob-tree $(header-root) : *.hpp *.ipp *.h *.inc *.SUNWCCh : CVS .svn ]
-            [ path.glob-tree $(header-root)/compatibility/cpp_c_headers : c* : CVS .svn ]
-            [ path.glob $(header-root)/tr1/tr1 : * : bcc32 sun CVS .svn ]
-        ;
-        skip-headers += [ sequence.transform path.relative-to [ path.make $(header-root) ] : $(lib-headers) ] ;
-        package.install install-$(lib)-headers
-            : <install-source-root>$(header-root)
-              $(install-requirements)
-              <install-no-version-symlinks>on
-            : # binaries
-            : # libraries
-            : $(lib-headers)
-            ;
-        $(p).mark-target-as-explicit install-$(lib)-headers ;
-    }
-
-    # Filter out headers that were created by b2 headers
-    local header-root = [ path.make $(BOOST_ROOT)/boost ] ;
-    headers = [ set.difference $(headers) : $(header-root)/$(skip-headers) ] ;
-
-    # Complete install.
-    package.install install-proper
-        :  <install-source-root>$(BOOST_ROOT)/boost
-           $(install-requirements)
-           <install-no-version-symlinks>on
-           
-        :
-        : $(libraries)-for-install
-        : $(headers)
-        ;
+    alias install-proper : libs/$(libraries)/build//install ;
    $(p).mark-target-as-explicit install-proper ;

-    # Install just library.
-    install stage-proper
-        : $(libraries)-for-install
-        : <location>$(stage-locate)/lib
-          <install-dependencies>on <install-type>LIB
-          <install-no-version-symlinks>on
-        ;
+    alias stage-proper : libs/$(libraries)/build//stage ;
    $(p).mark-target-as-explicit stage-proper ;
 }

@@ -488,13 +411,13 @@ class top-level-target : alias-target-class
    }
 }

-rule declare_top_level_targets ( libraries * : headers * : modular-headers * )
+rule declare_top_level_targets ( libraries * )
 {
-    declare_install_and_stage_proper_targets $(libraries) : $(headers) : $(modular-headers) ;
+    declare_install_and_stage_proper_targets $(libraries) ;

    targets.create-metatarget top-level-target : [ project.current ]
        : install
-        : install-$(modular-headers)-headers install-proper
+        : install-proper
        ;
    targets.create-metatarget top-level-target : [ project.current ]
        : stage
@@ -513,9 +436,6 @@ rule declare_top_level_targets ( libraries * : headers * : modular-headers * )
 }


-stage-abs = [ path.native [ path.root $(stage-locate)/lib [ path.pwd ] ] ] ;
-
-
 ################################################################################
 #
 # 4. Add hook to report configuration before the build, and confirmation with
@@ -542,7 +462,6 @@ rule pre-build ( )
 IMPORT $(__name__) : pre-build : : $(__name__).pre-build ;
 build-system.set-pre-build-hook $(__name__).pre-build ;

-# FIXME: Revise stage_abs.
 rule post-build ( ok ? )
 {
    if forward in [ modules.peek : top-level-targets ]
@@ -550,6 +469,8 @@ rule post-build ( ok ? )
        if $(ok)
        {
            local include-path = [ path.native $(BOOST_ROOT) ] ;
+            local stage-abs = [ path.native $(stage-locate)/lib ] ;
+
            ECHO "

 The Boost C++ Libraries were successfully built!
@@ -623,7 +544,7 @@ rule libraries-to-install ( existing-libs * )
    }
 }

-rule declare-targets ( all-libraries * : headers * : modular-headers * )
+rule declare-targets ( all-libraries * )
 {
    configure.register-components $(all-libraries) ;

@@ -641,7 +562,7 @@ rule declare-targets ( all-libraries * : headers * : modular-headers * )
        EXIT ;
    }

-    declare_top_level_targets $(libraries) : $(headers) : $(modular-headers) ;
+    declare_top_level_targets $(libraries) ;
 }

 # Returns the properties identifying the toolset. We'll use them
@@ -1,459 +0,0 @@
-# Boost.Build support specific for the Boost C++ Libraries.
-# Copyright Vladimir Prus 2002-2010.
-# Copyright Dave Abrahams 2005-2006.
-# Copyright Rene Rivera 2005-2007.
-# 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)
-
-import b2.util.option as option
-import b2.build.feature as feature
-import b2.build.virtual_target as virtual_target
-import b2.build.targets as targets
-import b2.build.property_set as property_set
-import b2.build_system as build_system
-import b2.build.configure as configure
-import b2.tools.stage as stage
-import b2.tools.package as package
-
-import b2.util.regex as regex
-import b2.util.set as set
-
-from b2.build.alias import AliasTarget, alias
-from b2.tools.message import message
-
-from b2.manager import get_manager
-from b2.util import bjam_signature, value_to_jam
-from b2.util.sequence import unique
-
-
-
-import sys
-import os
-
-# FIXME: temporary fix until I port the xsltproc module
-feature.feature("xsl:param", [], ["free"])
-
-
-##############################################################################
-# 
-# 0. General setup. Parse options, check them.
-#
-##############################################################################  
-
-BOOST_ROOT = get_manager().projects().loaded_tool_module_path_[__name__]
-
-print "HERE I AM"
-@bjam_signature((["version"],))
-def set_version(version):
-    global BOOST_VERSION, BOOST_VERSION_TAG
-
-    BOOST_VERSION = version
-    pieces = version.split(".")
-    if pieces[2] == "0":
-        pieces = pieces[0:2]
-
-
-    BOOST_VERSION_TAG = "_".join(pieces)
-
-# Option to choose how many variants to build. The default is "minimal".
-build_type = option.get("build-type", "minimal")
-if not build_type in ["minimal", "complete"]:
-    get_manager().errors()("The value of the --build-type option should be either 'complete' or 'minimal'")
-
-# What kind of layout are we doing?
-layout = option.get("layout")
-# On Windows, we used versioned layout by default in order to
-# be compatible with autolink. On other systems, we use system
-# layout which is what every other program uses. Note that windows
-# check is static, and won't 
-if not layout:
-    if os.name == "nt":
-        layout = "versioned"
-    else:
-        layout = "system"
-
-if layout == "system" and build_type == "complete":
-    get_manager().errors()(
-        "Cannot use --layout=system with --build-type complete.\n"
-        "Please used either --layout=versioned or --layout=tagged\n"
-        "if you wish to build multiple variants.")
-    
-# Possible stage only location.
-stage_locate = option.get("stagedir", "stage")
-BOOST_STAGE_LOCATE = stage_locate
-
-# Custom build ID.
-build_id = option.get("buildid")
-if build_id:
-    BUILD_ID = re.sub("[*\\/:.\"\' ]", "_", build_id)
-
-# Python build id (only for Python libraries)
-python_id = option.get("python-buildid")
-if python_id:
-    PYTHON_ID = re.sub("[*\\/:.\"\' ]", "_", python_id)
-
-##############################################################################
-#
-# 1. The 'tag' function that adds decoration suitable to the properties if
-# versioned or tagged layout is requested. This function is called from 
-# Jamroot
-#
-##############################################################################  
-
-def tag(name, type, ps):
-    if type in ["STATIC_LIB", "SHARED_LIB", "IMPORT_LIB"]:
-
-        pass
-
-
-    ##     FIXME
-    ##     if $(layout) = versioned
-    ##     {
-    ##         result = [ common.format-name
-    ##             <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG)
-    ##             -$(BUILD_ID)
-    ##             : $(name) : $(type) : $(property-set) ] ;
-    ##     }        
-    ##     else if $(layout) = tagged
-    ##     {
-    ##         result = [ common.format-name
-    ##             <base> <threading> <runtime>
-    ##             -$(BUILD_ID)
-    ##             : $(name) : $(type) : $(property-set) ] ;            
-    ##     }
-    ##     else if $(layout) = system
-    ##     {
-    ##         result = [ common.format-name
-    ##             <base> 
-    ##             -$(BUILD_ID)
-    ##             : $(name) : $(type) : $(property-set) ] ;
-    ##     }
-    ##     else
-    ##     {
-    ##         ECHO "error: invalid layout '$(layout:E=)'" ;
-    ##         EXIT ;               
-    ##     }
-                
-    ##     # Optionally add version suffix. On NT, library with version suffix
-    ##     # will not be recognized by linkers. On CYGWIN, we get strage
-    ##     # duplicate symbol errors when library is generated with version
-    ##     # suffix. On OSX, version suffix is not needed -- the linker expects
-    ##     # the libFoo.1.2.3.dylib format. AIX linkers do not accept version
-    ##     # suffixes either. Pgi compilers can not accept library with version
-    ##     # suffix.
-    ##     if $(type) = SHARED_LIB &&
-    ##       ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) &&
-    ##         ! ( [ $(property-set).get <toolset> ] in pgi ) )
-    ##     {
-    ##         result = $(result).$(BOOST_VERSION)  ;
-    ##     }
-
-    ##     return $(result) ;
-    ## }    
-
-
-##############################################################################
-#
-# 2. Declare targets that build and install all libraries. Specifically:
-#
-#    - 'stage-proper' that puts all libraries in stage/lib
-#    - 'install-proper' that install libraries and headers to system location
-#    - 'stage-unversioned' that creates links to libraries without boost veriosn
-#       in name
-#    - 'install-unversioned' which creates unversioned linked to installed
-#       libraries.
-#
-##############################################################################  
-
-# Worker function suitable to the 'generate' metatarget. Creates a link
-# to 'source', striping any version number from the name.
-def make_unversioned_links(project, name, ps, sources):
-
-    result = []
-    filtered = []
-    nt = os.name == "nt"
-
-    # Collect the libraries that have the version number in 'filtered'.
-    for s in sources:
-        if nt:
-            m = s.name().endswith(".lib")
-        else:
-            m = re.match("(.*[.]so[.0-9]+)" "(.*[.]dylib)" "(.*[.]a)", s.name())
-
-        if m:
-            filtered.append(s)
-
-    # Create links without version.
-    for s in filtered:
-        a = virtual_target.NonScanningAction(s, "symlink.ln", s.action().properties())
-        name = s.name()
-        
-        if nt:
-            m = re.match("(.*)-[0-9_]+(.*[.]lib)", name)
-        else:
-            m = re.match("(.*)-[0-9_]+(.*[.]so)[.0-9]*", name)
-            if not m:
-                m = re.match("(.*)-[0-9_]+(.*[.]dylib)", name)
-                if not m:
-                    m = re.match("(.*)-[0-9_]+(.*[.]a)", name)
-                    if not m:
-                        m = re.match("(.*)-[0-9_]+(.*[.]dll[.]a)", name)
-
-        new_name = m.group(1) + m.group(2)
-        result.append(virtual_target.FileTarget(new_name, s.type(), project, a,
-                                                exact=True))
-
-    return result
-
-def declare_install_and_stage_proper_targets(libraries, headers):
-
-    install_requirements = ["<install-source-root>" + BOOST_ROOT + "/boost"]
-    if layout == "versioned":
-        install_requirements.append("<install-header-subdir>boost-" + BOOST_VERSION_TAG + "/boost")
-    else:
-        install_requirements.append("<install-header-subdir>boost")
-
-    if os.name == "nt":
-        default_prefix = "C:/Boost"
-    else:
-        default_prefix = "/usr/local"
-        
-    install_requirements.append("<install-default-prefix>" + default_prefix)
-
-    p = get_manager().projects().current()
-    package.install("install-proper",
-                    install_requirements + ["<install-no-version-symlinks>on"],
-                    [],
-                    ["libs/%s/build" % l for l in libraries],
-                    headers)
-    p.mark_targets_as_explicit(["install-proper"])
-
-    stage.install("stage-proper",
-                  ["libs/%s/build" % l for l in libraries],
-                  ["<location>" + stage_locate + "/lib",
-                   "<install-dependencies>on", "<install-type>LIB",
-                   "<install-no-version-symlinks>on"])
-    p.mark_targets_as_explicit(["stage-proper"])
-
-    gr = value_to_jam(make_unversioned_links)
-    gr = "<generating-rule>" + gr
-
-    
-    if layout == "versioned":
-        generate("stage-unversioned", ["stage-proper"], [gr])    
-        generate("install-unversioned", ["install-proper"], [gr])
-    else:
-        # Create do-nothing aliases.
-        alias("stage-unversioned")
-        alias("install-unversioned")
-        
-    p.mark_targets_as_explicit(["stage-unversioned", "install-unversioned"])
-
-
-##############################################################################  
-#
-#  3. Declare top-level targets 'stage' and 'install'. These examine
-#  the --build-type option and, in case it's 'complete', build the
-#  'install-proper' and 'stage-proper' targets with a number of
-#  property sets.
-#
-##############################################################################  
-
-# The names of all top-level targets that were built.
-top_level_targets = []
-
-class TopLevelTarget(AliasTarget):
-
-    def __init__(self, name, project, sources, requirements, default_build,
-                 usage_requirements):
-
-        AliasTarget.__init__(self, name, project, sources, requirements, default_build,
-                             usage_requirements)
-
-        # On Linux, we build release variant by default, since few users will
-        # ever want to debug C++ Boost libraries, and there's no ABI
-        # incompatibility between debug and release variants. We build
-        # shared and static libraries since that's what most packages
-        # seem to provide (.so in libfoo and .a in libfoo-dev).
-        self.minimal_properties = property_set.create([
-            "<variant>release", "<threading>multi", "<link>shared", "<link>static",
-            "<runtime-link>shared"])
-        # On Windows, new IDE projects use:
-        #
-        #   runtime-link=dynamic, threading=multi, variant=(debug|release)
-        #
-        # and in addition, C++ Boost's autolink defaults to static linking.
-        self.minimal_properties_win = property_set.create([
-            "<variant>debug", "<variant>release", "<threading>multi", "<link>static",
-            "<runtime-link>shared"])
-
-        self.complete_properties = property_set.create([
-            "<variant>debug", "<variant>release",
-            "<threading>single", "<threading>multi"
-            "<link>shared", "<link>static",
-            "<runtime-link>shared", "<runtime-link>static"])
-
-    def generate(self, ps):
-        global top_level_targets
-        top_level_targets.append(self.name())
-
-        if build_type == "minimal":
-
-            os = ps.get('target-os')
-            # Because we completely override parent's 'generate'
-            # we need to check for default value of feature ourself.
-            if not os:
-                os = feature.get('target-os').default()
-
-            if os == "windows":
-                expanded = targets.apply_default_build(ps, self.minimal_properties_win)
-            else:
-                expanded = targets.apply_default_build(ps, self.minimal_properties)
-            return self.build_multiple(expanded)
-
-        elif build_type == "complete":
-
-            expanded = targets.apply_default_build(ps, self.complete_properties)
-            
-            # Filter inappopriate combinations
-            filtered = []
-            for p in expanded:
-
-                # See comment in handle-static-runtime regarding this logic.
-                if ps.get("link") == ["shared"] and p.get("runtime-link") == ["static"] \
-                   and p.get("toolset") != ["cw"]:
-                    # Skip this
-                    pass
-                else:
-                    filtered.append(p)
-                    
-            return build_multiple(filtered)
-
-        else:
-
-            get_manager().errors("Unknown build type")
-
-    def build_multiple(self, property_sets):
-
-        usage_requirements = property_set.empty()
-        result = []
-        for p in property_sets:
-            r = AliasTarget.generate(self, p)
-            if r:
-                usage_requirements = usage_requirements.add(r.usage_requirements())
-                result.extend(r.targets())
-
-        return targets.GenerateResult(usage_requirements, unique(result))
-
-    
-def declare_top_level_targets(libraries, headers):
-    
-    declare_install_and_stage_proper_targets(libraries, headers)
-
-    targets.create_metatarget(TopLevelTarget,
-                              "install",
-                              ["install-proper", "install-unversioned"])
-    targets.create_metatarget(TopLevelTarget,
-                              "stage",
-                              ["stage-proper", "stage-unversioned"])
-    
-    message("explain", "\nBuilding the Boost C++ Libraries.\n\n")
-
-    get_manager().projects().current().mark_targets_as_explicit(
-        ["install", "stage", "explain"])
-    
-    # This target is built by default, and will forward to 'stage'
-    # after producing some explanations.
-    targets.create_metatarget(TopLevelTarget,
-                              "forward",
-                              ["explain", "stage"])
-
-
-stage_abs = os.path.abspath(os.path.join(stage_locate, "lib"))
-
-##############################################################################
-#
-# 4. Add hook to report configuration before the build, and confirmation
-# with setup instructions after the build
-#
-##############################################################################  
-
-def pre_build():
-    if "stage" in top_level_targets or "install" in top_level_targets:
-        configure.print_component_configuration()
-
-build_system.add_pre_build_hook(pre_build)
-
-def post_build(ok):
-    if "forward" in top_level_targets and ok:
-        print """\n\nThe Boost C++ Libraries were successfully built!
-          
-The following directory should be added to compiler include paths:
-          
-    %s
-      
-The following directory should be added to linker library paths:
-      
-    %s
-""" % (BOOST_ROOT, stage_abs)
-
-build_system.set_post_build_hook(post_build)
-
-##############################################################################
-# 
-# 5. Top-level setup 
-#
-##############################################################################  
-
-
-def libraries_to_install(existing_libraries):
-    # Decides which libraries are to be installed by looking at --with-<library>
-    # --without-<library> arguments. Returns the list of directories under "libs"
-    # which must be built and installed.
-
-    with_parameter = regex.transform(sys.argv, "--with-(.*)")
-    without_parameter = regex.transform(sys.argv, "--without-(.*)")
-
-    if not with_parameter and not without_parameter:
-        # Nothing is specified on command line. See if maybe
-        # project-config.jam has some choices.
-        project_config_libs = bjam.call("peek", "project-config", "libraries")
-        with_parameter = regex.transform(project_config_libs, "--with-(.*)")
-        without_parameter = regex.transform(project_config_libs, "--without-(.*)")
-
-    # Do some checks.
-    if with_parameter and without_parameter:
-        get_manager().errors()("both --with-<library> and --without-<library> specified")
-
-    wrong = set.difference(with_parameter, existing_libraries)
-    if wrong:
-        get_manager().errors()("wrong library name '" + wrong[0] + "' in the --with-<library> option.")
-
-    wrong = set.difference(without_parameter, existing_libraries)
-    if wrong:
-        get_manager().errors()("wrong library name '" + wrong[0] + "' in the --without-<library> option.")
-
-    if with_parameter:
-        return set.intersection(existing_libraries, with_parameter)
-    else:
-        return set.difference(existing_libraries, without_parameter)
-
-def declare_targets(all_libraries, headers):
-  
-    configure.register_components(all_libraries)
-    
-    # Select the libraries to install.
-    libraries = libraries_to_install(all_libraries)
-    configure.components_building(libraries)
-
-    if option.get("show-libraries", None, True):
-
-        print "The following libraries require building:"
-        for l in libraries:
-            print "    - " + l
-        sys.exit(0)
-
-    declare_top_level_targets(libraries, headers)
@@ -52,7 +52,7 @@ IF "%1"=="vc14" SET TOOLSET=msvc : 14.0
 IF "%1"=="vc141" SET TOOLSET=msvc : 14.1

 ECHO.
-ECHO Generating Boost.Build configuration in project-config.jam for %TOOLSET%..."
+ECHO Generating Boost.Build configuration in project-config.jam for %TOOLSET%...
 ECHO # Boost.Build Configuration > project-config.jam
 ECHO # Automatically generated by bootstrap.bat >> project-config.jam
 ECHO. >> project-config.jam
@@ -82,7 +82,7 @@ ECHO     - Getting started guide:
 ECHO     http://boost.org/more/getting_started/windows.html
 ECHO.     
 ECHO     - Boost.Build documentation:
-ECHO     http://www.boost.org/build/doc/html/index.html
+ECHO     http://www.boost.org/build/
 ECHO.

 goto :end
@@ -412,6 +412,6 @@ Further information:
     http://www.boost.org/more/getting_started/unix-variants.html
     
   - Boost.Build documentation:
-     http://www.boost.org/build/doc/html/index.html
+     http://www.boost.org/build/

 EOF
@@ -1,5 +1,5 @@
 # Copyright (c) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
-# Copyright (c) 2016 Rene Rivera
+# Copyright (c) 2016-2018 Rene Rivera
 #
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at
@@ -24,7 +24,7 @@ import "class" : is-a ;

 path-constant BOOST_DOC : . ;

-local lib-docs = [ path.glob [ path.glob $(BOOST_DOC)/../libs : */doc ]
+local lib-docs = [ path.glob [ path.glob $(BOOST_DOC)/../libs $(BOOST_DOC)/../tools : */doc ]
    : [ modules.peek project : JAMFILE ] ] ;

 local rule find-target-of-class-or-type ( root-target : klass ? : type ? )
@@ -180,7 +180,6 @@ explicit libraries ;
 xinclude tools :
    ../tools/quickbook/doc//quickbook
    ../tools/boostbook/doc/boostbook.xml
-    ../tools/build/doc//boostdoc
    ;
 explicit tools ;

@@ -47,11 +47,11 @@ dynamic_bitset        Jeremy Siek <jeremy.siek -at- gmail.com>
 endian                Beman Dawes <bdawes -at- acm.org>
 exception             Emil Dotchevski <emil -at- revergestudios.com>
 fiber                 Oliver Kowalke <oliver.kowalke -at- gmail.com>
-filesystem            Beman Dawes <bdawes -at- acm.org>
+filesystem            Beman Dawes <bdawes -at- acm.org>, Andrey Semashev <andrey.semashev -at- gmail.com>
 flyweight             Joaquin M Lopez Munoz <joaquin.lopezmunoz -at- gmail.com>
 foreach               Eric Niebler <eric -at- boostpro.com>
 format                Samuel Krempp <krempp -at- crans.ens-cachan.fr>, James E. King III <jking -at- apache.org>
-function              Douglas Gregor <dgregor -at- cs.indiana.edu>
+function              Peter Dimov <pdimov -at- pdimov.com>
 function_types        Tobias Schwinger <tschwinger -at- isonews2.com>
 functional
 functional/factory    Tobias Schwinger <tschwinger -at- isonews2.com>
@@ -60,14 +60,14 @@ functional/hash       Daniel James <dnljms -at- gmail.com>
 functional/overloaded_function  Lorenzo Caminiti <lorcaminiti -at- gmail.com>
 fusion                Joel de Guzman <joel -at- boost-consulting.com>, Dan Marsden <danmarsden -at- yahoo.co.uk>, Tobias Schwinger <tschwinger -at- isonews2.com>
 geometry              Barend Gehrels <barend -at- xs4all.nl>, Bruno Lalande <bruno.lalande -at- gmail.com>, Mateusz Loskot <mateusz -at- loskot.net>, Adam Wulkiewicz <adam.wulkiewicz -at- gmail.com>
-gil                   Stefan Seefeld <stefan -at- seefeld.name>
+gil                   Stefan Seefeld <stefan -at- seefeld.name>, Mateusz Loskot <mateusz -at- loskot.net>
 graph                 K. Noel Belcourt <kbelco -at- sandia.gov>
 graph_parallel        K. Noel Belcourt <kbelco -at- sandia.gov>
 hana                  Louis Dionne <ldionne.2 -at- gmail.com>
 heap                  Tim Blechmann <tim -at- klingt.org>
 hof                   Paul Fultz II <pfultz2 -at- yahoo.com>
 icl                   Joachim Faulhaber <afojgo -at- gmail.com>
-integer               Daryle Walker <darylew -at- hotmail.com>
+integer               Daryle Walker <darylew -at- hotmail.com>, Andrey Semashev <andrey.semashev -at- gmail.com>
 interprocess          Ion Gaztanaga <igaztanaga -at- gmail.com>
 intrusive             Ion Gaztanaga <igaztanaga -at- gmail.com>
 io                    Daryle Walker <darylew -at- hotmail.com>
@@ -133,7 +133,7 @@ statechart            Andreas Huber <ahd6974-boostorg -at- yahoo.com>
 static_assert         John Maddock <john -at- johnmaddock.co.uk>
 sync                  Tim Blechmann <tim -at- klingt.org>, Andrey Semashev <andrey.semashev -at- gmail.com>, Vicente J. Botet Escriba <vicente.botet -at- wanadoo.fr>
 test                  Gennadiy Rozental <rogeeff -at- gmail.com>, Raffi Enficiaud <raffi.enficiaud -at- free.fr>
-thread                Vicente J. Botet Escriba <vicente.botet -at- wanadoo.fr>, Niall Douglas <niall -at- nedprod.com>
+thread                Vicente J. Botet Escriba <vicente.botet -at- wanadoo.fr>
 throw_exception       Emil Dotchevski <emil -at- revergestudios.com>
 timer                 Beman Dawes <bdawes -at- acm.org>
 tokenizer             John R. Bandela <jbandela -at- ufl.edu>
--- a/Show More
+++ b/Show More