From 7ed6bf5bcaf58b3610855accb7da3535a03b0b4c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 01/10] Make the library modular usable. --- build.jam | 29 +++++++++++++++++++++++++++++ test/Jamfile.v2 | 4 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 0000000..277138b --- /dev/null +++ b/build.jam @@ -0,0 +1,29 @@ +# 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/optional + : common-requirements + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/detail//boost_detail + /boost/move//boost_move + /boost/predef//boost_predef + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + /boost/utility//boost_utility + include + ; + +explicit + [ alias boost_optional ] + [ alias all : boost_optional test ] + ; + +call-if : boost-library optional + ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 00bf152..41ed887 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -15,7 +15,7 @@ import testing ; -run optional_test.cpp ; +run optional_test.cpp : : : /boost/bind//boost_bind /boost/mpl//boost_mpl ; run optional_test_assign.cpp ; run optional_test_swap.cpp ; compile optional_test_wuninitialized.cpp ; @@ -27,7 +27,7 @@ run optional_test_make_optional.cpp ; run optional_test_flat_map.cpp ; run optional_test_hash.cpp ; run optional_test_map.cpp ; -run optional_test_tie.cpp ; +run optional_test_tie.cpp : : : /boost/tuple//boost_tuple ; run optional_test_ref_assign_portable_minimum.cpp ; run optional_test_ref_assign_mutable_int.cpp ; run optional_test_ref_assign_const_int.cpp ; From 81f4543d814cb40f41bc2479bb20f8d1c7c7058a 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 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build.jam b/build.jam index 277138b..78e5723 100644 --- a/build.jam +++ b/build.jam @@ -7,16 +7,16 @@ import project ; project /boost/optional : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core - /boost/detail//boost_detail - /boost/move//boost_move - /boost/predef//boost_predef - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits - /boost/utility//boost_utility + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/detail//boost_detail + /boost/move//boost_move + /boost/predef//boost_predef + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + /boost/utility//boost_utility include ; From 1f473d259697bbd0b5355750a241cc7feccf50c2 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 03/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 78e5723..0600c23 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/optional From 9a2c5ec37b1e2d1846f774a857da1820ab0cf21b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 13 May 2024 21:46:33 -0500 Subject: [PATCH 04/10] Update dependencies. --- build.jam | 1 - 1 file changed, 1 deletion(-) diff --git a/build.jam b/build.jam index 0600c23..351a50f 100644 --- a/build.jam +++ b/build.jam @@ -12,7 +12,6 @@ project /boost/optional /boost/assert//boost_assert /boost/config//boost_config /boost/core//boost_core - /boost/detail//boost_detail /boost/move//boost_move /boost/predef//boost_predef /boost/static_assert//boost_static_assert From 6bd32078b4ce59f69ba6878db604f31d77a9a569 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 05/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 351a50f..a56da64 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/optional : common-requirements From 8ffcf0f369ce2becc03e3938607cc492d03a795e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 19:41:37 -0500 Subject: [PATCH 06/10] Change all references to . --- test/Jamfile.v2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 41ed887..0f6124c 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -15,7 +15,7 @@ import testing ; -run optional_test.cpp : : : /boost/bind//boost_bind /boost/mpl//boost_mpl ; +run optional_test.cpp : : : /boost/bind//boost_bind /boost/mpl//boost_mpl ; run optional_test_assign.cpp ; run optional_test_swap.cpp ; compile optional_test_wuninitialized.cpp ; @@ -27,7 +27,7 @@ run optional_test_make_optional.cpp ; run optional_test_flat_map.cpp ; run optional_test_hash.cpp ; run optional_test_map.cpp ; -run optional_test_tie.cpp : : : /boost/tuple//boost_tuple ; +run optional_test_tie.cpp : : : /boost/tuple//boost_tuple ; run optional_test_ref_assign_portable_minimum.cpp ; run optional_test_ref_assign_mutable_int.cpp ; run optional_test_ref_assign_const_int.cpp ; From dfe19159308665e4e5fe0cfa6b013ea89f9059b6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:04 -0500 Subject: [PATCH 07/10] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index a56da64..9efbcaa 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 bf10cf91c2c367ac925dd79b748d89c06143b947 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:22 -0500 Subject: [PATCH 08/10] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/build.jam b/build.jam index 9efbcaa..91e6606 100644 --- a/build.jam +++ b/build.jam @@ -5,24 +5,27 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/move//boost_move + /boost/predef//boost_predef + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + /boost/utility//boost_utility ; + project /boost/optional : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core - /boost/move//boost_move - /boost/predef//boost_predef - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits - /boost/utility//boost_utility include ; explicit - [ alias boost_optional ] + [ alias boost_optional : : : : $(boost_dependencies) ] [ alias all : boost_optional test ] ; call-if : boost-library optional ; + From 4c503758fe74665c51917039f1ec2d505186f207 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 4 Aug 2024 11:58:57 -0500 Subject: [PATCH 09/10] Update build deps. --- test/Jamfile.v2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 0f6124c..f06d4aa 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -15,6 +15,8 @@ import testing ; +project : requirements /boost/optional//boost_optional ; + run optional_test.cpp : : : /boost/bind//boost_bind /boost/mpl//boost_mpl ; run optional_test_assign.cpp ; run optional_test_swap.cpp ; From 4ce395e14d177adc5432daf6af1746f9bc3b72e0 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 31 Aug 2024 14:09:34 -0500 Subject: [PATCH 10/10] Update build deps. --- build.jam | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/build.jam b/build.jam index 91e6606..5c8089b 100644 --- a/build.jam +++ b/build.jam @@ -10,19 +10,14 @@ constant boost_dependencies : /boost/config//boost_config /boost/core//boost_core /boost/move//boost_move - /boost/predef//boost_predef /boost/static_assert//boost_static_assert /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits - /boost/utility//boost_utility ; + /boost/type_traits//boost_type_traits ; -project /boost/optional - : common-requirements - include - ; +project /boost/optional ; explicit - [ alias boost_optional : : : : $(boost_dependencies) ] + [ alias boost_optional : : : : $(boost_dependencies) include ] [ alias all : boost_optional test ] ;