From 048e860e5990aa909729372e1216e1f1615a5f6b 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 | 36 ++++++++++++++++++++++++++++++++++++ test/Jamfile.v2 | 16 ++++++++++------ 2 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 0000000..6fd682e --- /dev/null +++ b/build.jam @@ -0,0 +1,36 @@ +# 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/range + : common-requirements + /boost/array//boost_array + /boost/assert//boost_assert + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/container_hash//boost_container_hash + /boost/conversion//boost_conversion + /boost/core//boost_core + /boost/detail//boost_detail + /boost/iterator//boost_iterator + /boost/mpl//boost_mpl + /boost/optional//boost_optional + /boost/preprocessor//boost_preprocessor + /boost/regex//boost_regex + /boost/static_assert//boost_static_assert + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits + /boost/utility//boost_utility + include + ; + +explicit + [ alias boost_range ] + [ alias all : boost_range test ] + ; + +call-if : boost-library range + ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index cd2774e..2157015 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -14,19 +14,23 @@ import testing ; project : requirements - /boost/test//boost_unit_test_framework/ - /boost/regex//boost_regex/ + /boost/assign//boost_assign + /boost/foreach//boost_foreach + /boost/lambda//boost_lambda + /boost/regex//boost_regex/static + /boost/test//boost_unit_test_framework + /boost/variant//boost_variant static multi ; -rule range-test ( name : includes * ) +rule range-test ( name : requirements * ) { return [ - run $(name).cpp /boost/test//boost_unit_test_framework /boost/regex//boost_regex/static + run $(name).cpp : : - : gcc:"-Wall -Wunused " + : gcc:"-Wall -Wunused " $(requirements) ] ; } @@ -67,7 +71,7 @@ test-suite range : [ range-test adaptor_test/sliced ] [ range-test adaptor_test/strided ] [ range-test adaptor_test/strided2 ] - [ range-test adaptor_test/ticket_6742_transformed_c4789_warning ] + [ range-test adaptor_test/ticket_6742_transformed_c4789_warning : /boost/phoenix//boost_phoenix ] [ range-test adaptor_test/ticket_8676_sliced_transformed ] [ range-test adaptor_test/ticket_9519_strided_reversed ] [ range-test adaptor_test/tokenized ] From a9c1add21cf7e3ed849ee18a6ad90dcca260afe6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:59 -0500 Subject: [PATCH 2/8] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/build.jam b/build.jam index 6fd682e..f7e1529 100644 --- a/build.jam +++ b/build.jam @@ -7,23 +7,23 @@ import project ; project /boost/range : common-requirements - /boost/array//boost_array - /boost/assert//boost_assert - /boost/concept_check//boost_concept_check - /boost/config//boost_config - /boost/container_hash//boost_container_hash - /boost/conversion//boost_conversion - /boost/core//boost_core - /boost/detail//boost_detail - /boost/iterator//boost_iterator - /boost/mpl//boost_mpl - /boost/optional//boost_optional - /boost/preprocessor//boost_preprocessor - /boost/regex//boost_regex - /boost/static_assert//boost_static_assert - /boost/tuple//boost_tuple - /boost/type_traits//boost_type_traits - /boost/utility//boost_utility + /boost/array//boost_array + /boost/assert//boost_assert + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/container_hash//boost_container_hash + /boost/conversion//boost_conversion + /boost/core//boost_core + /boost/detail//boost_detail + /boost/iterator//boost_iterator + /boost/mpl//boost_mpl + /boost/optional//boost_optional + /boost/preprocessor//boost_preprocessor + /boost/regex//boost_regex + /boost/static_assert//boost_static_assert + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits + /boost/utility//boost_utility include ; From 422c4d9b42a7f5ec800a98074e65eb11688e6837 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 3/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 f7e1529..38c29fc 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/range From 6a13721e44a9fc43a851658aabffc709c18c43b0 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 4/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 38c29fc..a4f2dcd 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/range : common-requirements From c31588ed066343a2683b1c718b3a2603d4fe5af8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 19:42:16 -0500 Subject: [PATCH 5/8] Change all references to . --- test/Jamfile.v2 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 2157015..4396ba8 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -14,12 +14,12 @@ import testing ; project : requirements - /boost/assign//boost_assign - /boost/foreach//boost_foreach - /boost/lambda//boost_lambda - /boost/regex//boost_regex/static - /boost/test//boost_unit_test_framework - /boost/variant//boost_variant + /boost/assign//boost_assign + /boost/foreach//boost_foreach + /boost/lambda//boost_lambda + /boost/regex//boost_regex/static + /boost/test//boost_unit_test_framework + /boost/variant//boost_variant static multi ; @@ -71,7 +71,7 @@ test-suite range : [ range-test adaptor_test/sliced ] [ range-test adaptor_test/strided ] [ range-test adaptor_test/strided2 ] - [ range-test adaptor_test/ticket_6742_transformed_c4789_warning : /boost/phoenix//boost_phoenix ] + [ range-test adaptor_test/ticket_6742_transformed_c4789_warning : /boost/phoenix//boost_phoenix ] [ range-test adaptor_test/ticket_8676_sliced_transformed ] [ range-test adaptor_test/ticket_9519_strided_reversed ] [ range-test adaptor_test/tokenized ] From e3ac7974f38987b7024d6fbbfd621e6d98d7cfc7 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:04 -0500 Subject: [PATCH 6/8] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index a4f2dcd..1aa06dc 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 2b6fd29168d8e4b4cd2c193f5d4fe631af43368a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:23 -0500 Subject: [PATCH 7/8] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/build.jam b/build.jam index 1aa06dc..13efa2f 100644 --- a/build.jam +++ b/build.jam @@ -5,32 +5,35 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/array//boost_array + /boost/assert//boost_assert + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/container_hash//boost_container_hash + /boost/conversion//boost_conversion + /boost/core//boost_core + /boost/detail//boost_detail + /boost/iterator//boost_iterator + /boost/mpl//boost_mpl + /boost/optional//boost_optional + /boost/preprocessor//boost_preprocessor + /boost/regex//boost_regex + /boost/static_assert//boost_static_assert + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits + /boost/utility//boost_utility ; + project /boost/range : common-requirements - /boost/array//boost_array - /boost/assert//boost_assert - /boost/concept_check//boost_concept_check - /boost/config//boost_config - /boost/container_hash//boost_container_hash - /boost/conversion//boost_conversion - /boost/core//boost_core - /boost/detail//boost_detail - /boost/iterator//boost_iterator - /boost/mpl//boost_mpl - /boost/optional//boost_optional - /boost/preprocessor//boost_preprocessor - /boost/regex//boost_regex - /boost/static_assert//boost_static_assert - /boost/tuple//boost_tuple - /boost/type_traits//boost_type_traits - /boost/utility//boost_utility include ; explicit - [ alias boost_range ] + [ alias boost_range : : : : $(boost_dependencies) ] [ alias all : boost_range test ] ; call-if : boost-library range ; + From a377e87bfcb1a57dc96ce9d82ac82a235bf93593 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 7 Apr 2025 21:24:57 -0500 Subject: [PATCH 8/8] Move project global include to target local include. --- build.jam | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build.jam b/build.jam index 13efa2f..97d068e 100644 --- a/build.jam +++ b/build.jam @@ -25,15 +25,13 @@ constant boost_dependencies : /boost/utility//boost_utility ; project /boost/range - : common-requirements - include ; explicit - [ alias boost_range : : : : $(boost_dependencies) ] + [ alias boost_range : : : + : include $(boost_dependencies) ] [ alias all : boost_range test ] ; call-if : boost-library range ; -