Add support for modular build structure. (#24 )

* Make the library modular usable. * Switch to library requirements instead of source. As source puts extra source in install targets. * Add missing b2 testing module import. * Add missing import-search for cconfig/predef checks. * Add requires-b2 check to top-level build file. * Bump B2 require to 5.2 * Update copyright dates. * Move inter-lib dependencies to a project variable and into the build targets. * Update build deps.
Added macos-12 and 13 testing in addition to latest (which is 14).
2025-07-29 20:07:15 +02:00 · 2024-08-19 01:25:34 +03:00 · 2024-05-21 01:18:57 +03:00 · 2024-05-21 00:59:59 +03:00 · 2024-04-27 19:35:02 +03:00 · 2024-02-06 00:44:24 +03:00
5 changed files with 154 additions and 69 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -1,4 +1,4 @@
-# Copyright 2021-2022 Andrey Semashev
+# Copyright 2021-2024 Andrey Semashev
 #
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
@ -33,16 +33,8 @@ jobs:
      matrix:
        include:
          # Linux, gcc
-          - toolset: gcc-4.4
-            cxxstd: "98,0x"
-            os: ubuntu-latest
-            container: ubuntu:16.04
-            install:
-              - g++-4.4
-            sources:
-              - "ppa:ubuntu-toolchain-r/test"
          - toolset: gcc-4.6
-            cxxstd: "03,0x"
+            cxxstd: "0x"
            os: ubuntu-latest
            container: ubuntu:16.04
            install:
@ -50,70 +42,76 @@ jobs:
            sources:
              - "ppa:ubuntu-toolchain-r/test"
          - toolset: gcc-4.7
-            cxxstd: "03,11"
+            cxxstd: "11"
            os: ubuntu-latest
            container: ubuntu:16.04
            install:
              - g++-4.7
          - toolset: gcc-4.8
-            cxxstd: "03,11"
+            cxxstd: "11"
            os: ubuntu-latest
            container: ubuntu:18.04
            install:
              - g++-4.8
          - toolset: gcc-4.9
-            cxxstd: "03,11"
+            cxxstd: "11"
            os: ubuntu-latest
            container: ubuntu:16.04
            install:
              - g++-4.9
          - toolset: gcc-5
-            cxxstd: "03,11,14,1z"
+            cxxstd: "11,14,1z"
            os: ubuntu-latest
            container: ubuntu:16.04
            install:
              - g++-5
          - toolset: gcc-6
-            cxxstd: "03,11,14,1z"
+            cxxstd: "11,14,1z"
            os: ubuntu-latest
            container: ubuntu:18.04
            install:
              - g++-6
          - toolset: gcc-7
-            cxxstd: "03,11,14,17"
+            cxxstd: "11,14,17"
            os: ubuntu-latest
            container: ubuntu:18.04
            install:
              - g++-7
          - toolset: gcc-8
-            cxxstd: "03,11,14,17,2a"
+            cxxstd: "11,14,17,2a"
            os: ubuntu-latest
            container: ubuntu:18.04
            install:
              - g++-8
          - toolset: gcc-9
-            cxxstd: "03,11,14,17,2a"
+            cxxstd: "11,14,17,2a"
            os: ubuntu-20.04
            install:
              - g++-9
          - toolset: gcc-10
-            cxxstd: "03,11,14,17,20"
+            cxxstd: "11,14,17,20"
            os: ubuntu-20.04
            install:
              - g++-10
          - toolset: gcc-11
-            cxxstd: "03,11,14,17,20,23"
+            cxxstd: "11,14,17,20,23"
            os: ubuntu-22.04
            install:
              - g++-11
          - toolset: gcc-12
-            cxxstd: "03,11,14,17,20,23"
+            cxxstd: "11,14,17,20,23"
            os: ubuntu-22.04
            install:
              - g++-12
+          - toolset: gcc-13
+            cxxstd: "11,14,17,20,23"
+            os: ubuntu-latest
+            container: ubuntu:23.04
+            install:
+              - g++-13
          - name: UBSAN
            toolset: gcc-11
-            cxxstd: "03,11,14,17,20,23"
+            cxxstd: "11,14,17,20,23"
            ubsan: 1
            build_variant: debug
            os: ubuntu-22.04
@ -123,63 +121,63 @@ jobs:
          # Linux, clang
          - toolset: clang
            compiler: clang++-3.5
-            cxxstd: "03,11"
+            cxxstd: "11"
            os: ubuntu-latest
            container: ubuntu:16.04
            install:
              - clang-3.5
          - toolset: clang
            compiler: clang++-3.6
-            cxxstd: "03,11,14"
+            cxxstd: "11,14"
            os: ubuntu-latest
            container: ubuntu:16.04
            install:
              - clang-3.6
          - toolset: clang
            compiler: clang++-3.7
-            cxxstd: "03,11,14"
+            cxxstd: "11,14"
            os: ubuntu-latest
            container: ubuntu:16.04
            install:
              - clang-3.7
          - toolset: clang
            compiler: clang++-3.8
-            cxxstd: "03,11,14"
+            cxxstd: "11,14"
            os: ubuntu-latest
            container: ubuntu:16.04
            install:
              - clang-3.8
          - toolset: clang
            compiler: clang++-3.9
-            cxxstd: "03,11,14"
+            cxxstd: "11,14"
            os: ubuntu-latest
            container: ubuntu:18.04
            install:
              - clang-3.9
          - toolset: clang
            compiler: clang++-4.0
-            cxxstd: "03,11,14"
+            cxxstd: "11,14"
            os: ubuntu-latest
            container: ubuntu:18.04
            install:
              - clang-4.0
          - toolset: clang
            compiler: clang++-5.0
-            cxxstd: "03,11,14,1z"
+            cxxstd: "11,14,1z"
            os: ubuntu-latest
            container: ubuntu:18.04
            install:
              - clang-5.0
          - toolset: clang
            compiler: clang++-6.0
-            cxxstd: "03,11,14,17"
+            cxxstd: "11,14,17"
            os: ubuntu-latest
            container: ubuntu:18.04
            install:
              - clang-6.0
          - toolset: clang
            compiler: clang++-7
-            cxxstd: "03,11,14,17"
+            cxxstd: "11,14,17"
            os: ubuntu-latest
            container: ubuntu:18.04
            install:
@ -187,7 +185,7 @@ jobs:
          # Note: clang-8 does not fully support C++20, so it is not compatible with libstdc++-8 in this mode
          - toolset: clang
            compiler: clang++-8
-            cxxstd: "03,11,14,17,2a"
+            cxxstd: "11,14,17,2a"
            os: ubuntu-latest
            container: ubuntu:18.04
            install:
@ -196,83 +194,113 @@ jobs:
            gcc_toolchain: 7
          - toolset: clang
            compiler: clang++-9
-            cxxstd: "03,11,14,17,2a"
+            cxxstd: "11,14,17,2a"
            os: ubuntu-20.04
            install:
              - clang-9
          - toolset: clang
            compiler: clang++-10
-            cxxstd: "03,11,14,17,20"
+            cxxstd: "11,14,17,20"
            os: ubuntu-20.04
            install:
              - clang-10
          - toolset: clang
            compiler: clang++-11
-            cxxstd: "03,11,14,17,20"
+            cxxstd: "11,14,17,20"
            os: ubuntu-22.04
            install:
              - clang-11
          - toolset: clang
            compiler: clang++-12
-            cxxstd: "03,11,14,17,20,2b"
+            cxxstd: "11,14,17,20,2b"
            os: ubuntu-22.04
            install:
              - clang-12
+              - g++-11
+            gcc_toolchain: 11
          - toolset: clang
            compiler: clang++-13
-            cxxstd: "03,11,14,17,20,2b"
+            cxxstd: "11,14,17,20,2b"
            os: ubuntu-22.04
            install:
              - clang-13
+              - g++-11
+            gcc_toolchain: 11
          - toolset: clang
            compiler: clang++-14
-            cxxstd: "03,11,14,17,20,2b"
+            cxxstd: "11,14,17,20,2b"
            os: ubuntu-22.04
            install:
              - clang-14
+              - g++-11
+            gcc_toolchain: 11
          - toolset: clang
            compiler: clang++-15
-            cxxstd: "03,11,14,17,20,2b"
+            cxxstd: "11,14,17,20,2b"
            os: ubuntu-22.04
            install:
              - clang-15
+              - g++-11
+            gcc_toolchain: 11
+          - toolset: clang
+            compiler: clang++-16
+            cxxstd: "11,14,17,20,2b"
+            os: ubuntu-22.04
+            install:
+              - clang-16
            sources:
-              - "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"
+              - "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main"
            source_keys:
              - "https://apt.llvm.org/llvm-snapshot.gpg.key"
          - toolset: clang
-            compiler: clang++-15
-            cxxstd: "03,11,14,17,20,2b"
+            compiler: clang++-17
+            cxxstd: "11,14,17,20,23"
            os: ubuntu-22.04
            install:
-              - clang-15
-              - libc++-15-dev
-              - libc++abi-15-dev
+              - clang-17
            sources:
-              - "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"
+              - "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main"
+            source_keys:
+              - "https://apt.llvm.org/llvm-snapshot.gpg.key"
+          - toolset: clang
+            compiler: clang++-17
+            cxxstd: "11,14,17,20,23"
+            os: ubuntu-22.04
+            install:
+              - clang-17
+              - libc++-17-dev
+              - libc++abi-17-dev
+            sources:
+              - "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main"
            source_keys:
              - "https://apt.llvm.org/llvm-snapshot.gpg.key"
            cxxflags: -stdlib=libc++
            linkflags: -stdlib=libc++
          - name: UBSAN
            toolset: clang
-            compiler: clang++-14
-            cxxstd: "03,11,14,17,20,2b"
+            compiler: clang++-15
+            cxxstd: "11,14,17,20,2b"
            cxxflags: -stdlib=libc++
            linkflags: -stdlib=libc++
            ubsan: 1
            build_variant: debug
            os: ubuntu-22.04
            install:
-              - clang-14
-              - libc++-14-dev
-              - libc++abi-14-dev
+              - clang-15
+              - libc++-15-dev
+              - libc++abi-15-dev

          - toolset: clang
-            cxxstd: "03,11,14,17,2a"
-            os: macos-11
+            cxxstd: "11,14,17,20,2b"
+            os: macos-12
+          - toolset: clang
+            cxxstd: "11,14,17,20,2b"
+            os: macos-13
+          - toolset: clang
+            cxxstd: "11,14,17,20,2b"
+            os: macos-14

-    timeout-minutes: 60
+    timeout-minutes: 15
    runs-on: ${{matrix.os}}
    container: ${{matrix.container}}

@ -301,8 +329,6 @@ jobs:
            fi
            git config --global pack.threads 0

-      - uses: actions/checkout@v3
-
      - name: Install packages
        if: matrix.install
        run: |
@ -417,11 +443,25 @@ jobs:
            then
                DEPINST_ARGS+=("--git_args" "--jobs $GIT_FETCH_JOBS")
            fi
+            mkdir -p snapshot
+            cd snapshot
+            echo "Downloading library snapshot: https://github.com/${GITHUB_REPOSITORY}/archive/${GITHUB_SHA}.tar.gz"
+            curl -L --retry "$NET_RETRY_COUNT" -o "${LIBRARY}-${GITHUB_SHA}.tar.gz" "https://github.com/${GITHUB_REPOSITORY}/archive/${GITHUB_SHA}.tar.gz"
+            tar -xf "${LIBRARY}-${GITHUB_SHA}.tar.gz"
+            if [ ! -d "${LIBRARY}-${GITHUB_SHA}" ]
+            then
+                echo "Library snapshot does not contain the library directory ${LIBRARY}-${GITHUB_SHA}:"
+                ls -la
+                exit 1
+            fi
+            rm -f "${LIBRARY}-${GITHUB_SHA}.tar.gz"
            cd ..
            git clone -b "$BOOST_BRANCH" --depth 1 "https://github.com/boostorg/boost.git" "boost-root"
            cd boost-root
-            mkdir -p libs/$LIBRARY
-            cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
+            mkdir -p libs
+            rm -rf "libs/$LIBRARY"
+            mv -f "../snapshot/${LIBRARY}-${GITHUB_SHA}" "libs/$LIBRARY"
+            rm -rf "../snapshot"
            git submodule update --init tools/boostdep
            DEPINST_ARGS+=("$LIBRARY")
            python tools/boostdep/depinst/depinst.py "${DEPINST_ARGS[@]}"
@ -443,7 +483,7 @@ jobs:
      - name: Run tests
        if: matrix.cmake_tests == ''
        run: |
-            cd ../boost-root
+            cd boost-root
            B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "cxxstd=${{matrix.cxxstd}}")
            if [ -n "${{matrix.build_variant}}" ]
            then
