From d5f5a124eec14a32b5e3df5661e1c1313a6e2116 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:27:02 -0500 Subject: [PATCH 1/9] Make the library modular usable. --- build.jam | 32 ++++++++++++++++++++++++++++++++ example/Jamfile.v2 | 31 +++++++++++++++++++++---------- test/Jamfile.v2 | 22 ++++++++++++++++------ test/test_bimap_ordered.cpp | 2 +- test/test_bimap_sequenced.cpp | 2 +- test/test_bimap_unordered.cpp | 2 +- 6 files changed, 72 insertions(+), 19 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 00000000..ce89b9a3 --- /dev/null +++ b/build.jam @@ -0,0 +1,32 @@ +# 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/bimap + : common-requirements + include + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/container_hash//boost_container_hash + /boost/core//boost_core + /boost/iterator//boost_iterator + /boost/lambda//boost_lambda + /boost/mpl//boost_mpl + /boost/multi_index//boost_multi_index + /boost/preprocessor//boost_preprocessor + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + /boost/utility//boost_utility + ; + +explicit + [ alias boost_bimap ] + [ alias all : boost_bimap example test ] + ; + +call-if : boost-library bimap + ; diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 42416294..0c241c89 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -15,8 +15,11 @@ test-suite "examples" [ run simple_bimap.cpp ] [ run tagged_simple_bimap.cpp ] [ run step_by_step.cpp ] - [ run population_bimap.cpp ] - [ run repetitions_counter.cpp ] + [ run population_bimap.cpp + /boost/assign//boost_assign + /boost/foreach//boost_foreach ] + [ run repetitions_counter.cpp + /boost/tokenizer//boost_tokenizer ] [ compile user_defined_names.cpp ] [ run standard_map_comparison.cpp ] [ run at_function_examples.cpp ] @@ -30,11 +33,15 @@ test-suite "examples" test-suite "bimap_and_boost" : [ run bimap_and_boost/property_map.cpp ] - [ run bimap_and_boost/range.cpp ] - [ run bimap_and_boost/foreach.cpp ] + [ run bimap_and_boost/range.cpp + /boost/range//boost_range ] + [ run bimap_and_boost/foreach.cpp + /boost/foreach//boost_foreach ] [ run bimap_and_boost/lambda.cpp ] - [ run bimap_and_boost/assign.cpp ] - [ run bimap_and_boost/xpressive.cpp ] + [ run bimap_and_boost/assign.cpp + /boost/assign//boost_assign ] + [ run bimap_and_boost/xpressive.cpp + /boost/xpressive//boost_xpressive ] [ run bimap_and_boost/typeof.cpp ] [ run bimap_and_boost/serialization.cpp /boost/serialization//boost_serialization ] @@ -42,9 +49,13 @@ test-suite "bimap_and_boost" test-suite "mi_to_b_path" : - [ compile mi_to_b_path/bidirectional_map.cpp ] - [ run mi_to_b_path/hashed_indices.cpp ] + [ compile mi_to_b_path/bidirectional_map.cpp + /boost/tokenizer//boost_tokenizer ] + [ run mi_to_b_path/hashed_indices.cpp + /boost/tokenizer//boost_tokenizer ] [ compile mi_to_b_path/tagged_bidirectional_map.cpp ] - [ compile mi_to_b_path/mi_bidirectional_map.cpp ] - [ run mi_to_b_path/mi_hashed_indices.cpp ] + [ compile mi_to_b_path/mi_bidirectional_map.cpp + /boost/tokenizer//boost_tokenizer ] + [ run mi_to_b_path/mi_hashed_indices.cpp + /boost/tokenizer//boost_tokenizer ] ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index f7991ef0..c8b23ffd 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -9,6 +9,9 @@ # bring in rules for testing import testing ; +project : requirements + . + ; test-suite "tagged_test" : @@ -41,10 +44,12 @@ test-suite "bimap_test" [ run test_bimap_sequenced.cpp : : : gcc-4.4.7,release:no ] [ run test_bimap_unconstrained.cpp ] - [ run test_bimap_assign.cpp ] + [ run test_bimap_assign.cpp + /boost/assign//boost_assign ] [ run test_bimap_property_map.cpp ] [ run test_bimap_modify.cpp ] - [ run test_bimap_range.cpp ] + [ run test_bimap_range.cpp + /boost/range//boost_range ] [ run test_bimap_operator_bracket.cpp ] [ run test_bimap_lambda.cpp ] [ run test_bimap_mutable.cpp ] @@ -70,11 +75,16 @@ test-suite "compile_fail_test" test-suite "bimap_and_boost" : [ run ../example/bimap_and_boost/property_map.cpp ] - [ run ../example/bimap_and_boost/range.cpp ] - [ run ../example/bimap_and_boost/foreach.cpp ] + [ run ../example/bimap_and_boost/range.cpp + /boost/range//boost_range ] + [ run ../example/bimap_and_boost/foreach.cpp + /boost/foreach//boost_foreach ] [ run ../example/bimap_and_boost/lambda.cpp ] - [ run ../example/bimap_and_boost/assign.cpp ] - [ run ../example/bimap_and_boost/xpressive.cpp : : : + [ run ../example/bimap_and_boost/assign.cpp + /boost/assign//boost_assign ] + [ run ../example/bimap_and_boost/xpressive.cpp + /boost/xpressive//boost_xpressive + : : : gcc-10,03:no gcc-11,03:no ] [ run ../example/bimap_and_boost/typeof.cpp ] diff --git a/test/test_bimap_ordered.cpp b/test/test_bimap_ordered.cpp index ec0d9244..f6b62d0d 100644 --- a/test/test_bimap_ordered.cpp +++ b/test/test_bimap_ordered.cpp @@ -34,7 +34,7 @@ // bimap container #include -#include +#include struct left_tag {}; struct right_tag {}; diff --git a/test/test_bimap_sequenced.cpp b/test/test_bimap_sequenced.cpp index 20616278..1e868acd 100644 --- a/test/test_bimap_sequenced.cpp +++ b/test/test_bimap_sequenced.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include struct left_tag {}; struct right_tag {}; diff --git a/test/test_bimap_unordered.cpp b/test/test_bimap_unordered.cpp index 486072cd..aa0120e2 100644 --- a/test/test_bimap_unordered.cpp +++ b/test/test_bimap_unordered.cpp @@ -34,7 +34,7 @@ // bimap container #include -#include +#include struct left_tag {}; struct right_tag {}; From 77cbf6075a8bc56744301cb246da8d3145ce2080 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:12:36 -0500 Subject: [PATCH 2/9] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/build.jam b/build.jam index ce89b9a3..4baa9caf 100644 --- a/build.jam +++ b/build.jam @@ -8,19 +8,19 @@ import project ; project /boost/bimap : common-requirements include - /boost/concept_check//boost_concept_check - /boost/config//boost_config - /boost/container_hash//boost_container_hash - /boost/core//boost_core - /boost/iterator//boost_iterator - /boost/lambda//boost_lambda - /boost/mpl//boost_mpl - /boost/multi_index//boost_multi_index - /boost/preprocessor//boost_preprocessor - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits - /boost/utility//boost_utility + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/container_hash//boost_container_hash + /boost/core//boost_core + /boost/iterator//boost_iterator + /boost/lambda//boost_lambda + /boost/mpl//boost_mpl + /boost/multi_index//boost_multi_index + /boost/preprocessor//boost_preprocessor + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + /boost/utility//boost_utility ; explicit From 3e387ecb4a6a8b0a7cdce997d0ce5ac42cb36f3f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 25 Apr 2024 14:56:48 -0500 Subject: [PATCH 3/9] Fix some new boost-root relative references. --- test/test_bimap_info.cpp | 6 +++--- test/test_bimap_operator_bracket.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/test_bimap_info.cpp b/test/test_bimap_info.cpp index 845294e3..a2e4d150 100644 --- a/test/test_bimap_info.cpp +++ b/test/test_bimap_info.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include int test_bimap_info() { @@ -123,13 +123,13 @@ void test_heterogeneous_access_bimap_info() using namespace boost::bimaps; typedef bimap - < + < set_of< int, std::less< strong > >, unordered_set_of < int, boost::hash< strong >, std::equal_to< strong > >, - with_info + with_info > bm_type; bm_type bm; diff --git a/test/test_bimap_operator_bracket.cpp b/test/test_bimap_operator_bracket.cpp index 3c70fdae..e0f24777 100644 --- a/test/test_bimap_operator_bracket.cpp +++ b/test/test_bimap_operator_bracket.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include void test_bimap_operator_bracket() { @@ -194,7 +194,7 @@ void test_bimap_operator_bracket() typedef bimap < set_of > >, - list_of + list_of > bm; bm b; From 9fc4c9235ceafda7e00c300fae991e4fb83bc97f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:00 -0500 Subject: [PATCH 4/9] 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 4baa9caf..467c0bc4 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/bimap From 1c881068dc0bc5c6adc422a2e606b793fce4f640 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:55 -0500 Subject: [PATCH 5/9] 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 467c0bc4..f9ce9ea2 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/bimap : common-requirements From 03d429a6fc1ec7a3cf03bdaf4906f493572d5945 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:04 -0500 Subject: [PATCH 6/9] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index f9ce9ea2..7f4dbb08 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 dfd45b9555a300d281e8c12bfc7c7fad0571fb7b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:23 -0500 Subject: [PATCH 7/9] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/build.jam b/build.jam index 7f4dbb08..51c375ba 100644 --- a/build.jam +++ b/build.jam @@ -5,28 +5,31 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/container_hash//boost_container_hash + /boost/core//boost_core + /boost/iterator//boost_iterator + /boost/lambda//boost_lambda + /boost/mpl//boost_mpl + /boost/multi_index//boost_multi_index + /boost/preprocessor//boost_preprocessor + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + /boost/utility//boost_utility ; + project /boost/bimap : common-requirements include - /boost/concept_check//boost_concept_check - /boost/config//boost_config - /boost/container_hash//boost_container_hash - /boost/core//boost_core - /boost/iterator//boost_iterator - /boost/lambda//boost_lambda - /boost/mpl//boost_mpl - /boost/multi_index//boost_multi_index - /boost/preprocessor//boost_preprocessor - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits - /boost/utility//boost_utility ; explicit - [ alias boost_bimap ] + [ alias boost_bimap : : : : $(boost_dependencies) ] [ alias all : boost_bimap example test ] ; call-if : boost-library bimap ; + From b74df17419e760493fdbb30c6849782ed559017c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Wed, 31 Jul 2024 22:31:32 -0500 Subject: [PATCH 8/9] Update build dependencies. --- example/Jamfile.v2 | 2 ++ test/Jamfile.v2 | 1 + 2 files changed, 3 insertions(+) diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 0c241c89..593babc0 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -9,6 +9,8 @@ # bring in rules for testing import testing ; +project : requirements /boost/bimap/boost_bimap ; + test-suite "examples" : [ compile mighty_bimap.cpp ] diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index c8b23ffd..358c1d3f 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -11,6 +11,7 @@ import testing ; project : requirements . + /boost/bimap/boost_bimap ; test-suite "tagged_test" From 77bfae0f70ffd1419fa9f017e933b95b63e10e8e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 1 Aug 2024 17:16:36 -0500 Subject: [PATCH 9/9] Fix syntax error in build dep references. --- example/Jamfile.v2 | 2 +- test/Jamfile.v2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 593babc0..0648de76 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -9,7 +9,7 @@ # bring in rules for testing import testing ; -project : requirements /boost/bimap/boost_bimap ; +project : requirements /boost/bimap//boost_bimap ; test-suite "examples" : diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 358c1d3f..dce0e366 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -11,7 +11,7 @@ import testing ; project : requirements . - /boost/bimap/boost_bimap + /boost/bimap//boost_bimap ; test-suite "tagged_test"