Add a requirements parameter to boost-install

Update histogram from develop
Update log from develop
2019-10-23 02:58:18 +03:00 · 2019-10-22 22:45:02 +00:00 · 2019-10-22 17:15:02 +00:00 · 2019-10-22 16:00:39 +00:00 · 2019-10-22 15:30:02 +00:00 · 2019-10-22 15:15:02 +00:00
143 changed files with 277 additions and 307 deletions
@@ -0,0 +1,14 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: djarek/boost_superproject_build:doxygen1.8.15
+    parallelism: 2
+    steps:
+      - checkout
+      - run: wget "https://raw.githubusercontent.com/boostorg/release-tools/develop/ci_boost_common.py" -P ${HOME}
+      - run: wget "https://raw.githubusercontent.com/boostorg/release-tools/develop/ci_boost_release.py" -P ${HOME}
+      - run: python ${HOME}/ci_boost_release.py checkout_post
+      - run: python ${HOME}/ci_boost_release.py dependencies_override
+      - run: '[ "$CIRCLE_NODE_INDEX" != "0" ] || EOL=LF python ${HOME}/ci_boost_release.py test_override'
+      - run: '[ "$CIRCLE_NODE_INDEX" != "1" ] || EOL=CRLF python ${HOME}/ci_boost_release.py test_override'
@@ -88,11 +88,6 @@
 	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
@@ -738,3 +733,8 @@
 	url = ../histogram.git
 	fetchRecurseSubmodules = on-demand
 	branch = .
+[submodule "variant2"]
+	path = libs/variant2
+	url = ../variant2.git
+	fetchRecurseSubmodules = on-demand
+	branch = .
@@ -11,7 +11,7 @@ branches:
    - develop
    - /feature\/.*/

-dist: trusty
+dist: xenial

 language: cpp

@@ -51,6 +51,9 @@ 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++
@@ -62,13 +65,17 @@ matrix:
    - env: SCRIPT=ci_boost_build 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
+    # Build Boost with release layout
+    - env: SCRIPT=ci_boost_build TOOLSET=gcc CXXSTD=11 RELEASE=1
      compiler: g++

-    - env: SCRIPT=ci_boost_test_library TOOLSET=clang CXXSTD=11
-      compiler: clang++
-
+#    # 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++
+#
 #    # Library requirements tests.
 #    - env: SCRIPT=ci_boost_library_check
 #
@@ -140,10 +140,11 @@ import "class" : new ;
 import property-set ;
 import threadapi-feature ;
 import option ;
-import tools/boost_install/boost-install ;
+# Backslash because of `bcp --namespace`
+import tools/boost\_install/boost-install ;

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

 boostcpp.set-version $(BOOST_VERSION) ;
@@ -302,17 +303,17 @@ if [ path.exists $(BOOST_ROOT)/libs/wave/tool/build ]
 #
 # - libraries -- list of library targets to install.

-rule boost-install ( libraries * )
+rule boost-install ( libraries * : requirements ? )
 {
-    boost-install.boost-install $(libraries) ;
+    boost-install.boost-install $(libraries) : $(requirements) ;
 }

 # 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)
@@ -0,0 +1,11 @@
+# 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.
@@ -607,7 +607,7 @@ rule address-model ( )
    return <conditional>@boostcpp.deduce-address-model ;
 }

