From db3b2171604c42f9d03d2bd6bffcc147255331b8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 1/9] Make the library modular usable. --- build.jam | 23 +++++++++++++++++++++++ test/Jamfile.v2 | 6 +++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 00000000..b6d52d35 --- /dev/null +++ b/build.jam @@ -0,0 +1,23 @@ +# 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/outcome + : common-requirements + /boost/config//boost_config + /boost/exception//boost_exception + /boost/system//boost_system + /boost/throw_exception//boost_throw_exception + include + ; + +explicit + [ alias boost_outcome ] + [ alias all : boost_outcome test ] + ; + +call-if : boost-library outcome + ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index ef158969..9eae02ee 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -9,8 +9,8 @@ # See http://www.boost.org/libs/outcome for documentation. import testing ; -import ../../config/checks/config : requires ; -import ../../predef/tools/check/predef : check require : predef-check predef-require ; +import config : requires ; +import predef : check require : predef-check predef-require ; project : requirements @@ -18,7 +18,7 @@ project [ predef-require "!BOOST_COMP_GNUC" or "BOOST_COMP_GNUC >= 6.0" ] [ predef-require "!BOOST_COMP_CLANG" or "BOOST_COMP_CLANG >= 4.0" ] BOOST_TEST_MODULE=Outcome - ../../test/build//boost_unit_test_framework + /boost/test//boost_unit_test_framework ; { From 6628fc8c50e95750b3e20000c8b5b98cbb89ce3c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:59 -0500 Subject: [PATCH 2/9] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.jam b/build.jam index b6d52d35..929aa0b6 100644 --- a/build.jam +++ b/build.jam @@ -7,10 +7,10 @@ import project ; project /boost/outcome : common-requirements - /boost/config//boost_config - /boost/exception//boost_exception - /boost/system//boost_system - /boost/throw_exception//boost_throw_exception + /boost/config//boost_config + /boost/exception//boost_exception + /boost/system//boost_system + /boost/throw_exception//boost_throw_exception include ; From 4b2d4bd76db22bdd6ac1a213fd200400b4723623 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 4 May 2024 23:30:56 -0500 Subject: [PATCH 3/9] Add missing import-search for cconfig/predef checks. --- test/Jamfile.v2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 9eae02ee..eeaf75d8 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -9,7 +9,9 @@ # See http://www.boost.org/libs/outcome for documentation. import testing ; +import-search /boost/config/checks ; import config : requires ; +import-search /boost/predef/tools/check ; import predef : check require : predef-check predef-require ; project From 198d40ff81a6e0504c3a22e99f67139936a95a7c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -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 929aa0b6..86bfc9d0 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/outcome From d7a6c2204517548ed023ff6392d39017258b4a0a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 13 May 2024 21:46:39 -0500 Subject: [PATCH 5/9] Update dependencies. --- build.jam | 1 + 1 file changed, 1 insertion(+) diff --git a/build.jam b/build.jam index 86bfc9d0..d131efac 100644 --- a/build.jam +++ b/build.jam @@ -9,6 +9,7 @@ import project ; project /boost/outcome : common-requirements + /boost/assert//boost_assert /boost/config//boost_config /boost/exception//boost_exception /boost/system//boost_system From e42c68bcd31255de02a3032dd957dfd997193a7b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 6/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 d131efac..f254b63c 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/outcome : common-requirements From a2e078ca56694d05af0f22de947369f9001b4512 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:05 -0500 Subject: [PATCH 7/9] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index f254b63c..bc800ed3 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 cf0e57ea69471b46f8723b465abfacbf66a5ae6f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:24 -0500 Subject: [PATCH 8/9] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/build.jam b/build.jam index bc800ed3..b14a231d 100644 --- a/build.jam +++ b/build.jam @@ -5,20 +5,23 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/exception//boost_exception + /boost/system//boost_system + /boost/throw_exception//boost_throw_exception ; + project /boost/outcome : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/exception//boost_exception - /boost/system//boost_system - /boost/throw_exception//boost_throw_exception include ; explicit - [ alias boost_outcome ] + [ alias boost_outcome : : : : $(boost_dependencies) ] [ alias all : boost_outcome test ] ; call-if : boost-library outcome ; + From 42fc4c434d50662d3e795e17441c0a0fb83d436c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 27 Jul 2024 10:40:39 -0500 Subject: [PATCH 9/9] Adjust self dependencies as inter-lib deps no longer apply globally. --- test/Jamfile.v2 | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index eeaf75d8..bc5d7cf4 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -21,6 +21,7 @@ project [ predef-require "!BOOST_COMP_CLANG" or "BOOST_COMP_CLANG >= 4.0" ] BOOST_TEST_MODULE=Outcome /boost/test//boost_unit_test_framework + /boost/outcome//boost_outcome ; {