Add support for modular build structure.

.github/workflows/ci.yml

@@ -17,48 +17,63 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - toolset: gcc-4.8
+          - toolset: gcc
+            compiler: g++-4.8
             cxxstd: "11"
             os: ubuntu-latest
             container: ubuntu:18.04
             install: g++-4.8
-          - toolset: gcc-5
+          - toolset: gcc
+            compiler: g++-5
             cxxstd: "11,14,1z"
             os: ubuntu-latest
             container: ubuntu:18.04
             install: g++-5
-          - toolset: gcc-6
+          - toolset: gcc
+            compiler: g++-6
             cxxstd: "11,14,1z"
             os: ubuntu-latest
             container: ubuntu:18.04
             install: g++-6
-          - toolset: gcc-7
+          - toolset: gcc
+            compiler: g++-7
             cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu:20.04
             install: g++-7
-          - toolset: gcc-8
+          - toolset: gcc
+            compiler: g++-8
             cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu:20.04
             install: g++-8
-          - toolset: gcc-9
+          - toolset: gcc
+            compiler: g++-9
             cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
-          - toolset: gcc-10
+            os: ubuntu-latest
+            container: ubuntu:20.04
+          - toolset: gcc
+            compiler: g++-10
             cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu:20.04
             install: g++-10
-          - toolset: gcc-11
+          - toolset: gcc
+            compiler: g++-11
             cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu:24.04
             install: g++-11
-          - toolset: gcc-12
+          - toolset: gcc
+            compiler: g++-12
             cxxstd: "11,14,17,20,2b"
             os: ubuntu-22.04
             install: g++-12
-          - toolset: gcc-13
+          - toolset: gcc
+            compiler: g++-13
             cxxstd: "11,14,17,20,2b"
             os: ubuntu-latest
-            container: ubuntu:23.04
+            container: ubuntu:24.04
             install: g++-13
           - toolset: clang
             compiler: clang++-3.9
@@ -81,37 +96,44 @@ jobs:
           - toolset: clang
             compiler: clang++-6.0
             cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu:20.04
             install: clang-6.0
           - toolset: clang
             compiler: clang++-7
             cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu:20.04
             install: clang-7
           - toolset: clang
             compiler: clang++-8
             cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu:20.04
             install: clang-8
           - toolset: clang
             compiler: clang++-9
             cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu:20.04
             install: clang-9
           - toolset: clang
             compiler: clang++-10
             cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu:20.04
             install: clang-10
           - toolset: clang
             compiler: clang++-11
             cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu:20.04
             install: clang-11
           - toolset: clang
             compiler: clang++-12
             cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu:20.04
             install: clang-12
           - toolset: clang
             compiler: clang++-13
@@ -131,39 +153,49 @@ jobs:
           - toolset: clang
             compiler: clang++-16
             cxxstd: "11,14,17,20,2b"
-            os: ubuntu-latest
-            container: ubuntu:23.04
+            os: ubuntu-24.04
             install: clang-16
           - toolset: clang
-            cxxstd: "11,14,17,2a"
-            os: macos-11
+            cxxstd: "11,14,17,20,2b"
+            os: macos-13
           - toolset: clang
             cxxstd: "11,14,17,20,2b"
-            os: macos-12
+            os: macos-14
           - toolset: clang
             cxxstd: "11,14,17,20,2b"
-            os: macos-13
+            os: macos-15
 
     runs-on: ${{matrix.os}}
-    container: ${{matrix.container}}
+    container:
+      image: ${{matrix.container}}
+      volumes:
+        - /node20217:/node20217:rw,rshared
+        - ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }}
 
     defaults:
       run:
         shell: bash
 
     steps:
-      - uses: actions/checkout@v3
-
       - name: Setup container environment
         if: matrix.container
         run: |
           apt-get update
-          apt-get -y install sudo python3 git g++
+          apt-get -y install sudo python3 git g++ curl xz-utils
+
+      - name: Install nodejs20glibc2.17
+        if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }}
+        run: |
+          curl -LO https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz
+          tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
+          ldd /__e/node20/bin/node
 
       - name: Install packages
         if: matrix.install
         run: sudo apt-get -y install ${{matrix.install}}
 
+      - uses: actions/checkout@v3
+
       - name: Setup Boost
         run: |
           echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY

build.jam

@@ -0,0 +1,41 @@
+# Copyright René Ferdinand Rivera Morell 2023-2024
+# 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)
+
+require-b2 5.2 ;
+
+constant boost_dependencies :
+    /boost/array//boost_array
+    /boost/assert//boost_assert
+    /boost/circular_buffer//boost_circular_buffer
+    /boost/concept_check//boost_concept_check
+    /boost/config//boost_config
+    /boost/core//boost_core
+    /boost/fusion//boost_fusion
+    /boost/iterator//boost_iterator
+    /boost/mpl//boost_mpl
+    /boost/numeric_conversion//boost_numeric_conversion
+    /boost/ublas//boost_ublas
+    /boost/parameter//boost_parameter
+    /boost/preprocessor//boost_preprocessor
+    /boost/range//boost_range
+    /boost/serialization//boost_serialization
+    /boost/static_assert//boost_static_assert
+    /boost/throw_exception//boost_throw_exception
+    /boost/tuple//boost_tuple
+    /boost/type_traits//boost_type_traits
+    /boost/typeof//boost_typeof ;
+
+project /boost/accumulators
+    ;
+
+explicit
+    [ alias boost_accumulators : : :
+        : <include>include <library>$(boost_dependencies) ]
+    [ alias all : boost_accumulators example test ]
+    ;
+
+call-if : boost-library accumulators
+    ;
+

