From 63225c9c8858d42e4feb096145cf8ea8b535257f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 01/10] Make the library modular usable. --- Jamfile | 11 ----------- build.jam | 35 +++++++++++++++++++++++++++++++++++ example/Jamfile.v2 | 2 -- test/Jamfile.v2 | 4 ++-- 4 files changed, 37 insertions(+), 15 deletions(-) delete mode 100644 Jamfile create mode 100644 build.jam diff --git a/Jamfile b/Jamfile deleted file mode 100644 index d88704f2..00000000 --- a/Jamfile +++ /dev/null @@ -1,11 +0,0 @@ -# Boost.Signals2 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 00000000..2a8665bb --- /dev/null +++ b/build.jam @@ -0,0 +1,35 @@ +# 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/signals2 + : common-requirements + /boost/assert//boost_assert + /boost/bind//boost_bind + /boost/config//boost_config + /boost/core//boost_core + /boost/function//boost_function + /boost/iterator//boost_iterator + /boost/mpl//boost_mpl + /boost/optional//boost_optional + /boost/parameter//boost_parameter + /boost/predef//boost_predef + /boost/preprocessor//boost_preprocessor + /boost/smart_ptr//boost_smart_ptr + /boost/throw_exception//boost_throw_exception + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits + /boost/variant//boost_variant + include + ; + +explicit + [ alias boost_signals2 ] + [ alias all : example test ] + ; + +call-if : boost-library signals2 + ; diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 079ad443..d15b573c 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -8,8 +8,6 @@ # For more information, see http://www.boost.org -project : requirements /boost//headers ; - exe hello_world_slot : hello_world_slot.cpp ; exe hello_world_multi_slot : hello_world_multi_slot.cpp ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index aacb3a4c..c9886006 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -13,8 +13,8 @@ import testing ; project - : source-location . : requirements + /boost/test//boost_test true # /boost/test//boost_unit_test_framework # static @@ -23,7 +23,7 @@ project rule thread-run ( sources ) { return - [ run $(sources) : : : /boost/thread//boost_thread/ + [ run $(sources) : : : /boost/thread//boost_thread multi ] ; } From 0a5a6472dd5f0f9253ffb52d13558e727d068d55 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:59 -0500 Subject: [PATCH 02/10] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/build.jam b/build.jam index 2a8665bb..e691d1d2 100644 --- a/build.jam +++ b/build.jam @@ -7,22 +7,22 @@ import project ; project /boost/signals2 : common-requirements - /boost/assert//boost_assert - /boost/bind//boost_bind - /boost/config//boost_config - /boost/core//boost_core - /boost/function//boost_function - /boost/iterator//boost_iterator - /boost/mpl//boost_mpl - /boost/optional//boost_optional - /boost/parameter//boost_parameter - /boost/predef//boost_predef - /boost/preprocessor//boost_preprocessor - /boost/smart_ptr//boost_smart_ptr - /boost/throw_exception//boost_throw_exception - /boost/tuple//boost_tuple - /boost/type_traits//boost_type_traits - /boost/variant//boost_variant + /boost/assert//boost_assert + /boost/bind//boost_bind + /boost/config//boost_config + /boost/core//boost_core + /boost/function//boost_function + /boost/iterator//boost_iterator + /boost/mpl//boost_mpl + /boost/optional//boost_optional + /boost/parameter//boost_parameter + /boost/predef//boost_predef + /boost/preprocessor//boost_preprocessor + /boost/smart_ptr//boost_smart_ptr + /boost/throw_exception//boost_throw_exception + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits + /boost/variant//boost_variant include ; From 9b8b8d8d82a3a681855a66ae9f2c6911877ffa9d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 03/10] 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 e691d1d2..0244f134 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/signals2 From d62f91da3f4cae2fee78341c4feb249496afe3b1 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 13 May 2024 21:47:28 -0500 Subject: [PATCH 04/10] Update dependencies. --- build.jam | 1 - 1 file changed, 1 deletion(-) diff --git a/build.jam b/build.jam index 0244f134..04e805dd 100644 --- a/build.jam +++ b/build.jam @@ -18,7 +18,6 @@ project /boost/signals2 /boost/mpl//boost_mpl /boost/optional//boost_optional /boost/parameter//boost_parameter - /boost/predef//boost_predef /boost/preprocessor//boost_preprocessor /boost/smart_ptr//boost_smart_ptr /boost/throw_exception//boost_throw_exception From 1f64b34492bb1ef109fdc9493ac911014d0c3961 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 05/10] 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 04e805dd..8d9ba637 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/signals2 : common-requirements From 6169df4cab3c3be1b0afdb5432d3102daefb42e9 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 21:25:34 -0500 Subject: [PATCH 06/10] Change all references to . --- test/Jamfile.v2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index c9886006..3293c4f7 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -14,7 +14,7 @@ import testing ; project : requirements - /boost/test//boost_test + /boost/test//boost_test true # /boost/test//boost_unit_test_framework # static From 2b460e255d5ba424e8102dff602af612df29b428 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:04 -0500 Subject: [PATCH 07/10] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 8d9ba637..9f242c7a 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 d6d805ee45d683fef54cb3491eeb3c3418cf61ca Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:23 -0500 Subject: [PATCH 08/10] 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 9f242c7a..f2254480 100644 --- a/build.jam +++ b/build.jam @@ -5,30 +5,33 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/bind//boost_bind + /boost/config//boost_config + /boost/core//boost_core + /boost/function//boost_function + /boost/iterator//boost_iterator + /boost/mpl//boost_mpl + /boost/optional//boost_optional + /boost/parameter//boost_parameter + /boost/preprocessor//boost_preprocessor + /boost/smart_ptr//boost_smart_ptr + /boost/throw_exception//boost_throw_exception + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits + /boost/variant//boost_variant ; + project /boost/signals2 : common-requirements - /boost/assert//boost_assert - /boost/bind//boost_bind - /boost/config//boost_config - /boost/core//boost_core - /boost/function//boost_function - /boost/iterator//boost_iterator - /boost/mpl//boost_mpl - /boost/optional//boost_optional - /boost/parameter//boost_parameter - /boost/preprocessor//boost_preprocessor - /boost/smart_ptr//boost_smart_ptr - /boost/throw_exception//boost_throw_exception - /boost/tuple//boost_tuple - /boost/type_traits//boost_type_traits - /boost/variant//boost_variant include ; explicit - [ alias boost_signals2 ] + [ alias boost_signals2 : : : : $(boost_dependencies) ] [ alias all : example test ] ; call-if : boost-library signals2 ; + From 94fc56139aa0cdf13146c42980d93f30fc9216fd Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 25 Jul 2024 23:30:00 -0500 Subject: [PATCH 09/10] Switch to /boost/test//included target for header only mode of Boost.Test. --- test/Jamfile.v2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 3293c4f7..f8e553f9 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -14,7 +14,7 @@ import testing ; project : requirements - /boost/test//boost_test + /boost/test//included true # /boost/test//boost_unit_test_framework # static From dcb748a065680e59bcdbd9ed9cc4043e9d0df5ca Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 8 Aug 2024 00:03:04 -0500 Subject: [PATCH 10/10] Update build deps. --- example/Jamfile.v2 | 2 ++ test/Jamfile.v2 | 1 + 2 files changed, 3 insertions(+) diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index d15b573c..1a99629e 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -8,6 +8,8 @@ # For more information, see http://www.boost.org +project : requirements /boost/signals2//boost_signals2 ; + exe hello_world_slot : hello_world_slot.cpp ; exe hello_world_multi_slot : hello_world_multi_slot.cpp ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index f8e553f9..57d95a07 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -14,6 +14,7 @@ import testing ; project : requirements + /boost/signals2//boost_signals2 /boost/test//included true # /boost/test//boost_unit_test_framework