@ -493,15 +533,14 @@ jobs:
            addrmd: 32,64
            os: windows-2022
          - toolset: gcc
-            cxxstd: "03,11,14,17,2a"
+            cxxstd: "11,14,17,2a"
            addrmd: 64
            os: windows-2019

+    timeout-minutes: 15
    runs-on: ${{matrix.os}}

    steps:
-      - uses: actions/checkout@v3
-
      - name: Setup Boost
        shell: cmd
        run: |
@ -515,10 +554,24 @@ jobs:
            set BOOST_BRANCH=develop
            for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "master" set BOOST_BRANCH=master
            echo BOOST_BRANCH: %BOOST_BRANCH%
+            mkdir snapshot
+            cd snapshot
+            echo Downloading library snapshot: https://github.com/%GITHUB_REPOSITORY%/archive/%GITHUB_SHA%.zip
+            curl -L --retry %NET_RETRY_COUNT% -o "%LIBRARY%-%GITHUB_SHA%.zip" "https://github.com/%GITHUB_REPOSITORY%/archive/%GITHUB_SHA%.zip"
+            tar -xf "%LIBRARY%-%GITHUB_SHA%.zip"
+            if not exist "%LIBRARY%-%GITHUB_SHA%\" (
+                echo Library snapshot does not contain the library directory %LIBRARY%-%GITHUB_SHA%:
+                dir
+                exit /b 1
+            )
+            del /f "%LIBRARY%-%GITHUB_SHA%.zip"
            cd ..
            git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
            cd boost-root