-local deducable-architectures = arm mips1 power sparc x86 combined ;
+local deducable-architectures = arm mips1 power riscv s390x sparc x86 combined ;
 feature.feature deduced-architecture : $(deducable-architectures) : propagated optional composite hidden ;
 for a in $(deducable-architectures)
 {
@@ -618,11 +618,13 @@ rule deduce-architecture ( properties * )
 {
    local result ;
    local filtered = [ toolset-properties $(properties) ] ;
-    local names = arm mips1 power sparc x86 combined ;
+    local names = arm mips1 power riscv s390x 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 ] ;
@@ -2,16 +2,14 @@

 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\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
+if exist ".\tools\build\src\engine\b2.exe" del tools\build\src\engine\b2.exe
 pushd tools\build\src\engine

 call .\build.bat %* > ..\..\..\..\bootstrap.log
@@ -19,14 +17,8 @@ call .\build.bat %* > ..\..\..\..\bootstrap.log

 popd

-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
+if exist ".\tools\build\src\engine\b2.exe" (
+   copy .\tools\build\src\engine\b2.exe . > nul
   goto :bjam_built)

 goto :bjam_failure
@@ -50,6 +42,7 @@ 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%...
@@ -1,4 +1,5 @@
 #!/bin/sh
+# Copyright 2019 Rene Rivera
 # Copyright (C) 2005, 2006 Douglas Gregor.
 # Copyright (C) 2006 The Trustees of Indiana University
 #
@@ -194,7 +195,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 | darwin | gcc | como | mipspro | pathscale | pgi | qcc | vacpp )
+    acc | clang | gcc | como | mipspro | pathscale | pgi | qcc | vacpp )
    TOOLSET=$guessed_toolset
    ;;
    
@@ -230,11 +231,9 @@ if test "x$BJAM" = x; then
      exit 1
  fi
  cd "$pwd"
-  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"
+  BJAM="$my_dir/tools/build/src/engine/b2"
+  echo "tools/build/src/engine/b2"
  cp "$BJAM" .
-  cp "$my_dir/tools/build/src/engine/$arch/bjam" .

 fi

@@ -1,54 +0,0 @@
-# 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 Rene Rivera 2015-2016.
-
-machine:
-  environment:
-    SCRIPT_N: ci_boost_release ci_boost_release
-    EOL_N: LF CRLF
-  pre:
-    - |
-        wget "https://raw.githubusercontent.com/boostorg/release-tools/develop/ci_boost_common.py" -P ${HOME}
-        wget "https://raw.githubusercontent.com/boostorg/release-tools/develop/ci_boost_library_check.py" -P ${HOME}
-        wget "https://raw.githubusercontent.com/boostorg/release-tools/develop/ci_boost_release.py" -P ${HOME}
-        wget "https://raw.githubusercontent.com/boostorg/release-tools/develop/ci_boost_status.py" -P ${HOME}
-        echo '#!/bin/bash' > ${HOME}/script.sh
-        echo 'export SCRIPT_N=(${SCRIPT_N})' >> "${HOME}/script.sh"
-        echo 'export SCRIPT=${SCRIPT_N[$CIRCLE_NODE_INDEX]}' >> "${HOME}/script.sh"
-        echo 'export EOL_N=(${EOL_N})' >> "${HOME}/script.sh"
-        echo 'export EOL=${EOL_N[$CIRCLE_NODE_INDEX]}' >> "${HOME}/script.sh"
-        echo 'python "${HOME}/${SCRIPT}.py" "$@"' >> "${HOME}/script.sh"
-        chmod +x "${HOME}/script.sh"
-  post:
-    - sudo apt-get update
-    - sudo apt-get install xsltproc
-    - exec "${HOME}/script.sh" machine_post
-checkout:
-  post:
-    - exec "${HOME}/script.sh" checkout_post
-dependencies:
-  pre:
-    - exec "${HOME}/script.sh" dependencies_pre
-  override:
-    - exec "${HOME}/script.sh" dependencies_override
-  post:
-    - exec "${HOME}/script.sh" dependencies_post
-database:
-  pre:
-    - exec "${HOME}/script.sh" database_pre
-  override:
-    - exec "${HOME}/script.sh" database_override
-  post:
-    - exec "${HOME}/script.sh" database_post
-test:
-  pre:
-    - exec "${HOME}/script.sh" test_pre:
-        parallel: true
-  override:
-    - exec "${HOME}/script.sh" test_override:
-        parallel: true
-  post:
-    - exec "${HOME}/script.sh" test_post:
-        parallel: true
@@ -77,7 +77,6 @@ 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
@@ -90,6 +90,9 @@ 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>
@@ -54,18 +54,20 @@ 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    Tobias Schwinger <tschwinger -at- isonews2.com>
+functional/factory    Glen Fernandes <glenjofe -at- gmail.com>, 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@gmail.com>
+histogram             Hans Dembinski <hans.dembinski -at- 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>
@@ -151,10 +153,13 @@ 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>