From df6398621a9c9d82538b5e3e82af0a5d735f758c 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. --- Jamfile | 11 ----------- build.jam | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 11 deletions(-) delete mode 100644 Jamfile create mode 100644 build.jam diff --git a/Jamfile b/Jamfile deleted file mode 100644 index fe20ff6..0000000 --- a/Jamfile +++ /dev/null @@ -1,11 +0,0 @@ -# Boost.PropertyMap Library Jamfile -# -# Copyright (c) 2018 James E. King III -# -# Use, modification, and distribution are subject to 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) - -# please order by name to ease maintenance -build-project example ; -build-project test ; diff --git a/build.jam b/build.jam new file mode 100644 index 0000000..ba569ff --- /dev/null +++ b/build.jam @@ -0,0 +1,34 @@ +# 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/property_map + : common-requirements + /boost/any//boost_any + /boost/assert//boost_assert + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/core//boost_core + /boost/function//boost_function + /boost/iterator//boost_iterator + /boost/lexical_cast//boost_lexical_cast + /boost/mpl//boost_mpl + /boost/smart_ptr//boost_smart_ptr + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_index//boost_type_index + /boost/type_traits//boost_type_traits + /boost/utility//boost_utility + include + ; + +explicit + [ alias boost_property_map ] + [ alias all : boost_property_map example test ] + ; + +call-if : boost-library property_map + ; From ca750c5af5380a40e55851471c1707667f94b7dc 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 | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/build.jam b/build.jam index ba569ff..6520368 100644 --- a/build.jam +++ b/build.jam @@ -7,21 +7,21 @@ import project ; project /boost/property_map : common-requirements - /boost/any//boost_any - /boost/assert//boost_assert - /boost/concept_check//boost_concept_check - /boost/config//boost_config - /boost/core//boost_core - /boost/function//boost_function - /boost/iterator//boost_iterator - /boost/lexical_cast//boost_lexical_cast - /boost/mpl//boost_mpl - /boost/smart_ptr//boost_smart_ptr - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/type_index//boost_type_index - /boost/type_traits//boost_type_traits - /boost/utility//boost_utility + /boost/any//boost_any + /boost/assert//boost_assert + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/core//boost_core + /boost/function//boost_function + /boost/iterator//boost_iterator + /boost/lexical_cast//boost_lexical_cast + /boost/mpl//boost_mpl + /boost/smart_ptr//boost_smart_ptr + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_index//boost_type_index + /boost/type_traits//boost_type_traits + /boost/utility//boost_utility include ; From 411860b5ee4499b999f41370a5b702e47d0237b5 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 6520368..c0f2be5 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/property_map From 0ac8389d77784254888c2464f229f393c727067d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -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 c0f2be5..583e31e 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/property_map : common-requirements From b95fb1de8197b19a334ca2b1f1afaf4b354c0740 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:04 -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 583e31e..da8c20d 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 face7068fee172f120832498a1083577585798a8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:23 -0500 Subject: [PATCH 6/7] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/build.jam b/build.jam index da8c20d..f51d6fa 100644 --- a/build.jam +++ b/build.jam @@ -5,30 +5,33 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/any//boost_any + /boost/assert//boost_assert + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/core//boost_core + /boost/function//boost_function + /boost/iterator//boost_iterator + /boost/lexical_cast//boost_lexical_cast + /boost/mpl//boost_mpl + /boost/smart_ptr//boost_smart_ptr + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_index//boost_type_index + /boost/type_traits//boost_type_traits + /boost/utility//boost_utility ; + project /boost/property_map : common-requirements - /boost/any//boost_any - /boost/assert//boost_assert - /boost/concept_check//boost_concept_check - /boost/config//boost_config - /boost/core//boost_core - /boost/function//boost_function - /boost/iterator//boost_iterator - /boost/lexical_cast//boost_lexical_cast - /boost/mpl//boost_mpl - /boost/smart_ptr//boost_smart_ptr - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/type_index//boost_type_index - /boost/type_traits//boost_type_traits - /boost/utility//boost_utility include ; explicit - [ alias boost_property_map ] + [ alias boost_property_map : : : : $(boost_dependencies) ] [ alias all : boost_property_map example test ] ; call-if : boost-library property_map ; + From 1932f2fc74f410c6eaec2ff0bac35051909d998e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Wed, 7 Aug 2024 22:38:10 -0500 Subject: [PATCH 7/7] Update build deps. --- example/Jamfile.v2 | 2 ++ test/Jamfile.v2 | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 928f62a..6f3c7af 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -7,6 +7,8 @@ import testing ; +project : requirements /boost/property_map//boost_property_map ; + test-suite "property_map-examples" : [ run compose_property_map_example.cpp ] [ run example1.cpp ] diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index c5f6fe5..7c6022c 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -4,9 +4,9 @@ # # Author: Douglas Gregor # -# Use, modification and distribution is subject to 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) +# Use, modification and distribution is subject to 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) # For more information, see http://www.boost.org/ @@ -15,6 +15,7 @@ import os ; project : requirements cygwin:_POSIX_C_SOURCE=201112L + /boost/property_map//boost_property_map ; test-suite property_map