Fix conditions to have the correct return code

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: djarek/boost_superproject_build:doxygen1.8.15
+      - image: djarek/boost_superproject_build
     parallelism: 2
     steps:
       - checkout

.gitmodules

@@ -88,6 +88,11 @@
 	url = ../io.git
 	fetchRecurseSubmodules = on-demand
 	branch = .
+[submodule "disjoint_sets"]
+	path = libs/disjoint_sets
+	url = ../disjoint_sets.git
+	fetchRecurseSubmodules = on-demand
+	branch = .
 [submodule "units"]
 	path = libs/units
 	url = ../units.git
@@ -733,8 +738,3 @@
 	url = ../histogram.git
 	fetchRecurseSubmodules = on-demand
 	branch = .
-[submodule "variant2"]
-	path = libs/variant2
-	url = ../variant2.git
-	fetchRecurseSubmodules = on-demand
-	branch = .

.travis.yml

@@ -11,7 +11,7 @@ branches:
     - develop
     - /feature\/.*/
 
-dist: xenial
+dist: trusty
 
 language: cpp
 
@@ -23,7 +23,6 @@ addons:
       - p7zip-full
       - docutils-common
       - docutils-doc
-      - python-docutils
       - docbook
       - docbook-xml
       - docbook-xsl
@@ -51,9 +50,6 @@ matrix:
     # Simple integrated status tests check.
     - env: SCRIPT=ci_boost_status
 
-    # Same, but using release layout
-    - env: SCRIPT=ci_boost_status RELEASE=1
-
     # Run 'quick' tests.
     - env: SCRIPT=ci_boost_status TARGET=quick TOOLSET=gcc CXXSTD=03,11
       compiler: g++
@@ -65,17 +61,13 @@ matrix:
     - env: SCRIPT=ci_boost_build TOOLSET=gcc CXXSTD=11
       compiler: g++
 
-    # Build Boost with release layout
-    - env: SCRIPT=ci_boost_build TOOLSET=gcc CXXSTD=11 RELEASE=1
+    # Run tests for the library updated by this commit.
+    - env: SCRIPT=ci_boost_test_library TOOLSET=gcc CXXSTD=11
       compiler: g++
 
-#    # Run tests for the library updated by this commit.
-#    - env: SCRIPT=ci_boost_test_library TOOLSET=gcc CXXSTD=11
-#      compiler: g++
-#
-#    - env: SCRIPT=ci_boost_test_library TOOLSET=clang CXXSTD=11
-#      compiler: clang++
-#
+    - env: SCRIPT=ci_boost_test_library TOOLSET=clang CXXSTD=11
+      compiler: clang++
+
 #    # Library requirements tests.
 #    - env: SCRIPT=ci_boost_library_check
 #

Jamroot

@@ -140,11 +140,10 @@ import "class" : new ;
 import property-set ;
 import threadapi-feature ;
 import option ;
-# Backslash because of `bcp --namespace`
-import tools/boost\_install/boost-install ;
+import tools/boost_install/boost-install ;
 
 path-constant BOOST_ROOT : . ;
-constant BOOST_VERSION : 1.72.0 ;
+constant BOOST_VERSION : 1.70.0 ;
 constant BOOST_JAMROOT_MODULE : $(__name__) ;
 
 boostcpp.set-version $(BOOST_VERSION) ;
@@ -303,17 +302,17 @@ if [ path.exists $(BOOST_ROOT)/libs/wave/tool/build ]
 #
 # - libraries -- list of library targets to install.
 
