From 5c34125b142439f1c6b1ee646183d2a673b321f6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 1/8] Make the library modular usable. --- build.jam | 22 ++++++++++++++++++++++ test/Jamfile | 8 ++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 0000000..bfbd74c --- /dev/null +++ b/build.jam @@ -0,0 +1,22 @@ +# 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/variant2 + : common-requirements + /boost/assert//boost_assert + /boost/config//boost_config + /boost/mp11//boost_mp11 + include + ; + +explicit + [ alias boost_variant2 ] + [ alias all : boost_variant2 test ] + ; + +call-if : boost-library variant2 + ; diff --git a/test/Jamfile b/test/Jamfile index 85788b9..271279e 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -7,7 +7,7 @@ # http://www.boost.org/LICENSE_1_0.txt import testing ; -import ../../config/checks/config : requires ; +import config : requires ; project : default-build @@ -15,12 +15,16 @@ project extra : requirements + /boost/config//boost_config + /boost/container_hash//boost_container_hash + /boost/core//boost_core [ requires cxx11_variadic_templates cxx11_template_aliases cxx11_decltype cxx11_constexpr ] msvc:on gcc:on clang:on + ; run quick.cpp ; @@ -127,7 +131,7 @@ run variant_visit_by_index.cpp ; run variant_ostream_insert.cpp ; run is_output_streamable.cpp ; -local JSON = /boost//json/off "msvc-14.0:no" "msvc-14.2:-wd5104" "norecover:static" ; +local JSON = /boost/json//boost_json/off "msvc-14.0:no" "msvc-14.2:-wd5104" "norecover:static" ; run variant_json_value_from.cpp : : : $(JSON) ; run variant_json_value_to.cpp : : : $(JSON) ; From 09f3802347e373350e5b0e25d8fd1e1152d780bc Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:16:00 -0500 Subject: [PATCH 2/8] 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 bfbd74c..0a3fd5c 100644 --- a/build.jam +++ b/build.jam @@ -7,9 +7,9 @@ import project ; project /boost/variant2 : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/mp11//boost_mp11 + /boost/assert//boost_assert + /boost/config//boost_config + /boost/mp11//boost_mp11 include ; From 1324e32b3312f6f58ef81981b647bdcbc10b2f22 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 4 May 2024 23:33:36 -0500 Subject: [PATCH 3/8] 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 6552c2b..160c88d 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -7,6 +7,7 @@ # http://www.boost.org/LICENSE_1_0.txt import testing ; +import-search /boost/config/checks ; import config : requires ; project From bb13b5be08321eec1276dfc9dc78fa2853307e7f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 4/8] 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 0a3fd5c..a678597 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/variant2 From 4f207d7363dbbb845427be45cbc9ba9e0e54b839 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 5/8] 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 a678597..244288f 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/variant2 : common-requirements From fc088e72731e62552b596c79cd067dcdf22bab4e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 21:27:52 -0500 Subject: [PATCH 6/8] Change all references to . --- test/Jamfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/Jamfile b/test/Jamfile index a89cae8..2592d01 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -16,9 +16,9 @@ project extra : requirements - /boost/config//boost_config - /boost/container_hash//boost_container_hash - /boost/core//boost_core + /boost/config//boost_config + /boost/container_hash//boost_container_hash + /boost/core//boost_core msvc:on gcc:on From f874a2cb1b6faad89fb86da7eb915fb498903857 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:05 -0500 Subject: [PATCH 7/8] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 244288f..b561d81 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 ea4394914c6c32aa92c0c799ba41478cc27abe64 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:24 -0500 Subject: [PATCH 8/8] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build.jam b/build.jam index b561d81..c655191 100644 --- a/build.jam +++ b/build.jam @@ -5,18 +5,21 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/mp11//boost_mp11 ; + project /boost/variant2 : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/mp11//boost_mp11 include ; explicit - [ alias boost_variant2 ] + [ alias boost_variant2 : : : : $(boost_dependencies) ] [ alias all : boost_variant2 test ] ; call-if : boost-library variant2 ; +