Merge pull request #17 from grafikrobot/modular

Add support for modular build structure.

.github/workflows/ci.yml

@@ -0,0 +1,152 @@
+name: GitHub Actions CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - develop
+      - githubactions*
+      - feature/**
+      - fix/**
+      - pr/**
+
+jobs:
+  cpp-matrix:
+    runs-on: ubuntu-latest
+    name: Generate Test Matrix
+    outputs:
+      matrix: ${{ steps.cpp-matrix.outputs.matrix }}
+    steps:
+      - name: Generate Test Matrix
+        uses: alandefreitas/cpp-actions/cpp-matrix@master
+        id: cpp-matrix
+        with:
+          extra-values: |
+            boost-lib: static_assert
+            scan-dirs: test
+          compilers: |
+            gcc >= 4.8
+            clang >= 3.5
+            msvc >= 14.0
+            apple-clang *
+            mingw *
+            clang-cl *
+          subrange-policy: |
+            msvc: one-per-minor
+          standards: ">=11"
+          latest-factors: |
+            gcc Asan TSan UBSan
+            clang BoundsSan IntSan
+          factors: |
+            gcc Shared
+            msvc Shared x86
+            mingw Shared
+          trace-commands: true
+  build:
+    needs: cpp-matrix
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJSON(needs.cpp-matrix.outputs.matrix) }}
+
+    # use matrix entries
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.runs-on }}
+    container: ${{ matrix.container }}
+
+    steps:
+      # GitHub Actions no longer support older containers.
+      # The workaround is to install our own Node.js for the actions.
+      - name: Patch Node
+        # The containers that need Node.js 20 will have volumes set up so that
+        # the Node.js 20 installation can go there.
+        if: ${{ matrix.container.volumes }}
+        run: |
+          set -x
+          apt-get update
+          apt-get install -y curl xz-utils
+          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: Setup C++ Compiler
+        uses: alandefreitas/cpp-actions/setup-cpp@master
+        id: setup-cpp
+        with:
+          compiler: ${{ matrix.compiler }}
+          version: ${{ matrix.version }}
+
+      - name: Install Packages
+        if: matrix.install != ''
+        uses: alandefreitas/cpp-actions/package-install@master
+        id: package-install
+        with:
+          apt-get: ${{ matrix.install }}
+
+      - name: Clone Library
+        uses: actions/checkout@v4
+
+      - name: Clone Boost
+        uses: alandefreitas/cpp-actions/boost-clone@master
+        id: boost-clone
+        with:
+          branch: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
+          boost-dir: ../boost-root
+          scan-modules-dir: .
+          scan-modules-ignore: ${{ matrix.boost-lib }}
+          modules-scan-paths: ${{ matrix.scan-dirs }}
+          cache: false
+
+      - name: Copy Library
+        shell: bash
+        run: |
+          workspace_root=$(echo "$GITHUB_WORKSPACE" | sed 's/\\/\//g')
+          cd ../boost-root
+          rm -rf "libs/${{ matrix.boost-lib }}"
+          mkdir "libs/${{ matrix.boost-lib }}"
+          cp -r "$workspace_root"/* "libs/${{ matrix.boost-lib }}"
+
+      - name: B2 Workflow
+        uses: alandefreitas/cpp-actions/b2-workflow@master
+        with:
+          source-dir: ${{ steps.boost-clone.outputs.boost-dir }}
+          modules: ${{ matrix.boost-lib }}
+          toolset: ${{ matrix.b2-toolset }}
+          build-variant: ${{ matrix.build-type }}
+          cxx: ${{ steps.setup-cpp.outputs.cxx || '' }}
+          cxxstd: ${{ matrix.cxxstd }}
+          address-model: ${{ matrix.address-model }}
+          asan: ${{ matrix.asan }}
+          ubsan: ${{ matrix.ubsan }}
+          tsan: ${{ matrix.tsan }}
+          shared: ${{ matrix.shared }}
+          abbreviate-paths: false
+          hash: true
+          debug-configuration: true
+          trace-commands: true
+
+      - name: CMake Workflow
+        uses: alandefreitas/cpp-actions/cmake-workflow@master
+        with:
+          source-dir: ${{ steps.boost-clone.outputs.boost-dir }}/libs/${{ matrix.boost-lib }}
+          build-dir: _build_dir_
+          run-tests: ignore
+          install: true
+          cmake-version: ">=3.31"
+          generator: ${{ matrix.generator }}
+          generator-toolset: ${{ matrix.generator-toolset }}
+          toolchain: ${{ steps.package-install.outputs.vcpkg-toolchain }}
+          build-type: ${{ matrix.build-type }}
+          install-prefix: .local
+          cxxstd: ${{ matrix.cxxstd }}
+          cc: ${{ steps.setup-cpp.outputs.cc }}
+          ccflags: ${{ matrix.ccflags }}
+          cxx: ${{ steps.setup-cpp.outputs.cxx }}
+          cxxflags: ${{ matrix.cxxflags }}
+          shared: ${{ matrix.shared }}
+          extra-args:
+            "${{ ( !matrix.no-deps && format('-D BOOST_SRC_DIR=\"{0}\"', steps.boost-clone.outputs.boost-dir)\
+            \ ) || '' }} \n${{ ( matrix.no-deps && '-D CPP_ACTIONS_NO_DEPS=ON' ) || '' }}\n"
+          export-compile-commands: ${{ matrix.time-trace }}
+          trace-commands: true

.travis.yml

@@ -271,6 +271,37 @@ matrix:
           packages:
             - libc++-dev
 
+    - os: linux
+      env: CMAKE=1
+      script:
+        - mkdir __build__ && cd __build__
+        - cmake -DBUILD_TESTING=ON -DBOOST_INCLUDE_LIBRARIES=static_assert ..
+        - cmake --build . --target tests
+        - ctest --output-on-failure
+
+    - os: linux
+      env: CMAKE_SUBDIR=1
+      install:
+        - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
+        - git clone -b $BOOST_BRANCH https://github.com/boostorg/config.git ../config
+      script:
+        - cd test/cmake_subdir_test && mkdir __build__ && cd __build__
+        - cmake ..
+        - cmake --build .
+        - cmake --build . --target check
+
+    - os: linux
+      env: CMAKE_INSTALL=1
+      script:
+        - pip install --user cmake
+        - mkdir __build__ && cd __build__
+        - cmake -DBOOST_INCLUDE_LIBRARIES=static_assert -DCMAKE_INSTALL_PREFIX=~/.local ..
+        - cmake --build . --target install
+        - cd ../libs/static_assert/test/cmake_install_test && mkdir __build__ && cd __build__
+        - cmake -DCMAKE_INSTALL_PREFIX=~/.local ..
+        - cmake --build .
+        - cmake --build . --target check
+
     - os: osx
       compiler: clang++
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z

CMakeLists.txt

@@ -14,16 +14,15 @@ add_library(Boost::static_assert ALIAS boost_static_assert)
 target_include_directories(boost_static_assert INTERFACE include)
 
 target_link_libraries(boost_static_assert
-    INTERFACE
-        Boost::config
+  INTERFACE
+    Boost::config
 )
 
-# boost_install requires PROJECT_VERSION
-# Without the superproject, we don't have any, so skip installation
+# BUILD_TESTING is the standard CTest variable that enables testing
 
-if(BOOST_SUPERPROJECT_VERSION)
+if(BUILD_TESTING)
 
-  include(BoostInstall)
-  boost_install(TARGETS boost_static_assert HEADER_DIRECTORY include/)
+  add_subdirectory(test)
+  add_subdirectory(example)
 
 endif()

Jamfile.v2

@@ -1,9 +0,0 @@
-# copyright John Maddock 2003
-# 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)
-
-# bring in the rules for testing
-import testing ;
-
-build-project test ;

build.jam

@@ -0,0 +1,23 @@
+# 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 ;
+
+project /boost/static_assert
+    : common-requirements
+        <include>include
+    ;
+
+explicit
+    [ alias boost_static_assert : : : : <library>$(boost_dependencies) ]
+    [ alias all : boost_static_assert example test ]
+    ;
+
+call-if : boost-library static_assert
+    ;
+

example/CMakeLists.txt

@@ -0,0 +1,11 @@
+# Copyright 2018, 2019 Peter Dimov
+# 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
+
+include(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
+
+if(HAVE_BOOST_TEST)
+
+boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::static_assert Boost::type_traits)
+
+endif()

example/Jamfile.v2

@@ -1,20 +1,15 @@
 # copyright John Maddock 2003
-# Use, modification and distribution are subject to the 
-# Boost Software License, Version 1.0. (See accompanying file 
+# 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)
 
 # bring in the rules for testing
 import testing ;
 
-test-suite static_assert :
-#	[ run static_assert_example_1.cpp ]
-	[ run static_assert_example_2.cpp ]
-	[ run static_assert_example_3.cpp ]
-;
-
-
-
-
-
-
+project : requirements
+    <library>/boost/type_traits//boost_type_traits
+    ;
 
+#run static_assert_example_1.cpp ;
+run static_assert_example_2.cpp ;
+run static_assert_example_3.cpp ;

include/boost/static_assert.hpp

@@ -16,6 +16,7 @@
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
+#include <cstddef> //for std::size_t
 
 #if defined(__GNUC__) && !defined(__GXX_EXPERIMENTAL_CXX0X__)
 //
@@ -36,7 +37,7 @@
 #     define BOOST_STATIC_ASSERT_MSG( B, Msg ) BOOST_STATIC_ASSERT( B )
 #endif
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 //
 // workaround for buggy integral-constant expression support:
 #define BOOST_BUGGY_INTEGRAL_CONSTANT_EXPRESSIONS
@@ -81,7 +82,7 @@ template <bool x> struct STATIC_ASSERTION_FAILURE;
 template <> struct STATIC_ASSERTION_FAILURE<true> { enum { value = 1 }; };
 
 // HP aCC cannot deal with missing names for template value parameters
-template<int x> struct static_assert_test{};
+template<std::size_t x> struct static_assert_test{};
 
 }
 

meta/libraries.json

@@ -12,5 +12,6 @@
     ],
     "maintainers": [
         "John Maddock <john -at- johnmaddock.co.uk>"
-    ]
+    ],
+    "cxxstd": "03"
 }

test/CMakeLists.txt

@@ -0,0 +1,11 @@
+# Copyright 2018, 2019 Peter Dimov
+# 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
+
+include(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
+
+if(HAVE_BOOST_TEST)
+
+boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::static_assert)
+
+endif()

test/Jamfile.v2

@@ -1,30 +1,25 @@
 # copyright John Maddock 2003
-# Use, modification and distribution are subject to the 
-# Boost Software License, Version 1.0. (See accompanying file 
+# 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)
 
 # bring in the rules for testing
 import testing ;
 
-test-suite static_assert :
-	[ run static_assert_test.cpp ]
-	[ compile-fail static_assert_test_fail_1.cpp ]
-	[ compile-fail static_assert_test_fail_2.cpp ]
-	[ compile-fail static_assert_test_fail_3.cpp ]
-	[ compile-fail static_assert_test_fail_4.cpp ]
-	[ compile-fail static_assert_test_fail_5.cpp ]
-	[ compile-fail static_assert_test_fail_6.cpp ]
-	[ compile-fail static_assert_test_fail_7.cpp ]
-	[ compile-fail static_assert_test_fail_8.cpp ]
-	[ compile-fail static_assert_test_fail_9.cpp ]
-	[ compile-fail static_assert_test_fail_10.cpp ]
-;
+project : requirements
+    <library>/boost/type_traits//boost_type_traits
+    ;
+
+run static_assert_test.cpp ;
+compile-fail static_assert_test_fail_1.cpp ;
+compile-fail static_assert_test_fail_2.cpp ;
+compile-fail static_assert_test_fail_3.cpp ;
+compile-fail static_assert_test_fail_4.cpp ;
+compile-fail static_assert_test_fail_5.cpp ;
+compile-fail static_assert_test_fail_6.cpp ;
+compile-fail static_assert_test_fail_7.cpp ;
+compile-fail static_assert_test_fail_8.cpp ;
+compile-fail static_assert_test_fail_9.cpp ;
+compile-fail static_assert_test_fail_10.cpp ;
 
 build-project ../example ;
-
-
-
-
-
-
-

test/cmake_install_test/CMakeLists.txt

@@ -0,0 +1,17 @@
+# Copyright 2018, 2019 Peter Dimov
+# 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
+
+cmake_minimum_required(VERSION 3.5...3.16)
+
+project(cmake_install_test LANGUAGES CXX)
+
+find_package(boost_static_assert REQUIRED)
+
+add_executable(main main.cpp)
+target_link_libraries(main Boost::static_assert)
+
+enable_testing()
+add_test(NAME main COMMAND main)
+
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)

test/cmake_install_test/main.cpp

@@ -0,0 +1,7 @@
+#include <boost/static_assert.hpp>
+
+int main()
+{
+    int const x = 5;
+    BOOST_STATIC_ASSERT( x > 4 );
+}

test/cmake_subdir_test/CMakeLists.txt

@@ -0,0 +1,18 @@
+# Copyright 2018, 2019 Peter Dimov
+# 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
+
+cmake_minimum_required(VERSION 3.5...3.16)
+
+project(cmake_subdir_test LANGUAGES CXX)
+
+add_subdirectory(../../../static_assert boostorg/static_assert)
+add_subdirectory(../../../config boostorg/config)
+
+add_executable(main main.cpp)
+target_link_libraries(main Boost::static_assert)
+
+enable_testing()
+add_test(NAME main COMMAND main)
+
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)

test/cmake_subdir_test/main.cpp

@@ -0,0 +1,7 @@
+#include <boost/static_assert.hpp>
+
+int main()
+{
+    int const x = 5;
+    BOOST_STATIC_ASSERT( x > 4 );
+}