-            xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
+            if not exist "libs\" mkdir libs
+            if exist "libs\%LIBRARY%\" rmdir /s /q "libs\%LIBRARY%"
+            move /Y "..\snapshot\%LIBRARY%-%GITHUB_SHA%" "libs\%LIBRARY%"
+            rmdir /s /q "..\snapshot"
            git submodule update --init tools/boostdep
            python tools/boostdep/depinst/depinst.py --git_args "--jobs %GIT_FETCH_JOBS%" %LIBRARY%
            cmd /c bootstrap
@ -527,7 +580,7 @@ jobs:
      - name: Run tests
        shell: cmd
        run: |
-            cd ../boost-root
+            cd boost-root
            set BUILD_VARIANT=${{matrix.build_variant}}
            if "%BUILD_VARIANT%" == "" set BUILD_VARIANT=%DEFAULT_BUILD_VARIANT%
            b2 -j %NUMBER_OF_PROCESSORS% toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} address-model=${{matrix.addrmd}} variant=%BUILD_VARIANT% embed-manifest-via=linker libs/%LIBRARY%/test
--- a/build.jam
+++ b/build.jam
@ -0,0 +1,27 @@
+# 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/config//boost_config
+    /boost/core//boost_core
+    /boost/preprocessor//boost_preprocessor
+    /boost/static_assert//boost_static_assert
+    /boost/type_traits//boost_type_traits ;
+
+project /boost/detail
+    : common-requirements
+        <include>include
+    ;
+
+explicit
+    [ alias boost_detail : : : : <library>$(boost_dependencies) ]
+    [ alias all : boost_detail test ]
+    ;
+
+call-if : boost-library detail
+    ;
+
--- a/doc/build.jam
+++ b/doc/build.jam
@ -23,7 +23,7 @@ boostbook standalone
        <xsl:param>generate.section.toc.level=3
        <xsl:param>chunk.section.depth=2
        #<xsl:param>chunk.first.sections=1
