From 3eab466b106e0f77594e412eb9475bb6610ec4dd Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:18 -0500 Subject: [PATCH 01/10] Make the library modular usable. --- build.jam | 22 ++++++++++++++++++++++ test/Jamfile | 9 +++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 0000000..bbb55f0 --- /dev/null +++ b/build.jam @@ -0,0 +1,22 @@ +# Copyright René Ferdinand Rivera Morell 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) + +import project ; + +project /boost/scope + : common-requirements + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + include + ; + +explicit + [ alias boost_scope ] + [ alias all : boost_scope test ] + ; + +call-if : boost-library scope + ; diff --git a/test/Jamfile b/test/Jamfile index 9481d5a..9921641 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -4,11 +4,14 @@ # (See accompanying file LICENSE_1_0.txt or copy at # https://www.boost.org/LICENSE_1_0.txt) +require-b2 5.0.1 ; +import-search /boost/config/checks ; + import testing ; import path ; import regex ; import os ; -import ../../config/checks/config : requires ; +import config : requires ; project : requirements @@ -43,6 +46,8 @@ project windows:_CRT_SECURE_NO_DEPRECATE ; +path-constant SCOPE_INCLUDE_DIR : ../include ; + # this rule enumerates through all the sources and invokes # the run rule for each source, the result is a list of all # the run rules, which we can pass on to the test_suite rule: @@ -53,7 +58,7 @@ rule test_all if ! [ os.environ BOOST_SCOPE_TEST_WITHOUT_SELF_CONTAINED_HEADER_TESTS ] { - local headers_path = [ path.make $(BOOST_ROOT)/libs/scope/include/boost/scope ] ; + local headers_path = [ path.make $(SCOPE_INCLUDE_DIR)/boost/scope ] ; for file in [ path.glob-tree $(headers_path) : *.hpp : detail ] { local rel_file = [ path.relative-to $(headers_path) $(file) ] ; From 5f33be780fa3a775f2bd70e3388aa0603ef861e6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:59 -0500 Subject: [PATCH 02/10] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.jam b/build.jam index bbb55f0..74906c2 100644 --- a/build.jam +++ b/build.jam @@ -7,9 +7,9 @@ import project ; project /boost/scope : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core include ; From f3f0a9c50e4ac35a0d6adf7249c6bbb9362cda44 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 4 May 2024 23:32:19 -0500 Subject: [PATCH 03/10] Add missing import-search for cconfig/predef checks. --- test/Jamfile | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Jamfile b/test/Jamfile index 9921641..ed4dc1a 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -11,6 +11,7 @@ import testing ; import path ; import regex ; import os ; +import-search /boost/config/checks ; import config : requires ; project From 183d5969c3ac5d3d861b91c99751d41975ff8c05 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 04/10] 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 74906c2..493a72e 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/scope From be6d50358f58e8ce30fd007b860bd849d928c60e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 13 May 2024 21:47:10 -0500 Subject: [PATCH 05/10] Update dependencies. --- build.jam | 1 + 1 file changed, 1 insertion(+) diff --git a/build.jam b/build.jam index 493a72e..901ab78 100644 --- a/build.jam +++ b/build.jam @@ -12,6 +12,7 @@ project /boost/scope /boost/assert//boost_assert /boost/config//boost_config /boost/core//boost_core + /boost/type_traits//boost_type_traits include ; From 9d63210075942b2375394ebcd8aebd3e7dd2fc34 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 06/10] 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 901ab78..019c20a 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/scope : common-requirements From 73b39e188d9071e510fdb504328ce02b6fb3ad7e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 21:41:36 -0500 Subject: [PATCH 07/10] Remove repeated import-search. --- test/Jamfile | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Jamfile b/test/Jamfile index ed4dc1a..f33f897 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -5,7 +5,6 @@ # https://www.boost.org/LICENSE_1_0.txt) require-b2 5.0.1 ; -import-search /boost/config/checks ; import testing ; import path ; From 3cf7a454879c7ab4e30c319c67b48f34be1cbb78 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:24 -0500 Subject: [PATCH 08/10] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/build.jam b/build.jam index 019c20a..dab25dc 100644 --- a/build.jam +++ b/build.jam @@ -5,19 +5,22 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/type_traits//boost_type_traits ; + project /boost/scope : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core - /boost/type_traits//boost_type_traits include ; explicit - [ alias boost_scope ] + [ alias boost_scope : : : : $(boost_dependencies) ] [ alias all : boost_scope test ] ; call-if : boost-library scope ; + From 290dba4a74fedee40726fb34f32020a23710ca9c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Jul 2024 11:39:44 -0500 Subject: [PATCH 09/10] Adjust doc build to avoid boost-root references. --- doc/Jamfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Jamfile b/doc/Jamfile index 0c8f86c..52cedf2 100644 --- a/doc/Jamfile +++ b/doc/Jamfile @@ -56,7 +56,7 @@ local doxygen_params = local top_level_includes = [ glob - ../../../boost/scope/*.hpp + ../include/boost/scope/*.hpp ] ; From 09e3dce1713f2f326126316a27135ebd792582f3 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Wed, 7 Aug 2024 23:50:05 -0500 Subject: [PATCH 10/10] Update build deps. --- test/Jamfile | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Jamfile b/test/Jamfile index f33f897..abb2f73 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -15,6 +15,7 @@ import config : requires ; project : requirements + /boost/scope//boost_scope common 1024