From 1a411b99844a93161b8b3226ca157e9e4f5c83e6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:32:36 -0500 Subject: [PATCH 1/7] Make the library modular usable. --- build.jam | 22 ++++++++++++++++++++++ example/Jamfile.v2 | 2 +- test/Jamfile.v2 | 6 +++--- 3 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 0000000..c499a11 --- /dev/null +++ b/build.jam @@ -0,0 +1,22 @@ +# 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/coroutine2 + : common-requirements + /boost/assert//boost_assert + /boost/config//boost_config + /boost/context//boost_context + include + ; + +explicit + [ alias boost_coroutine2 ] + [ alias all : boost_coroutine2 example test ] + ; + +call-if : boost-library coroutine2 + ; diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 327cfe9..6ba626a 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -13,7 +13,7 @@ import modules ; import os ; import toolset ; -project boost/coroutine2/example +project : requirements /boost/context//boost_context linux,gcc,on:-fsplit-stack diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 8cec95c..ca3231a 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -12,11 +12,11 @@ import os ; import path ; import testing ; import toolset ; -import ../../config/checks/config : requires ; +import config : requires ; -project boost/coroutine2/test +project : requirements - ../../test/build//boost_unit_test_framework + /boost/test//boost_unit_test_framework /boost/context//boost_context linux,gcc,on:-fsplit-stack linux,gcc,on:-DBOOST_USE_SEGMENTED_STACKS From 60ac650ae4039c3ab53d4ac3ad4d7e7d08a31c6f 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.jam b/build.jam index c499a11..d24f58d 100644 --- a/build.jam +++ b/build.jam @@ -7,9 +7,9 @@ import project ; project /boost/coroutine2 : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/context//boost_context + /boost/assert//boost_assert + /boost/config//boost_config + /boost/context//boost_context include ; From 2516ec842baa246de281d4723a2f330ea6e8505c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 4 May 2024 23:28:58 -0500 Subject: [PATCH 3/7] Add missing import-search for cconfig/predef checks. --- test/Jamfile.v2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index ca3231a..9f311f2 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -12,6 +12,7 @@ import os ; import path ; import testing ; import toolset ; +import-search /boost/config/checks ; import config : requires ; project @@ -47,7 +48,7 @@ rule native-impl ( properties * ) } test-suite minimal : -[ run test_coroutine.cpp : +[ run test_coroutine.cpp : : : fcontext [ requires cxx11_auto_declarations @@ -63,7 +64,7 @@ test-suite minimal : cxx11_variadic_templates ] : test_coroutine_asm ] -[ run test_coroutine.cpp : +[ run test_coroutine.cpp : : : @native-impl [ requires cxx11_auto_declarations From cfbf07ca6007c24d37cb842350b9f68cbe78b747 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 4/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 d24f58d..7823c17 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/coroutine2 From 628fd103b942d8dba66f831429e640bdb1d182d8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:55 -0500 Subject: [PATCH 5/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 7823c17..af7cdaa 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/coroutine2 : common-requirements From 149bd2222e59e3edb0745da56e6fd2eb90450560 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:04 -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 af7cdaa..9cca231 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 05412962a3a183ccd29f28af31cb8ae322142cce Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:23 -0500 Subject: [PATCH 7/7] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build.jam b/build.jam index 9cca231..f3e1cf0 100644 --- a/build.jam +++ b/build.jam @@ -5,18 +5,21 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/context//boost_context ; + project /boost/coroutine2 : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/context//boost_context include ; explicit - [ alias boost_coroutine2 ] + [ alias boost_coroutine2 : : : : $(boost_dependencies) ] [ alias all : boost_coroutine2 example test ] ; call-if : boost-library coroutine2 ; +