Merge pull request #57 from grafikrobot/modular

Add support for modular build structure.
Enable example that was commented out to get clean builds.
2025-12-23 15:18:09 +01:00 · 2025-05-03 03:11:14 +03:00 · 2025-05-02 18:00:06 -05:00 · 2025-04-07 11:32:37 -05:00 · 2025-04-04 21:39:13 -05:00 · 2024-08-14 23:22:20 -05:00
4 changed files with 39 additions and 7 deletions
--- a/build.jam
+++ b/build.jam
@@ -0,0 +1,27 @@
+# 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)
+
+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
+    ;
+
+explicit
+    [ alias boost_exception : build//boost_exception ]
+    [ alias all : boost_exception example test ]
+    ;
+
+call-if : boost-library exception
+    : install boost_exception
+    ;
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -5,10 +5,11 @@
 # 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
+    : common-requirements <include>../include <library>$(boost_dependencies)
    : requirements <link>static
+    : usage-requirements <define>BOOST_EXCEPTION_NO_LIB=1
    ;

-lib boost_exception : clone_current_exception_non_intrusive.cpp ;
-boost-install boost_exception ;
+lib boost_exception : clone_current_exception_non_intrusive.cpp :  <exception-handling>on ;
--- a/example/Jamfile
+++ b/example/Jamfile
@@ -5,11 +5,13 @@
 # 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 <library>/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 ;
 obj cloning_1 : cloning_1.cpp ;
-obj cloning_2 : cloning_2.cpp : <threading>multi ;
+obj cloning_2 : cloning_2.cpp /boost/thread//boost_thread : <threading>multi ;
 obj info_tuple : info_tuple.cpp ;
 obj enable_error_info : enable_error_info.cpp ;
 obj logging : logging.cpp ;
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -7,6 +7,8 @@

 import testing ;

+project : requirements <library>/boost/exception//boost_exception ;
+
 #to_string

 run is_output_streamable_test.cpp ;
@@ -22,7 +24,7 @@ run 2-throw_exception_no_exceptions_test.cpp : : : <exception-handling>off ;
 run 3-throw_exception_no_integration_test.cpp : : : <exception-handling>on ;
 run 4-throw_exception_no_both_test.cpp : : : <exception-handling>off ;
 run cloning_test.cpp : : : <exception-handling>on ;
-run copy_exception_test.cpp ../../thread/src/tss_null.cpp /boost//thread : : : <threading>multi <exception-handling>on ;
+run copy_exception_test.cpp ../../thread/src/tss_null.cpp /boost/thread//boost_thread : : : <threading>multi <exception-handling>on ;
 run copy_exception_no_exceptions_test.cpp : : : <exception-handling>off <rtti>on ;
 run unknown_exception_test.cpp : : : <exception-handling>on ;
 run exception_test.cpp : : : <exception-handling>on ;
@@ -39,8 +41,8 @@ run refcount_ptr_test.cpp ;
 run current_exception_cast_test.cpp : : : <exception-handling>on ;
 run no_exceptions_test.cpp : : : <exception-handling>off ;
 run errinfos_test.cpp : : : <exception-handling>on ;
-run exception_ptr_test.cpp/<define>BOOST_ENABLE_NON_INTRUSIVE_EXCEPTION_PTR ../../thread/src/tss_null.cpp /boost/exception /boost//thread : : : <threading>multi <exception-handling>on : non_intrusive_exception_ptr_test ;
-run exception_ptr_test.cpp ../../thread/src/tss_null.cpp /boost//thread : : : <threading>multi <exception-handling>on ;
+run exception_ptr_test.cpp/<define>BOOST_ENABLE_NON_INTRUSIVE_EXCEPTION_PTR ../../thread/src/tss_null.cpp /boost/exception//boost_exception /boost/thread//boost_thread : : : <threading>multi <exception-handling>on : non_intrusive_exception_ptr_test ;
+run exception_ptr_test.cpp ../../thread/src/tss_null.cpp /boost/thread//boost_thread : : : <threading>multi <exception-handling>on ;
 run exception_ptr_test2.cpp ;

 lib visibility_test_lib : visibility_test_lib.cpp : <visibility>hidden <exception-handling>on ;
Author	SHA1	Message	Date
Peter Dimov	95b1ead06c	Merge pull request #57 from grafikrobot/modular Add support for modular build structure.	2025-05-03 03:11:14 +03:00
Rene Rivera	e46dd22b3c	Enable example that was commented out to get clean builds.	2025-05-02 18:00:06 -05:00
Rene Rivera	1da3782f79	Move project global include to target local include.	2025-04-07 11:32:37 -05:00
Rene Rivera	71ff2a5254	Sync from upstream.	2025-04-04 21:39:13 -05:00
Rene Rivera	40554e238c	Fix lib build, re-enable some tests.	2024-08-14 23:22:20 -05:00
Rene Rivera	95854acc9a	Update build deps.	2024-08-02 21:56:17 -05:00
Rene Rivera	b5bf79462e	Move inter-lib dependencies to a project variable and into the build targets.	2024-07-23 22:34:22 -05:00
Rene Rivera	ec7442e3b7	Update copyright dates.	2024-07-20 22:52:03 -05:00
Rene Rivera	a27c2d5127	Bump B2 require to 5.2	2024-06-14 11:33:55 -05:00
Rene Rivera	64ca508153	Sync from upstream.	2024-06-02 13:49:17 -05:00
Rene Rivera	1c66828bb5	Add requires-b2 check to top-level build file.	2024-05-05 09:00:01 -05:00
Rene Rivera	fd72443067	Add missing NO_LIB usage requirements.	2024-04-28 20:15:04 -05:00
Rene Rivera	752185750d	Switch to library requirements instead of source. As source puts extra source in install targets.	2024-03-29 21:15:58 -05:00
Rene Rivera	948578d5b4	Make the library modular usable.	2024-03-11 08:33:41 -05:00