diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e7bcd5824..0ce207d14 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: - name: Checkout main boost run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root - name: Update Dependencies - run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits + run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits libs/static_assert libs/throw_exception libs/preprocessor working-directory: ../boost-root - name: Copy files run: cp -r $GITHUB_WORKSPACE/* libs/config @@ -82,7 +82,7 @@ jobs: - name: Checkout main boost run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root - name: Update Dependencies - run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits + run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits libs/static_assert libs/throw_exception libs/preprocessor working-directory: ../boost-root - name: Copy files run: cp -r $GITHUB_WORKSPACE/* libs/config @@ -126,7 +126,7 @@ jobs: - name: Checkout main boost run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root - name: Update Dependencies - run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits + run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits libs/static_assert libs/throw_exception libs/preprocessor working-directory: ../boost-root - name: Copy files run: cp -r $GITHUB_WORKSPACE/* libs/config @@ -170,7 +170,7 @@ jobs: - name: Checkout main boost run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root - name: Update Dependencies - run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits + run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits libs/static_assert libs/throw_exception libs/preprocessor working-directory: ../boost-root - name: Copy files run: cp -r $GITHUB_WORKSPACE/* libs/config @@ -190,43 +190,8 @@ jobs: - name: Test run: ../../../b2 toolset=$TOOLSET cxxstd=03,11,14,17,2a working-directory: ../boost-root/libs/config/test - macos_11: - runs-on: macos-11 - strategy: - fail-fast: false - matrix: - toolset: [ clang, gcc-11, gcc-10 ] - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: '0' - - uses: mstachniuk/ci-skip@v1 - with: - commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[linux];[Linux];[LINUX]' - commit-filter-separator: ';' - fail-fast: true - - name: Checkout main boost - run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root - - name: Update Dependencies - run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits - working-directory: ../boost-root - - name: Copy files - run: cp -r $GITHUB_WORKSPACE/* libs/config - working-directory: ../boost-root - - name: Bootstrap - run: ./bootstrap.sh - working-directory: ../boost-root - - name: Generate headers - run: ./b2 headers - working-directory: ../boost-root - - name: Config info - run: ../../../b2 print_config_info toolset=${{ matrix.toolset }} cxxstd=03,11,14,17,2a - working-directory: ../boost-root/libs/config/test - - name: Test - run: ../../../b2 toolset=${{ matrix.toolset }} cxxstd=03,11,14,17,2a - working-directory: ../boost-root/libs/config/test - macos_12: - runs-on: macos-12 + macos: + runs-on: macos-latest strategy: fail-fast: false matrix: @@ -243,7 +208,7 @@ jobs: - name: Checkout main boost run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root - name: Update Dependencies - run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits + run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits libs/static_assert libs/throw_exception libs/preprocessor working-directory: ../boost-root - name: Copy files run: cp -r $GITHUB_WORKSPACE/* libs/config @@ -281,7 +246,7 @@ jobs: - name: Checkout main boost run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root - name: Update Dependencies - run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits + run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits libs/static_assert libs/throw_exception libs/preprocessor working-directory: ../boost-root - name: Copy files run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\config @@ -319,7 +284,7 @@ jobs: - name: Checkout main boost run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root - name: Update Dependencies - run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits + run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits libs/static_assert libs/throw_exception libs/preprocessor working-directory: ../boost-root - name: Copy files run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\config @@ -357,7 +322,7 @@ jobs: - name: Checkout main boost run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root - name: Update Dependencies - run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits + run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits libs/static_assert libs/throw_exception libs/preprocessor working-directory: ../boost-root - name: Copy files run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\config @@ -395,7 +360,7 @@ jobs: - name: Checkout main boost run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root - name: Update Dependencies - run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits + run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits libs/static_assert libs/throw_exception libs/preprocessor working-directory: ../boost-root - name: Copy files run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\config @@ -443,7 +408,7 @@ jobs: cd boost-root rm -rf libs/config/* cp -r $config/* libs/config - git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits + git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits libs/static_assert libs/throw_exception libs/preprocessor ./bootstrap.sh ./b2 headers ./b2 toolset=gcc libs/config/test//print_config_info libs/config/test//print_math_info @@ -479,7 +444,7 @@ jobs: cd boost-root rm -rf libs/config/* cp -r $config/* libs/config - git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits + git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits libs/static_assert libs/throw_exception libs/preprocessor ./bootstrap.sh ./b2 headers ./b2 toolset=clang libs/config/test//print_config_info libs/config/test//print_math_info @@ -515,7 +480,7 @@ jobs: - name: Checkout main boost run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root - name: Update Dependencies - run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits + run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits libs/static_assert libs/throw_exception libs/preprocessor working-directory: ../boost-root - name: Copy files run: cp -r $GITHUB_WORKSPACE/* libs/config @@ -585,7 +550,7 @@ jobs: - name: Checkout main boost run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root - name: Update Dependencies - run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits + run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits libs/static_assert libs/throw_exception libs/preprocessor working-directory: ../boost-root - name: Copy files run: cp -r $GITHUB_WORKSPACE/* libs/config diff --git a/build.jam b/build.jam new file mode 100644 index 000000000..5d3a4ff5f --- /dev/null +++ b/build.jam @@ -0,0 +1,32 @@ +# 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 ; + +path-constant BOOST_CONFIG_ROOT : . ; +import-search $(BOOST_CONFIG_ROOT)/checks ; + +project /boost/config + : common-requirements + include + ; + +explicit + [ alias boost_config : : : : $(boost_dependencies) ] + [ alias all : boost_config test ] + [ alias testing + : # sources + : # requirements + : # default-buidl + : # usage-requirements + test + ] + ; + +call-if : boost-library config + ; + +use-project /boost/architecture : checks/architecture ; + diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index f4fe179cc..e97fb9114 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -10,15 +10,20 @@ import feature ; import testing ; +import notfile ; project : requirements gcc:-Wno-deprecated-declarations + /boost/core//boost_core + /boost/detail//boost_detail + /boost/type_traits//boost_type_traits ; import modules ; -import ../checks/config : requires ; +import-search /boost/config/checks ; +import config : requires ; local is_unix = [ modules.peek : UNIX ] ; @@ -98,7 +103,7 @@ test-suite config single BOOST_DYN_LINK=1 BOOST_CONFIG_NO_LIB=1 - vxworks:shared + vxworks:shared : config_link_test ] diff --git a/test/all/options_v2.jam b/test/all/options_v2.jam index ac748ef0d..aa7daca9f 100644 --- a/test/all/options_v2.jam +++ b/test/all/options_v2.jam @@ -1,12 +1,12 @@ # 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) project - : requirements + : requirements # threading tests require thread support turned on: multi ; - -local test-requirements = ../../test/build//boost_test_exec_monitor ; + +local test-requirements = /boost/test//boost_test_exec_monitor ; diff --git a/tools/Jamfile.v2 b/tools/Jamfile.v2 index de66b8d22..110843e01 100644 --- a/tools/Jamfile.v2 +++ b/tools/Jamfile.v2 @@ -1,11 +1,11 @@ # Copyright John Maddock 2005. -# 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) -run generate.cpp - ../../regex/build//boost_regex - ../../filesystem/build//boost_filesystem ../../system/build//boost_system +run generate.cpp + /boost/regex//boost_regex + /boost/filesystem//boost_filesystem /boost/system//boost_system : ../../.. ;