-    
+
        <dependency>images
        <dependency>callouts
        <dependency>css
--- a/include/boost/detail/lightweight_test_report.hpp
+++ b/include/boost/detail/lightweight_test_report.hpp
@ -53,4 +53,4 @@ int cpp_main(int argc, char* argv[])
  std::cout << std::endl;

  return test_main(argc, argv);
-}
+}
--- a/test/Jamfile
+++ b/test/Jamfile
@ -5,10 +5,14 @@
 #   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ################################################################################

+import testing ;
+
 build-project container_fwd ;

 project detail/test
  : requirements
+    <library>/boost/detail//boost_detail
+    <library>/boost/type_traits//boost_type_traits
    <c++-template-depth>300
    <toolset>clang:<cxxflags>-Wno-unused
    <toolset>clang:<cxxflags>-Wno-tautological-compare
@ -18,13 +22,14 @@ project detail/test
  ;

 # import rules for testing conditional on config file variables
-import ../../config/checks/config : requires ;
+import-search /boost/config/checks ;
+import config : requires ;

 run binary_search_test.cpp ;
 run blank_test.cpp ;
-run is_sorted_test.cpp ;
+run is_sorted_test.cpp /boost/array//boost_array ;
 run numeric_traits_test.cpp ;
-run is_xxx_test.cpp ;
+run is_xxx_test.cpp /boost/preprocessor//boost_preprocessor ;
 # run test_utf8_codecvt.cpp : : : [ requires std_wstreambuf ] ;
 run test_utf8_codecvt.cpp ;
 run allocator_utilities_test.cpp ;
