From 788313fda2408cf7c6e8aca394a60bf14dd6e995 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:16 -0500 Subject: [PATCH 01/15] Make the library modular usable. --- build.jam | 26 ++++++++++++++++++++++++++ test/Jamfile | 22 ++++++++++++++-------- 2 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 0000000000..0445d58cb4 --- /dev/null +++ b/build.jam @@ -0,0 +1,26 @@ +# Copyright René Ferdinand Rivera Morell 2023 +# 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) + +import project ; + +project /boost/smart_ptr + : common-requirements + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/move//boost_move + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + include + ; + +explicit + [ alias boost_smart_ptr ] + [ alias all : boost_smart_ptr test ] + ; + +call-if : boost-library smart_ptr + ; diff --git a/test/Jamfile b/test/Jamfile index dcc29d3ae0..73a551d47a 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -7,11 +7,17 @@ # accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +require-b2 5.0.1 ; +import-search /boost/config/checks ; +import config : requires ; import testing ; -import ../../config/checks/config : requires ; project : requirements + /boost/align//boost_align + /boost/container_hash//boost_container_hash + /boost/functional//boost_functional + /boost/smart_ptr//boost_smart_ptr gcc:-Wno-non-virtual-dtor gcc:-Wno-deprecated-declarations #gcc:-Wno-delete-non-virtual-dtor (not in 4.4/4.6) @@ -79,7 +85,7 @@ run shared_ptr_convertible_test.cpp ; run wp_convertible_test.cpp ; run ip_convertible_test.cpp ; run allocate_shared_test.cpp ; -run sp_atomic_test.cpp ; +run sp_atomic_test.cpp : : : /boost/atomic//boost_atomic ; run esft_void_test.cpp ; run esft_second_ptr_test.cpp ; run make_shared_esft_test.cpp ; @@ -251,7 +257,7 @@ compile make_shared_msvc_test.cpp ; compile lwm_win32_cs_test.cpp ; -run atomic_sp_test.cpp ; +run atomic_sp_test.cpp : : : /boost/atomic//boost_atomic ; run sp_constexpr_test.cpp ; run sp_constexpr_test2.cpp ; @@ -408,19 +414,19 @@ run lsp_hash_test2.cpp ; local MT = multi [ requires cxx11_decltype cxx11_noexcept ] gcc-4.6:no ; run atomic_count_mt_test.cpp - : : : $(MT) ; + : : : $(MT) /boost/bind//boost_bind ; run spinlock_mt_test.cpp - : : : $(MT) ; + : : : $(MT) /boost/bind//boost_bind ; run spinlock_pool_mt_test.cpp - : : : $(MT) ; + : : : $(MT) /boost/bind//boost_bind ; run shared_ptr_mt_test.cpp - : : : $(MT) ; + : : : $(MT) /boost/bind//boost_bind ; run weak_ptr_mt_test.cpp - : : : $(MT) ; + : : : $(MT) /boost/bind//boost_bind ; compile sp_report_implementation.cpp ; From ac9154d1e5668d37bbe3353cfd0271af19d9b9b1 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:59 -0500 Subject: [PATCH 02/15] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.jam b/build.jam index 0445d58cb4..d58ec702a5 100644 --- a/build.jam +++ b/build.jam @@ -7,13 +7,13 @@ import project ; project /boost/smart_ptr : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core - /boost/move//boost_move - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/move//boost_move + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits include ; From 4df3174d4a95bc1a92ef41d8a7f4a08e07bdda3d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 03/15] Add requires-b2 check to top-level build file. --- build.jam | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.jam b/build.jam index d58ec702a5..2cea92249f 100644 --- a/build.jam +++ b/build.jam @@ -3,6 +3,8 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +require-b2 5.1 ; + import project ; project /boost/smart_ptr From fc0eeeffa6e5328751516acb779fd331c26eda68 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 04/15] Bump B2 require to 5.2 --- build.jam | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.jam b/build.jam index 2cea92249f..17b53b9b9d 100644 --- a/build.jam +++ b/build.jam @@ -3,9 +3,7 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -require-b2 5.1 ; - -import project ; +require-b2 5.2 ; project /boost/smart_ptr : common-requirements From 0925dcce4e69484a3e77f3b0fdbb2b3dd5564104 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 21:25:39 -0500 Subject: [PATCH 05/15] Change all references to . --- test/Jamfile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/Jamfile b/test/Jamfile index 73a551d47a..37e55b088f 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -14,10 +14,10 @@ import testing ; project : requirements - /boost/align//boost_align - /boost/container_hash//boost_container_hash - /boost/functional//boost_functional - /boost/smart_ptr//boost_smart_ptr + /boost/align//boost_align + /boost/container_hash//boost_container_hash + /boost/functional//boost_functional + /boost/smart_ptr//boost_smart_ptr gcc:-Wno-non-virtual-dtor gcc:-Wno-deprecated-declarations #gcc:-Wno-delete-non-virtual-dtor (not in 4.4/4.6) @@ -85,7 +85,7 @@ run shared_ptr_convertible_test.cpp ; run wp_convertible_test.cpp ; run ip_convertible_test.cpp ; run allocate_shared_test.cpp ; -run sp_atomic_test.cpp : : : /boost/atomic//boost_atomic ; +run sp_atomic_test.cpp : : : /boost/atomic//boost_atomic ; run esft_void_test.cpp ; run esft_second_ptr_test.cpp ; run make_shared_esft_test.cpp ; @@ -257,7 +257,7 @@ compile make_shared_msvc_test.cpp ; compile lwm_win32_cs_test.cpp ; -run atomic_sp_test.cpp : : : /boost/atomic//boost_atomic ; +run atomic_sp_test.cpp : : : /boost/atomic//boost_atomic ; run sp_constexpr_test.cpp ; run sp_constexpr_test2.cpp ; @@ -414,19 +414,19 @@ run lsp_hash_test2.cpp ; local MT = multi [ requires cxx11_decltype cxx11_noexcept ] gcc-4.6:no ; run atomic_count_mt_test.cpp - : : : $(MT) /boost/bind//boost_bind ; + : : : $(MT) /boost/bind//boost_bind ; run spinlock_mt_test.cpp - : : : $(MT) /boost/bind//boost_bind ; + : : : $(MT) /boost/bind//boost_bind ; run spinlock_pool_mt_test.cpp - : : : $(MT) /boost/bind//boost_bind ; + : : : $(MT) /boost/bind//boost_bind ; run shared_ptr_mt_test.cpp - : : : $(MT) /boost/bind//boost_bind ; + : : : $(MT) /boost/bind//boost_bind ; run weak_ptr_mt_test.cpp - : : : $(MT) /boost/bind//boost_bind ; + : : : $(MT) /boost/bind//boost_bind ; compile sp_report_implementation.cpp ; From 4f9487d0f394cd645195e3b96f209ac22c168de4 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:03 -0500 Subject: [PATCH 06/15] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 17b53b9b9d..ceef583014 100644 --- a/build.jam +++ b/build.jam @@ -1,4 +1,4 @@ -# Copyright René Ferdinand Rivera Morell 2023 +# 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) From e86015f9f618fc355b450e861eee01e63527fd0d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:22 -0500 Subject: [PATCH 07/15] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/build.jam b/build.jam index ceef583014..d1eb008c7b 100644 --- a/build.jam +++ b/build.jam @@ -5,22 +5,25 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/move//boost_move + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits ; + project /boost/smart_ptr : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core - /boost/move//boost_move - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits include ; explicit - [ alias boost_smart_ptr ] + [ alias boost_smart_ptr : : : : $(boost_dependencies) ] [ alias all : boost_smart_ptr test ] ; call-if : boost-library smart_ptr ; + From 591d0e0728a2d18a1a88d243a2faff360437aa30 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 16 Aug 2024 21:52:55 -0500 Subject: [PATCH 08/15] Add test to depinst search to try and get functional. --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a97f6cebd6..3e151d868b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -218,7 +218,7 @@ jobs: cd boost-root cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY git submodule update --init tools/boostdep - python3 tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY + python3 tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" $LIBRARY ./bootstrap.sh ./b2 -d0 headers @@ -281,7 +281,7 @@ jobs: cd boost-root xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\ git submodule update --init tools/boostdep - python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY% + python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" %LIBRARY% cmd /c bootstrap b2 -d0 headers @@ -329,7 +329,7 @@ jobs: cd boost-root cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY git submodule update --init tools/boostdep - python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY + python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" $LIBRARY - name: Use library with add_subdirectory run: | @@ -377,7 +377,7 @@ jobs: cd boost-root cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY git submodule update --init tools/boostdep - python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY + python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" $LIBRARY - name: Configure run: | @@ -435,7 +435,7 @@ jobs: cd boost-root cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY git submodule update --init tools/boostdep - python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY + python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" $LIBRARY - name: Configure run: | @@ -484,7 +484,7 @@ jobs: cd boost-root xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\ git submodule update --init tools/boostdep - python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY% + python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" %LIBRARY% - name: Use library with add_subdirectory (Debug) shell: cmd @@ -533,7 +533,7 @@ jobs: cd boost-root xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\ git submodule update --init tools/boostdep - python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY% + python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" %LIBRARY% - name: Configure shell: cmd @@ -600,7 +600,7 @@ jobs: cd boost-root xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\ git submodule update --init tools/boostdep - python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY% + python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" %LIBRARY% - name: Configure shell: cmd From 6b826f11391ee4d1832407064f2d868a74736992 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 16 Aug 2024 22:29:05 -0500 Subject: [PATCH 09/15] Manually fetch functional, as depinst doesn't. --- .github/workflows/ci.yml | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e151d868b..fb5285b8a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -217,8 +217,9 @@ jobs: git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY - git submodule update --init tools/boostdep - python3 tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" $LIBRARY + git submodule update --init tools/boostdep libs/functional + python3 tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY + python3 tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional ./bootstrap.sh ./b2 -d0 headers @@ -280,8 +281,9 @@ jobs: 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%\ - git submodule update --init tools/boostdep - python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" %LIBRARY% + git submodule update --init tools/boostdep libs/functional + python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY% + python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional cmd /c bootstrap b2 -d0 headers @@ -328,8 +330,9 @@ jobs: git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY - git submodule update --init tools/boostdep - python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" $LIBRARY + git submodule update --init tools/boostdep libs/functional + python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY + python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional - name: Use library with add_subdirectory run: | @@ -376,8 +379,9 @@ jobs: git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY - git submodule update --init tools/boostdep - python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" $LIBRARY + git submodule update --init tools/boostdep libs/functional + python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY + python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional - name: Configure run: | @@ -434,8 +438,9 @@ jobs: git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY - git submodule update --init tools/boostdep - python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" $LIBRARY + git submodule update --init tools/boostdep libs/functional + python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY + python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional - name: Configure run: | @@ -483,8 +488,9 @@ jobs: 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%\ - git submodule update --init tools/boostdep - python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" %LIBRARY% + git submodule update --init tools/boostdep libs/functional + python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY% + python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional - name: Use library with add_subdirectory (Debug) shell: cmd @@ -532,8 +538,9 @@ jobs: 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%\ - git submodule update --init tools/boostdep - python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" %LIBRARY% + git submodule update --init tools/boostdep libs/functional + python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY% + python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional - name: Configure shell: cmd @@ -599,8 +606,9 @@ jobs: 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%\ - git submodule update --init tools/boostdep - python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" %LIBRARY% + git submodule update --init tools/boostdep libs/functional + python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY% + python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional - name: Configure shell: cmd From 72c25383d5ffa43588d4ea897208560d58eb7bd9 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 16 Aug 2024 23:25:09 -0500 Subject: [PATCH 10/15] Manually fetch functional, as depinst doesn't. --- .drone/drone.bat | 3 ++- .drone/drone.sh | 3 ++- appveyor.yml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.drone/drone.bat b/.drone/drone.bat index 66aaf78d41..d5cd407ae8 100644 --- a/.drone/drone.bat +++ b/.drone/drone.bat @@ -12,9 +12,10 @@ if "%DRONE_BRANCH%" == "master" set BOOST_BRANCH=master cd .. git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root -git submodule update --init tools/boostdep +git submodule update --init tools/boostdep libs/functional xcopy /s /e /q %DRONE_BUILD_DIR% libs\%LIBRARY%\ python tools/boostdep/depinst/depinst.py %LIBRARY% +python tools/boostdep/depinst/depinst.py functional cmd /c bootstrap b2 -d0 headers diff --git a/.drone/drone.sh b/.drone/drone.sh index 2f2125df86..5f35623e86 100755 --- a/.drone/drone.sh +++ b/.drone/drone.sh @@ -15,9 +15,10 @@ if [ "$DRONE_BRANCH" = "master" ]; then BOOST_BRANCH=master; fi cd .. git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root -git submodule update --init tools/boostdep +git submodule update --init tools/boostdep libs/functional cp -r $DRONE_BUILD_DIR/* libs/$LIBRARY python tools/boostdep/depinst/depinst.py $LIBRARY +python tools/boostdep/depinst/depinst.py functional ./bootstrap.sh ./b2 -d0 headers diff --git a/appveyor.yml b/appveyor.yml index dce3c6449b..e2cc74eb6f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -61,8 +61,9 @@ install: - git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root - cd boost-root - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\smart_ptr\ - - git submodule update --init tools/boostdep + - git submodule update --init tools/boostdep libs/functional - python tools/boostdep/depinst/depinst.py smart_ptr + - python tools/boostdep/depinst/depinst.py functional - cmd /c bootstrap - b2 -d0 headers From 960741cb2e0e544a40449fc6189bf011afb0409e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 17 Aug 2024 12:04:30 -0500 Subject: [PATCH 11/15] Replace functional deps with correct container_hash deps. --- .drone/drone.bat | 1 - .drone/drone.sh | 1 - .github/workflows/ci.yml | 8 -------- appveyor.yml | 1 - test/Jamfile | 1 - 5 files changed, 12 deletions(-) diff --git a/.drone/drone.bat b/.drone/drone.bat index d5cd407ae8..6aa806af3d 100644 --- a/.drone/drone.bat +++ b/.drone/drone.bat @@ -15,7 +15,6 @@ cd boost-root git submodule update --init tools/boostdep libs/functional xcopy /s /e /q %DRONE_BUILD_DIR% libs\%LIBRARY%\ python tools/boostdep/depinst/depinst.py %LIBRARY% -python tools/boostdep/depinst/depinst.py functional cmd /c bootstrap b2 -d0 headers diff --git a/.drone/drone.sh b/.drone/drone.sh index 5f35623e86..eb662eec70 100755 --- a/.drone/drone.sh +++ b/.drone/drone.sh @@ -18,7 +18,6 @@ cd boost-root git submodule update --init tools/boostdep libs/functional cp -r $DRONE_BUILD_DIR/* libs/$LIBRARY python tools/boostdep/depinst/depinst.py $LIBRARY -python tools/boostdep/depinst/depinst.py functional ./bootstrap.sh ./b2 -d0 headers diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb5285b8a3..82ec348767 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -219,7 +219,6 @@ jobs: cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY git submodule update --init tools/boostdep libs/functional python3 tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY - python3 tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional ./bootstrap.sh ./b2 -d0 headers @@ -283,7 +282,6 @@ jobs: xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\ git submodule update --init tools/boostdep libs/functional python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY% - python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional cmd /c bootstrap b2 -d0 headers @@ -332,7 +330,6 @@ jobs: cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY git submodule update --init tools/boostdep libs/functional python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY - python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional - name: Use library with add_subdirectory run: | @@ -381,7 +378,6 @@ jobs: cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY git submodule update --init tools/boostdep libs/functional python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY - python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional - name: Configure run: | @@ -440,7 +436,6 @@ jobs: cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY git submodule update --init tools/boostdep libs/functional python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY - python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional - name: Configure run: | @@ -490,7 +485,6 @@ jobs: xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\ git submodule update --init tools/boostdep libs/functional python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY% - python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional - name: Use library with add_subdirectory (Debug) shell: cmd @@ -540,7 +534,6 @@ jobs: xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\ git submodule update --init tools/boostdep libs/functional python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY% - python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional - name: Configure shell: cmd @@ -608,7 +601,6 @@ jobs: xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\ git submodule update --init tools/boostdep libs/functional python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY% - python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional - name: Configure shell: cmd diff --git a/appveyor.yml b/appveyor.yml index e2cc74eb6f..3f1fe3a5b3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -63,7 +63,6 @@ install: - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\smart_ptr\ - git submodule update --init tools/boostdep libs/functional - python tools/boostdep/depinst/depinst.py smart_ptr - - python tools/boostdep/depinst/depinst.py functional - cmd /c bootstrap - b2 -d0 headers diff --git a/test/Jamfile b/test/Jamfile index 37e55b088f..683e9b190c 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -16,7 +16,6 @@ project : requirements /boost/align//boost_align /boost/container_hash//boost_container_hash - /boost/functional//boost_functional /boost/smart_ptr//boost_smart_ptr gcc:-Wno-non-virtual-dtor gcc:-Wno-deprecated-declarations From c33504189a202a50a5be7184f311424f020841c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Ferdinand=20Rivera=20Morell?= Date: Sun, 18 Aug 2024 11:18:24 -0500 Subject: [PATCH 12/15] Remove CI fetch of functional. --- .drone/drone.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone/drone.bat b/.drone/drone.bat index 6aa806af3d..66aaf78d41 100644 --- a/.drone/drone.bat +++ b/.drone/drone.bat @@ -12,7 +12,7 @@ if "%DRONE_BRANCH%" == "master" set BOOST_BRANCH=master cd .. git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root -git submodule update --init tools/boostdep libs/functional +git submodule update --init tools/boostdep xcopy /s /e /q %DRONE_BUILD_DIR% libs\%LIBRARY%\ python tools/boostdep/depinst/depinst.py %LIBRARY% cmd /c bootstrap From 11e56a4ad9f551b1dfdb3d5536a28af4f769f74e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Ferdinand=20Rivera=20Morell?= Date: Sun, 18 Aug 2024 11:18:51 -0500 Subject: [PATCH 13/15] Remove CI fetch of functional. --- .drone/drone.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone/drone.sh b/.drone/drone.sh index eb662eec70..2f2125df86 100755 --- a/.drone/drone.sh +++ b/.drone/drone.sh @@ -15,7 +15,7 @@ if [ "$DRONE_BRANCH" = "master" ]; then BOOST_BRANCH=master; fi cd .. git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root -git submodule update --init tools/boostdep libs/functional +git submodule update --init tools/boostdep cp -r $DRONE_BUILD_DIR/* libs/$LIBRARY python tools/boostdep/depinst/depinst.py $LIBRARY ./bootstrap.sh From 7caada352c1d7124a89f2d873f6d50e3c3cb81ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Ferdinand=20Rivera=20Morell?= Date: Sun, 18 Aug 2024 11:20:26 -0500 Subject: [PATCH 14/15] Remove CI fetch of functional. --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82ec348767..a97f6cebd6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -217,7 +217,7 @@ jobs: git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY - git submodule update --init tools/boostdep libs/functional + git submodule update --init tools/boostdep python3 tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY ./bootstrap.sh ./b2 -d0 headers @@ -280,7 +280,7 @@ jobs: 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%\ - git submodule update --init tools/boostdep libs/functional + git submodule update --init tools/boostdep python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY% cmd /c bootstrap b2 -d0 headers @@ -328,7 +328,7 @@ jobs: git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY - git submodule update --init tools/boostdep libs/functional + git submodule update --init tools/boostdep python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY - name: Use library with add_subdirectory @@ -376,7 +376,7 @@ jobs: git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY - git submodule update --init tools/boostdep libs/functional + git submodule update --init tools/boostdep python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY - name: Configure @@ -434,7 +434,7 @@ jobs: git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY - git submodule update --init tools/boostdep libs/functional + git submodule update --init tools/boostdep python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY - name: Configure @@ -483,7 +483,7 @@ jobs: 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%\ - git submodule update --init tools/boostdep libs/functional + git submodule update --init tools/boostdep python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY% - name: Use library with add_subdirectory (Debug) @@ -532,7 +532,7 @@ jobs: 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%\ - git submodule update --init tools/boostdep libs/functional + git submodule update --init tools/boostdep python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY% - name: Configure @@ -599,7 +599,7 @@ jobs: 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%\ - git submodule update --init tools/boostdep libs/functional + git submodule update --init tools/boostdep python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY% - name: Configure From f5152b090427b374d6f175530eb12d017d49f885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Ferdinand=20Rivera=20Morell?= Date: Sun, 18 Aug 2024 11:20:51 -0500 Subject: [PATCH 15/15] Remove CI fetch of functional. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3f1fe3a5b3..dce3c6449b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -61,7 +61,7 @@ install: - git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root - cd boost-root - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\smart_ptr\ - - git submodule update --init tools/boostdep libs/functional + - git submodule update --init tools/boostdep - python tools/boostdep/depinst/depinst.py smart_ptr - cmd /c bootstrap - b2 -d0 headers