From d1177e71cc003b300593ec83472fcbcdbb25a54f 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 | 19 +++++++++++++++++++ test/Jamfile.v2 | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 00000000..0a3264e2 --- /dev/null +++ b/build.jam @@ -0,0 +1,19 @@ +# 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/leaf + : common-requirements + include + ; + +explicit + [ alias boost_leaf ] + [ alias all : boost_leaf test ] + ; + +call-if : boost-library leaf + ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index f12d0ebc..b1582f9b 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -22,13 +22,14 @@ project 11 multi : requirements + /boost/config//boost_config + /boost/exception//boost_exception BOOST_LEAF_BOOST_AVAILABLE single:BOOST_LEAF_NO_THREADS gcc:"-Wno-delete-non-virtual-dtor -Wno-parentheses" clang:"-Wno-unused-variable -Wno-delete-non-virtual-dtor -Wno-non-virtual-dtor -Wno-dangling-else" darwin:"-Wno-unused-variable -Wno-delete-non-virtual-dtor -Wno-non-virtual-dtor -Wno-delete-non-abstract-non-virtual-dtor -Wno-dangling-else" msvc:"-wd 4267 -wd 4996 -wd 4244" - ../../.. ; compile _hpp_common_test.cpp ; From 8154274e4b5e9f1d8ea5f8da474a7ddd7063c745 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 2/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 0a3264e2..cc1e49c6 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/leaf From 4cc258aeadcbe017d1971b09ba72e79e22476644 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:55 -0500 Subject: [PATCH 3/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 cc1e49c6..ecd9ef98 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/leaf : common-requirements From ab314102fc8109f641d6694a61450bdad2ca9a15 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 19:40:23 -0500 Subject: [PATCH 4/8] Change all references to . --- test/Jamfile.v2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index b1582f9b..d0187061 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -22,8 +22,8 @@ project 11 multi : requirements - /boost/config//boost_config - /boost/exception//boost_exception + /boost/config//boost_config + /boost/exception//boost_exception BOOST_LEAF_BOOST_AVAILABLE single:BOOST_LEAF_NO_THREADS gcc:"-Wno-delete-non-virtual-dtor -Wno-parentheses" From 5a40f46d6574f063ddcde0397da3219ffb3a9ad9 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:05 -0500 Subject: [PATCH 5/8] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index ecd9ef98..db7a072f 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 dbfe54eab2a370b73e9ec555d35e80f38b8e2a6c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:24 -0500 Subject: [PATCH 6/8] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.jam b/build.jam index db7a072f..593ced2d 100644 --- a/build.jam +++ b/build.jam @@ -11,9 +11,10 @@ project /boost/leaf ; explicit - [ alias boost_leaf ] + [ alias boost_leaf : : : : $(boost_dependencies) ] [ alias all : boost_leaf test ] ; call-if : boost-library leaf ; + From 277f588f94d23b9b2e2f956e9fe66c5aafa8e698 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 6 Apr 2025 20:22:20 -0500 Subject: [PATCH 7/8] Tweak exception testing dependency to only header only use. --- build.jam | 2 +- test/Jamfile.v2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.jam b/build.jam index 593ced2d..affa271b 100644 --- a/build.jam +++ b/build.jam @@ -11,7 +11,7 @@ project /boost/leaf ; explicit - [ alias boost_leaf : : : : $(boost_dependencies) ] + [ alias boost_leaf ] [ alias all : boost_leaf test ] ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 233bf1ba..added3b9 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -23,7 +23,7 @@ project multi : requirements /boost/config//boost_config - /boost/exception//boost_exception + /boost/exception//boost_exception BOOST_LEAF_BOOST_AVAILABLE windows:_CRT_SECURE_NO_WARNINGS single:BOOST_LEAF_NO_THREADS From 2b338aa28ea14cce644147f2e54f894cde4528d7 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 7 Apr 2025 18:54:35 -0500 Subject: [PATCH 8/8] Move project global include to target local include. --- build.jam | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build.jam b/build.jam index affa271b..0fcce930 100644 --- a/build.jam +++ b/build.jam @@ -6,15 +6,12 @@ require-b2 5.2 ; project /boost/leaf - : common-requirements - include ; explicit - [ alias boost_leaf ] + [ alias boost_leaf : : : : include ] [ alias all : boost_leaf test ] ; call-if : boost-library leaf ; -