Author	SHA1	Message	Date
René Ferdinand Rivera Morell	a54b2619f8	Add support for modular build structure. (#24 ) * Make the library modular usable. * Switch to library requirements instead of source. As source puts extra source in install targets. * Add missing b2 testing module import. * Add missing import-search for cconfig/predef checks. * Add requires-b2 check to top-level build file. * Bump B2 require to 5.2 * Update copyright dates. * Move inter-lib dependencies to a project variable and into the build targets. * Update build deps.	2024-08-19 01:25:34 +03:00
Andrey Semashev	804767983f	Added macos-12 and 13 testing in addition to latest (which is 14).	2024-05-21 01:18:57 +03:00
Andrey Semashev	a8a43b4778	Use macos-latest image as macos-11 is being removed.	2024-05-21 00:59:59 +03:00
Andrey Semashev	080df0554b	Added a missing trailing newline.	2024-04-27 19:35:02 +03:00
Andrey Semashev	9c3a0022b2	Added gcc-13 and clang-17 CI jobs.	2024-02-06 00:44:24 +03:00
Andrey Semashev	6488652b08	Reduced CI job timeouts.	2024-02-05 23:43:39 +03:00
Andrey Semashev	8a0d14a862	Replaced actions/checkout usage with manual download commands. This fixes the deprecation warnings for actions/checkout@v3. actions/checkout@v4 is not functional because of the upstream bug: https://github.com/actions/checkout/issues/1590	2024-02-05 23:39:59 +03:00
Andrey Semashev	845567f026	Remove C++03 CI jobs, use gcc-11 libstdc++ in clang-12 through 15.	2023-11-17 20:07:56 +03:00
Andrey Semashev	b75c261492	Add clang-16 CI jobs, switch to clang-15 from stock Ubuntu repos.	2023-06-05 15:36:30 +03:00