From 948578d5b4f3c02595f162a512279b639dfc221b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:33:41 -0500 Subject: [PATCH 01/11] Make the library modular usable. --- build.jam | 27 +++++++++++++++++++++++++++ build/Jamfile.v2 | 3 +-- example/Jamfile | 2 +- test/Jamfile.v2 | 6 +++--- 4 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 00000000..e58bf7b7 --- /dev/null +++ b/build.jam @@ -0,0 +1,27 @@ +# 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/exception + : common-requirements + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/smart_ptr//boost_smart_ptr + /boost/throw_exception//boost_throw_exception + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits + include + ; + +explicit + [ alias boost_exception : build//boost_exception ] + [ alias all : boost_exception example test ] + ; + +call-if : boost-library exception + : install boost_exception + ; diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index fb47659c..da214ff2 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -5,10 +5,9 @@ # 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) -project boost/exception +project : source-location ../src : requirements static ; lib boost_exception : clone_current_exception_non_intrusive.cpp ; -boost-install boost_exception ; diff --git a/example/Jamfile b/example/Jamfile index 44e18bfd..1040b8f8 100644 --- a/example/Jamfile +++ b/example/Jamfile @@ -9,7 +9,7 @@ exe example_io : example_io.cpp ; obj error_info_1 : error_info_1.cpp ; obj error_info_2 : error_info_2.cpp ; obj cloning_1 : cloning_1.cpp ; -obj cloning_2 : cloning_2.cpp : multi ; +# obj cloning_2 : cloning_2.cpp /boost/thread//boost_thread : multi ; obj info_tuple : info_tuple.cpp ; obj enable_error_info : enable_error_info.cpp ; obj logging : logging.cpp ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 683b14bc..0374f1b3 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -22,7 +22,7 @@ run 2-throw_exception_no_exceptions_test.cpp : : : off ; run 3-throw_exception_no_integration_test.cpp : : : on ; run 4-throw_exception_no_both_test.cpp : : : off ; run cloning_test.cpp : : : on ; -run copy_exception_test.cpp ../../thread/src/tss_null.cpp /boost//thread : : : multi on ; +# run copy_exception_test.cpp ../../thread/src/tss_null.cpp /boost/thread//boost_thread : : : multi on ; run copy_exception_no_exceptions_test.cpp : : : off on ; run unknown_exception_test.cpp : : : on ; run exception_test.cpp : : : on ; @@ -39,8 +39,8 @@ run refcount_ptr_test.cpp ; run current_exception_cast_test.cpp : : : on ; run no_exceptions_test.cpp : : : off ; run errinfos_test.cpp : : : on ; -run exception_ptr_test.cpp/BOOST_ENABLE_NON_INTRUSIVE_EXCEPTION_PTR ../../thread/src/tss_null.cpp /boost/exception /boost//thread : : : multi on : non_intrusive_exception_ptr_test ; -run exception_ptr_test.cpp ../../thread/src/tss_null.cpp /boost//thread : : : multi on ; +# run exception_ptr_test.cpp/BOOST_ENABLE_NON_INTRUSIVE_EXCEPTION_PTR ../../thread/src/tss_null.cpp /boost/exception//boost_exception /boost/thread//boost_thread : : : multi on : non_intrusive_exception_ptr_test ; +# run exception_ptr_test.cpp ../../thread/src/tss_null.cpp /boost/thread//boost_thread : : : multi on ; run exception_ptr_test2.cpp ; lib visibility_test_lib : visibility_test_lib.cpp : hidden on ; From 752185750dcf45122c7194c0f43b843d4d5d65ac Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:58 -0500 Subject: [PATCH 02/11] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.jam b/build.jam index e58bf7b7..1f7db26d 100644 --- a/build.jam +++ b/build.jam @@ -7,13 +7,13 @@ import project ; project /boost/exception : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core - /boost/smart_ptr//boost_smart_ptr - /boost/throw_exception//boost_throw_exception - /boost/tuple//boost_tuple - /boost/type_traits//boost_type_traits + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/smart_ptr//boost_smart_ptr + /boost/throw_exception//boost_throw_exception + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits include ; From fd7244306720f42921764d94d68e66db617463c8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Apr 2024 20:15:04 -0500 Subject: [PATCH 03/11] Add missing NO_LIB usage requirements. --- build/Jamfile.v2 | 1 + 1 file changed, 1 insertion(+) diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index da214ff2..afa08709 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -8,6 +8,7 @@ project : source-location ../src : requirements static + : usage-requirements BOOST_EXCEPTION_NO_LIB=1 ; lib boost_exception : clone_current_exception_non_intrusive.cpp ; From 1c66828bb546a699bbdb9a3cc6de12241ae725ce Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 04/11] 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 1f7db26d..de577ae8 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/exception From a27c2d5127e7dd02d7fd8188b4a28cd4b14fdc1a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:55 -0500 Subject: [PATCH 05/11] 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 de577ae8..66bfaeac 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/exception : common-requirements From ec7442e3b79fc9ed677620b44930fb8c8faf3d08 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:03 -0500 Subject: [PATCH 06/11] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 66bfaeac..aca7d18d 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 b5bf79462ea4daec98424865a6fb95c0b47b4fab Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:22 -0500 Subject: [PATCH 07/11] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 17 ++++++++++------- build/Jamfile.v2 | 1 + 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/build.jam b/build.jam index aca7d18d..95811511 100644 --- a/build.jam +++ b/build.jam @@ -5,15 +5,17 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/smart_ptr//boost_smart_ptr + /boost/throw_exception//boost_throw_exception + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits ; + project /boost/exception : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core - /boost/smart_ptr//boost_smart_ptr - /boost/throw_exception//boost_throw_exception - /boost/tuple//boost_tuple - /boost/type_traits//boost_type_traits include ; @@ -25,3 +27,4 @@ explicit call-if : boost-library exception : install boost_exception ; + diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index afa08709..86858ce1 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -7,6 +7,7 @@ project : source-location ../src + : common-requirements $(boost_dependencies) : requirements static : usage-requirements BOOST_EXCEPTION_NO_LIB=1 ; From 95854acc9ad35ad3cd9e20a35437dceb64f4ac60 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 2 Aug 2024 21:56:17 -0500 Subject: [PATCH 08/11] Update build deps. --- example/Jamfile | 2 ++ test/Jamfile.v2 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/example/Jamfile b/example/Jamfile index 1040b8f8..5370c9ea 100644 --- a/example/Jamfile +++ b/example/Jamfile @@ -5,6 +5,8 @@ # 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) +project : requirements /boost/exception//boost_exception ; + exe example_io : example_io.cpp ; obj error_info_1 : error_info_1.cpp ; obj error_info_2 : error_info_2.cpp ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 0374f1b3..02225ff4 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -7,6 +7,8 @@ import testing ; +project : requirements /boost/exception//boost_exception ; + #to_string run is_output_streamable_test.cpp ; From 40554e238c31c5e011656d6ac9a6a385829fbeb7 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Wed, 14 Aug 2024 23:22:20 -0500 Subject: [PATCH 09/11] Fix lib build, re-enable some tests. --- build/Jamfile.v2 | 2 +- test/Jamfile.v2 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 86858ce1..dc7cefd1 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -12,4 +12,4 @@ project : usage-requirements BOOST_EXCEPTION_NO_LIB=1 ; -lib boost_exception : clone_current_exception_non_intrusive.cpp ; +lib boost_exception : clone_current_exception_non_intrusive.cpp : on ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 02225ff4..a0d29f23 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -24,7 +24,7 @@ run 2-throw_exception_no_exceptions_test.cpp : : : off ; run 3-throw_exception_no_integration_test.cpp : : : on ; run 4-throw_exception_no_both_test.cpp : : : off ; run cloning_test.cpp : : : on ; -# run copy_exception_test.cpp ../../thread/src/tss_null.cpp /boost/thread//boost_thread : : : multi on ; +run copy_exception_test.cpp ../../thread/src/tss_null.cpp /boost/thread//boost_thread : : : multi on ; run copy_exception_no_exceptions_test.cpp : : : off on ; run unknown_exception_test.cpp : : : on ; run exception_test.cpp : : : on ; @@ -41,8 +41,8 @@ run refcount_ptr_test.cpp ; run current_exception_cast_test.cpp : : : on ; run no_exceptions_test.cpp : : : off ; run errinfos_test.cpp : : : on ; -# run exception_ptr_test.cpp/BOOST_ENABLE_NON_INTRUSIVE_EXCEPTION_PTR ../../thread/src/tss_null.cpp /boost/exception//boost_exception /boost/thread//boost_thread : : : multi on : non_intrusive_exception_ptr_test ; -# run exception_ptr_test.cpp ../../thread/src/tss_null.cpp /boost/thread//boost_thread : : : multi on ; +run exception_ptr_test.cpp/BOOST_ENABLE_NON_INTRUSIVE_EXCEPTION_PTR ../../thread/src/tss_null.cpp /boost/exception//boost_exception /boost/thread//boost_thread : : : multi on : non_intrusive_exception_ptr_test ; +run exception_ptr_test.cpp ../../thread/src/tss_null.cpp /boost/thread//boost_thread : : : multi on ; run exception_ptr_test2.cpp ; lib visibility_test_lib : visibility_test_lib.cpp : hidden on ; From 1da3782f79b66d7f807fc2fa539f5543f2fed801 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 7 Apr 2025 11:32:37 -0500 Subject: [PATCH 10/11] Move project global include to target local include. --- build.jam | 3 --- build/Jamfile.v2 | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/build.jam b/build.jam index 95811511..e472d421 100644 --- a/build.jam +++ b/build.jam @@ -15,8 +15,6 @@ constant boost_dependencies : /boost/type_traits//boost_type_traits ; project /boost/exception - : common-requirements - include ; explicit @@ -27,4 +25,3 @@ explicit call-if : boost-library exception : install boost_exception ; - diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index dc7cefd1..e6caf5a9 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -7,7 +7,7 @@ project : source-location ../src - : common-requirements $(boost_dependencies) + : common-requirements ../include $(boost_dependencies) : requirements static : usage-requirements BOOST_EXCEPTION_NO_LIB=1 ; From e46dd22b3c8eb6f44c7bd471fcb626e323287e04 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 2 May 2025 18:00:06 -0500 Subject: [PATCH 11/11] Enable example that was commented out to get clean builds. --- example/Jamfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/Jamfile b/example/Jamfile index 5370c9ea..5dc3ad0f 100644 --- a/example/Jamfile +++ b/example/Jamfile @@ -11,7 +11,7 @@ exe example_io : example_io.cpp ; obj error_info_1 : error_info_1.cpp ; obj error_info_2 : error_info_2.cpp ; obj cloning_1 : cloning_1.cpp ; -# obj cloning_2 : cloning_2.cpp /boost/thread//boost_thread : multi ; +obj cloning_2 : cloning_2.cpp /boost/thread//boost_thread : multi ; obj info_tuple : info_tuple.cpp ; obj enable_error_info : enable_error_info.cpp ; obj logging : logging.cpp ;