-rule boost-install ( libraries * : requirements ? )
+rule boost-install ( libraries * )
 {
-    boost-install.boost-install $(libraries) : $(requirements) ;
+    boost-install.boost-install $(libraries) ;
 }
 
 # Creates a library target, adding autolink support and also creates
 # stage and install targets via boost-install, above.
 rule boost-lib ( name : sources * : requirements * : default-build * : usage-requirements * )
 {
-    autolink = <link>shared:<define>BOOST_$(name:U)_DYN_LINK=1 ;
     name = boost_$(name) ;
+    autolink = <link>shared:<define>$(name:U)_DYN_LINK=1 ;
     lib $(name)
         : $(sources)
         : $(requirements) $(autolink)

README.md

@@ -1,11 +0,0 @@
-# Boost C++ Libraries
-
-The Boost project provides free peer-reviewed portable C++ source libraries.
-
-We emphasize libraries that work well with the C++ Standard Library. Boost
-libraries are intended to be widely useful, and usable across a broad spectrum
-of applications. The Boost license encourages both commercial and non-commercial use
-and does not require attribution for binary use.
-
-The project website is www.boost.org, where you can obtain more information and
-[download](https://www.boost.org/users/download/) the current release.

boostcpp.jam

@@ -607,7 +607,7 @@ rule address-model ( )
     return <conditional>@boostcpp.deduce-address-model ;
 }
 
-local deducable-architectures = arm mips1 power riscv s390x sparc x86 combined ;
+local deducable-architectures = arm mips1 power sparc x86 combined ;
 feature.feature deduced-architecture : $(deducable-architectures) : propagated optional composite hidden ;
 for a in $(deducable-architectures)
 {
@@ -618,13 +618,11 @@ rule deduce-architecture ( properties * )
 {
     local result ;
     local filtered = [ toolset-properties $(properties) ] ;
-    local names = arm mips1 power riscv s390x sparc x86 combined ;
+    local names = arm mips1 power sparc x86 combined ;
     local idx = [ configure.find-builds "default architecture" : $(filtered)
         : /boost/architecture//arm
         : /boost/architecture//mips1
         : /boost/architecture//power
-        : /boost/architecture//riscv
-        : /boost/architecture//s390x
         : /boost/architecture//sparc
         : /boost/architecture//x86
         : /boost/architecture//combined ] ;

bootstrap.bat

@@ -2,14 +2,16 @@
 
 SETLOCAL
 
-REM Copyright 2019 Rene Rivera
 REM Copyright (C) 2009 Vladimir Prus
 REM
 REM Distributed under the Boost Software License, Version 1.0.
 REM (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
 
 ECHO Building Boost.Build engine
-if exist ".\tools\build\src\engine\b2.exe" del tools\build\src\engine\b2.exe
+if exist ".\tools\build\src\engine\bin.ntx86\b2.exe" del tools\build\src\engine\bin.ntx86\b2.exe
+if exist ".\tools\build\src\engine\bin.ntx86\bjam.exe" del tools\build\src\engine\bin.ntx86\bjam.exe
+if exist ".\tools\build\src\engine\bin.ntx86_64\b2.exe" del tools\build\src\engine\bin.ntx86_64\b2.exe
+if exist ".\tools\build\src\engine\bin.ntx86_64\bjam.exe" del tools\build\src\engine\bin.ntx86_64\bjam.exe
 pushd tools\build\src\engine
 
 call .\build.bat %* > ..\..\..\..\bootstrap.log
@@ -17,8 +19,14 @@ call .\build.bat %* > ..\..\..\..\bootstrap.log
 
 popd
 
-if exist ".\tools\build\src\engine\b2.exe" (
-   copy .\tools\build\src\engine\b2.exe . > nul
+if exist ".\tools\build\src\engine\bin.ntx86\bjam.exe" (
+   copy .\tools\build\src\engine\bin.ntx86\b2.exe . > nul
+   copy .\tools\build\src\engine\bin.ntx86\bjam.exe . > nul
+   goto :bjam_built)
+
+if exist ".\tools\build\src\engine\bin.ntx86_64\bjam.exe" (
+   copy .\tools\build\src\engine\bin.ntx86_64\b2.exe . > nul
+   copy .\tools\build\src\engine\bin.ntx86_64\bjam.exe . > nul
    goto :bjam_built)
 
 goto :bjam_failure
@@ -42,7 +50,6 @@ IF "%1"=="vc11" SET TOOLSET=msvc : 11.0
 IF "%1"=="vc12" SET TOOLSET=msvc : 12.0
 IF "%1"=="vc14" SET TOOLSET=msvc : 14.0
 IF "%1"=="vc141" SET TOOLSET=msvc : 14.1
-IF "%1"=="vc142" SET TOOLSET=msvc : 14.2
 
 ECHO.
 ECHO Generating Boost.Build configuration in project-config.jam for %TOOLSET%...

bootstrap.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-# Copyright 2019 Rene Rivera
 # Copyright (C) 2005, 2006 Douglas Gregor.
 # Copyright (C) 2006 The Trustees of Indiana University
 #
@@ -195,7 +194,7 @@ my_dir=$(dirname "$0")
 if test "x$TOOLSET" = x; then
   guessed_toolset=`$my_dir/tools/build/src/engine/build.sh --guess-toolset`
   case $guessed_toolset in
-    acc | clang | gcc | como | mipspro | pathscale | pgi | qcc | vacpp )
+    acc | darwin | gcc | como | mipspro | pathscale | pgi | qcc | vacpp )
     TOOLSET=$guessed_toolset
     ;;
     
@@ -231,9 +230,11 @@ if test "x$BJAM" = x; then
       exit 1
   fi
   cd "$pwd"
-  BJAM="$my_dir/tools/build/src/engine/b2"
-  echo "tools/build/src/engine/b2"
+  arch=`cd $my_dir/tools/build/src/engine && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..`
+  BJAM="$my_dir/tools/build/src/engine/$arch/b2"
+  echo "tools/build/src/engine/$arch/b2"
   cp "$BJAM" .
+  cp "$my_dir/tools/build/src/engine/$arch/bjam" .
 
 fi
 

doc/pdf/Jamfile.v2

@@ -77,6 +77,7 @@ install pdf-install
     ../../libs/ratio/doc//standalone
     ../../libs/random/doc//standalone
     ../../libs/regex/doc//standalone
+    ../../libs/signals/doc//doc
     ../../libs/spirit/repository/doc//spirit2_repository
     ../../libs/static_assert/doc//standalone
     ../../libs/thread/doc//standalone

libs/libraries.htm

@@ -90,9 +90,6 @@ how to download, build, and install the libraries.</p>
         from Nicolai Josuttis.  Removed in Boost version 1.32.
         Please use <a href="bind/bind.html">Bind</a> or <a
         href="lambda/index.html">Lambda</a> instead.</li>
-    <li>signals (v1) - Managed signals and slots callback implementation, from
-        Doug Gregor. Removed in Boost version 1.69. Please use
-        <a href="signals2/index.html">Signals2</a> instead.</li>
 </ul>
 
 <hr>

libs/maintainers.txt

@@ -54,20 +54,18 @@ format                Samuel Krempp <krempp -at- crans.ens-cachan.fr>, James E.
 function              Peter Dimov <pdimov -at- pdimov.com>
 function_types        Tobias Schwinger <tschwinger -at- isonews2.com>
 functional
-functional/factory    Glen Fernandes <glenjofe -at- gmail.com>, Tobias Schwinger <tschwinger -at- isonews2.com>
+functional/factory    Tobias Schwinger <tschwinger -at- isonews2.com>
 functional/forward    Tobias Schwinger <tschwinger -at- isonews2.com>
 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>
-geometry/extensions   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>
-geometry/index        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>, 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>
-histogram             Hans Dembinski <hans.dembinski -at- gmail.com>
+histogram             Hans Dembinski <hans.dembinski@gmail.com>
 hof                   Paul Fultz II <pfultz2 -at- yahoo.com>
 icl                   Joachim Faulhaber <afojgo -at- gmail.com>
 integer               Daryle Walker <darylew -at- hotmail.com>, Andrey Semashev <andrey.semashev -at- gmail.com>
@@ -153,13 +151,10 @@ unordered             Daniel James <dnljms -at- gmail.com>
 utility
 utility/enable_if     Jaakko Jarvi <jarvi -at- cs.tamu.edu>, Jeremiah Willcock <jewillco -at- osl.iu.edu>
 utility/identity_type Lorenzo Caminiti <lorcaminiti -at- gmail.com>
-utility/ostream_string  Glen Fernandes <glenjofe -at- gmail.com>
 utility/result_of     Daniel Walker <daniel.j.walker -at- gmail.com>
-utility/string_ref    Marshall Clow <marshall -at- idio.com>
 utility/swap          Joseph Gauterin <joseph.gauterin -at- googlemail.com>
 uuid                  Andy Tompkins <atompkins -at- fastmail.fm>, James E. King III <jking -at- apache.org>
 variant               Antony Polukhin <antoshkka -at- gmail.com>, Eric Friedman <ericbrandon -at- gmail.com>
-variant2              Peter Dimov <pdimov -at- pdimov.com>
 vmd                   Edward Diener <eld -at- tropicsoft.com>
 wave                  Hartmut Kaiser <hartmut.kaiser -at- gmail.com>
 winapi                Andrey Semashev <andrey.semashev -at- gmail.com>