From 9da33c46290859f1cfd1450a09f085906874432d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:32:57 -0500 Subject: [PATCH 1/7] Make the library modular usable. --- build.jam | 20 ++++++++++++++++++++ test/Jamfile | 15 ++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 0000000..fb64d2d --- /dev/null +++ b/build.jam @@ -0,0 +1,20 @@ +# 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/describe + : common-requirements + /boost/mp11//boost_mp11 + include + ; + +explicit + [ alias boost_describe ] + [ alias all : boost_describe test ] + ; + +call-if : boost-library describe + ; diff --git a/test/Jamfile b/test/Jamfile index 94fc27e..c40d773 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -5,11 +5,16 @@ import testing ; project : requirements + /boost/container_hash//boost_container_hash + /boost/core//boost_core + /boost/variant2//boost_variant2 + extra msvc:on clang:on gcc:on - clang:"-Wno-unused-private-field" ; + clang:"-Wno-unused-private-field" + ; run quick.cpp ; @@ -87,8 +92,8 @@ explicit describe_cxx14 ; local CXX14 = [ check-target-builds describe_cxx14 describe_cxx14 : : no ] "msvc-14.0:-wd4100" ; -local JSON = /boost//json/off "msvc-14.2:-wd5104" ; -local SERIALIZATION = /boost//serialization/off "-gcc:on" "-clang:on" ; +local JSON = /boost/json//boost_json/off "msvc-14.2:-wd5104" ; +local SERIALIZATION = /boost/serialization//boost_serialization/off "-gcc:on" "-clang:on" ; run ../example/printing_enums_ct.cpp : : : $(CXX14) ; run ../example/printing_enums_rt.cpp : : : $(CXX14) ; @@ -98,9 +103,9 @@ run ../example/print_function.cpp : : : $(CXX14) ; run ../example/to_json.cpp : : : $(CXX14) $(JSON) ; run ../example/from_json.cpp : : : $(CXX14) $(JSON) ; run ../example/serialization.cpp : : : $(CXX14) $(SERIALIZATION) ; -run ../example/json_rpc.cpp : : : $(CXX14) $(JSON) ; +run ../example/json_rpc.cpp : : : $(CXX14) $(JSON) /boost/utility//boost_utility ; run ../example/hash_value.cpp : : : $(CXX14) ; run ../example/equality.cpp : : : $(CXX14) ; -link ../example/console.cpp : $(CXX14) $(JSON) ; +link ../example/console.cpp : $(CXX14) $(JSON) /boost/utility//boost_utility ; run ../example/struct_to_tuple.cpp : : : $(CXX14) ; run ../example/pm_to_string.cpp : : : $(CXX14) ; From 84ce04488521bb884e43b0fb1f0c4dd3f3a710a1 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:58 -0500 Subject: [PATCH 2/7] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index fb64d2d..446668f 100644 --- a/build.jam +++ b/build.jam @@ -7,7 +7,7 @@ import project ; project /boost/describe : common-requirements - /boost/mp11//boost_mp11 + /boost/mp11//boost_mp11 include ; From 202203112b062508972943c5f830509d174deae0 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 446668f..c425c00 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/describe From 879d4b2a228b498d383f02f3f6441ea892039172 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 c425c00..fe64dd7 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/describe : common-requirements From 76c036a2d7065fce4e07e713acaeac5e39d4484d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 19:38:12 -0500 Subject: [PATCH 5/7] Change all references to . --- test/Jamfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/Jamfile b/test/Jamfile index 37202a8..e3b53f9 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -7,9 +7,9 @@ import testing ; local WERROR = msvc:on clang:on gcc:on ; project : requirements - /boost/container_hash//boost_container_hash - /boost/core//boost_core - /boost/variant2//boost_variant2 + /boost/container_hash//boost_container_hash + /boost/core//boost_core + /boost/variant2//boost_variant2 extra $(WERROR) From d25e48348e02a8cec58237ab30e8532ddfc8ceab Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:05 -0500 Subject: [PATCH 6/7] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index fe64dd7..061fadc 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 86099f1d7838cfb05d9f52c99beceb0f9cd0954c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:24 -0500 Subject: [PATCH 7/7] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build.jam b/build.jam index 061fadc..41358b9 100644 --- a/build.jam +++ b/build.jam @@ -5,16 +5,19 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/mp11//boost_mp11 ; + project /boost/describe : common-requirements - /boost/mp11//boost_mp11 include ; explicit - [ alias boost_describe ] + [ alias boost_describe : : : : $(boost_dependencies) ] [ alias all : boost_describe test ] ; call-if : boost-library describe ; +