doc/Jamfile.v2

@@ -52,8 +52,8 @@ else
 # features shows the dependency relationships between them.
 doxygen tagfile
     :
-        ../../../boost/accumulators/framework/depends_on.hpp
-        ../../../boost/accumulators/framework/extractor.hpp
+        ../include/boost/accumulators/framework/depends_on.hpp
+        ../include/boost/accumulators/framework/extractor.hpp
     :
         <doxygen:param>MACRO_EXPANSION=YES
         <doxygen:param>EXPAND_ONLY_PREDEF=YES
@@ -68,10 +68,10 @@ doxygen tagfile
 
 doxygen accdoc
     :
-        [ glob ../../../boost/accumulators/accumulators*.hpp ]
-        [ glob ../../../boost/accumulators/framework/*.hpp ]
-        [ glob ../../../boost/accumulators/framework/parameters/*.hpp ]
-        [ glob ../../../boost/accumulators/framework/accumulators/*.hpp ]
+        [ glob ../include/boost/accumulators/accumulators*.hpp ]
+        [ glob ../include/boost/accumulators/framework/*.hpp ]
+        [ glob ../include/boost/accumulators/framework/parameters/*.hpp ]
+        [ glob ../include/boost/accumulators/framework/accumulators/*.hpp ]
     :
         <doxygen:param>EXTRACT_ALL=YES
         <doxygen:param>"PREDEFINED=\"BOOST_ACCUMULATORS_DOXYGEN_INVOKED=1\" \\
@@ -97,9 +97,9 @@ doxygen accdoc
 # generate .png images for the LaTeX formulas embedded in the doc comments.
 doxygen statsdoc.html
     :
-        [ glob ../../../boost/accumulators/statistics*.hpp ]
-        [ glob ../../../boost/accumulators/statistics/*.hpp ]
-        [ glob ../../../boost/accumulators/statistics/variates/*.hpp ]
+        [ glob ../include/boost/accumulators/statistics*.hpp ]
+        [ glob ../include/boost/accumulators/statistics/*.hpp ]
+        [ glob ../include/boost/accumulators/statistics/variates/*.hpp ]
     :
         <dependency>latex.check
         <dependency>dvips.check
@@ -141,9 +141,9 @@ make statsdoclatex.tag
 
 doxygen statsdoc
     :
-        [ glob ../../../boost/accumulators/statistics*.hpp ]
-        [ glob ../../../boost/accumulators/statistics/*.hpp ]
-        [ glob ../../../boost/accumulators/statistics/variates/*.hpp ]
+        [ glob ../include/boost/accumulators/statistics*.hpp ]
+        [ glob ../include/boost/accumulators/statistics/*.hpp ]
+        [ glob ../include/boost/accumulators/statistics/variates/*.hpp ]
     :
         <doxygen:param>EXTRACT_ALL=YES
         <doxygen:param>"PREDEFINED=\"BOOST_ACCUMULATORS_DOXYGEN_INVOKED=1\" \\
@@ -171,8 +171,8 @@ doxygen statsdoc
 
 doxygen opdoc
     :
-        [ glob ../../../boost/accumulators/numeric/functional.hpp ]
-        [ glob ../../../boost/accumulators/numeric/functional/*.hpp ]
+        [ glob ../include/boost/accumulators/numeric/functional.hpp ]
+        [ glob ../include/boost/accumulators/numeric/functional/*.hpp ]
     :
         <doxygen:param>EXTRACT_ALL=YES
         <doxygen:param>"PREDEFINED=\"BOOST_NUMERIC_FUNCTIONAL_DOXYGEN_INVOKED=1\" \\

example/Jamfile.v2

@@ -6,8 +6,8 @@ exe example
     :
         main.cpp
     :
-        <include>../../..
-        <include>$(BOOST_ROOT)
-        <library>/boost/serialization
-        <cxxflags>"-Wno-deprecated-declarations"
+        <library>/boost/accumulators//boost_accumulators
+        <library>/boost/foreach//boost_foreach
+        <toolset>gcc:<cxxflags>"-Wno-deprecated-declarations"
+        <toolset>clang:<cxxflags>"-Wno-deprecated-declarations"
     ;

test/Jamfile.v2

@@ -19,16 +19,16 @@ project
     : default-build
       <link>static
     : requirements
-      <library>/boost/test//boost_unit_test_framework
-      <include>../../..
+      <library>/boost/accumulators//boost_accumulators
+      <library>/boost/test//boost_unit_test_framework/<link>static
+      <library>/boost/random//boost_random
       <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
       # MSVC's iterator debugging causes some tests to run forever.
       <toolset>msvc:<iterator_debugging>off
       <toolset>intel-win:<iterator_debugging>off
       <toolset>gcc:<cxxflags>"-Wno-deprecated-declarations"
       <toolset>clang:<cxxflags>"-Wno-deprecated-declarations"
       <toolset>intel-linux:<cxxflags>"-Wno-deprecated-declarations"
-      <library>/boost/serialization
     ;
 
 alias accumulators_regular_tests
@@ -57,7 +57,7 @@ alias accumulators_regular_tests
       [ run skewness.cpp ]
       [ run sum.cpp ]
       [ run sum_kahan.cpp ]
-      [ run tail.cpp ]
+      [ run tail.cpp : : : <library>/boost/foreach//boost_foreach ]
       [ run tail_mean.cpp ]
       [ run tail_quantile.cpp ]
       [ run variance.cpp ]