From 95f4544d4ddc640105b28e08a5a5d380721a1ec5 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 1/7] Make the library modular usable. --- build.jam | 25 +++++++++++++++++++++++++ test/Jamfile.v2 | 22 ++++++++++++---------- 2 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 00000000..54255c29 --- /dev/null +++ b/build.jam @@ -0,0 +1,25 @@ +# 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/integer + : common-requirements + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + include + ; + +explicit + [ alias boost_integer ] + [ alias all : boost_integer test ] + ; + +call-if : boost-library integer + ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index acefec01..2e04cd7f 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -2,8 +2,10 @@ #~ Distributed under the Boost Software License, Version 1.0. #~ (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 config : requires ; import testing ; -import ../../config/checks/config : requires ; project : requirements all gcc:-Wextra ; @@ -13,18 +15,18 @@ explicit has_gmpxx ; test-suite integer : [ run integer_traits_test.cpp ] - [ run integer_test.cpp : : : gcc:-Wno-long-long darwin:-Wno-long-long sun:"-Qoption ccfe -tmpldepth=128" ] - [ run integer_mask_test.cpp ] - [ run integer_log2_test.cpp ] - [ run static_log2_test.cpp ] - [ run static_min_max_test.cpp ] - [ run extended_euclidean_test.cpp ] - [ run mod_inverse_test.cpp ] + [ run integer_test.cpp : : : /boost/mpl//boost_mpl gcc:-Wno-long-long darwin:-Wno-long-long sun:"-Qoption ccfe -tmpldepth=128" ] + [ run integer_mask_test.cpp : : : /boost/detail//boost_detail ] + [ run integer_log2_test.cpp : : : /boost/multiprecision//boost_multiprecision ] + [ run static_log2_test.cpp : : : /boost/detail//boost_detail ] + [ run static_min_max_test.cpp : : : /boost/detail//boost_detail ] + [ run extended_euclidean_test.cpp : : : /boost/multiprecision//boost_multiprecision ] + [ run mod_inverse_test.cpp : : : /boost/optional//boost_optional /boost/multiprecision//boost_multiprecision ] [ compile integer_traits_include_test.cpp ] [ compile integer_include_test.cpp ] [ compile integer_mask_include_test.cpp ] [ compile static_log2_include_test.cpp ] - [ compile static_min_max_include_test.cpp ] + [ compile static_min_max_include_test.cpp : /boost/detail//boost_detail ] [ compile integer_fwd_include_test.cpp ] [ compile gcd_constexpr14_test.cpp ] [ compile gcd_noexcept_test.cpp ] @@ -35,5 +37,5 @@ test-suite integer [ compile-fail fail_uint_fast.cpp ] [ compile-fail fail_uint_least.cpp ] [ compile-fail fail_uint_65.cpp ] - [ run common_factor_test.cpp : : : [ check-target-builds has_gmpxx "Checking for gmpxx.h" : BOOST_INTEGER_HAS_GMPXX_H=1 -lgmp -lgmpxx ] ] + [ run common_factor_test.cpp : : : /boost/mpl//boost_mpl /boost/random//boost_random /boost/rational//boost_rational /boost/multiprecision//boost_multiprecision [ check-target-builds has_gmpxx "Checking for gmpxx.h" : BOOST_INTEGER_HAS_GMPXX_H=1 -lgmp -lgmpxx ] ] ; From 79447010620d4ffec8fa66d23f1840a4600522e8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:59 -0500 Subject: [PATCH 2/7] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.jam b/build.jam index 54255c29..ce6fe567 100644 --- a/build.jam +++ b/build.jam @@ -7,12 +7,12 @@ import project ; project /boost/integer : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core - /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/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits include ; From 89da4e2173b85f49c56693520d8b9eefc5ff194f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 3/7] 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 ce6fe567..e075ea16 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/integer From ded2b6725e86f8de0ec58d71d3f5c40679f41df7 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:55 -0500 Subject: [PATCH 4/7] 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 e075ea16..27c35949 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/integer : common-requirements From a72563da996803d71bcc6d0c3a5075777764a78b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:03 -0500 Subject: [PATCH 5/7] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 27c35949..db1633a3 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 69c43b4297ab677127579994f93dcf245b66a63f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:22 -0500 Subject: [PATCH 6/7] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/build.jam b/build.jam index db1633a3..2424875e 100644 --- a/build.jam +++ b/build.jam @@ -5,21 +5,24 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits ; + project /boost/integer : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits include ; explicit - [ alias boost_integer ] + [ alias boost_integer : : : : $(boost_dependencies) ] [ alias all : boost_integer test ] ; call-if : boost-library integer ; + From e1db1666c25f62eabeffe8f0251c0847a3eaade0 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 3 Aug 2024 15:28:50 -0500 Subject: [PATCH 7/7] Update build deps. --- test/Jamfile.v2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 2e04cd7f..57ff2720 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -7,7 +7,8 @@ import-search /boost/config/checks ; import config : requires ; import testing ; -project : requirements all gcc:-Wextra ; +project : requirements all gcc:-Wextra + /boost/integer//boost_integer ; obj has_gmpxx : has_gmpxx.cpp ; explicit has_gmpxx ;