From 9cc66841c46c2bfd2014e03ac6b3f2d50056ee87 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:16 -0500 Subject: [PATCH 1/9] Make the library modular usable. --- build.jam | 25 +++++++++++++++++++++++++ build/Jamfile.v2 | 4 +--- test/Jamfile.v2 | 2 ++ 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 000000000..82e26b073 --- /dev/null +++ b/build.jam @@ -0,0 +1,25 @@ +# 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/system + : common-requirements + /boost/assert//boost_assert + /boost/config//boost_config + /boost/throw_exception//boost_throw_exception + /boost/variant2//boost_variant2 + /boost/winapi//boost_winapi + include + ; + +explicit + [ alias boost_system : build//boost_system ] + [ alias all : boost_system test ] + ; + +call-if : boost-library system + : install boost_system + ; diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index dcef696fa..903d9d5f0 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -7,7 +7,7 @@ # See library home page at https://www.boost.org/libs/system -project boost/system +project : source-location ../src : usage-requirements # pass these requirement to dependents (i.e. users) shared:BOOST_SYSTEM_DYN_LINK=1 @@ -21,5 +21,3 @@ lib boost_system : shared:BOOST_SYSTEM_DYN_LINK=1 static:BOOST_SYSTEM_STATIC_LINK=1 ; - -boost-install boost_system ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 8e3e5a8d3..4dfaecc98 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -17,6 +17,8 @@ project : requirements + /boost/core//boost_core + msvc:on gcc:on clang:on From 27a5096b6cf2aa7b2f2e1e626518fce9b8f319ca 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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.jam b/build.jam index 82e26b073..8a91df9ae 100644 --- a/build.jam +++ b/build.jam @@ -7,11 +7,11 @@ import project ; project /boost/system : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/throw_exception//boost_throw_exception - /boost/variant2//boost_variant2 - /boost/winapi//boost_winapi + /boost/assert//boost_assert + /boost/config//boost_config + /boost/throw_exception//boost_throw_exception + /boost/variant2//boost_variant2 + /boost/winapi//boost_winapi include ; From 3c293f87408ec5d1d69f3450998bff7e9971b972 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Apr 2024 20:17:00 -0500 Subject: [PATCH 3/9] 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 903d9d5f0..8ae568511 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -12,6 +12,7 @@ project : usage-requirements # pass these requirement to dependents (i.e. users) shared:BOOST_SYSTEM_DYN_LINK=1 static:BOOST_SYSTEM_STATIC_LINK=1 + BOOST_SYSTEM_NO_LIB=1 ; SOURCES = error_code ; From 9b82082f7642af4f1937fdf3926970553f38e0ba 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 8a91df9ae..95364b699 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/system From 8d0fa396b8befca1d78f2e8e79509d8c4cc176ca Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 5/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 95364b699..ee24f683a 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/system : common-requirements From 91929719bdf996473adc84cc3ec8331550d45ee8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 21:26:25 -0500 Subject: [PATCH 6/9] 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 4dfaecc98..b85caa5a0 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -17,7 +17,7 @@ project : requirements - /boost/core//boost_core + /boost/core//boost_core msvc:on gcc:on From fc3ab6db97c1e5329b5ae4f507e257f748510873 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:03 -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 ee24f683a..a3c9f6d9a 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 5feb28061282ff43ab99bc4f1a0759a1d064c17e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:22 -0500 Subject: [PATCH 8/9] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 13 ++++++++----- build/Jamfile.v2 | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build.jam b/build.jam index a3c9f6d9a..486889cd3 100644 --- a/build.jam +++ b/build.jam @@ -5,13 +5,15 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/throw_exception//boost_throw_exception + /boost/variant2//boost_variant2 + /boost/winapi//boost_winapi ; + project /boost/system : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/throw_exception//boost_throw_exception - /boost/variant2//boost_variant2 - /boost/winapi//boost_winapi include ; @@ -23,3 +25,4 @@ explicit call-if : boost-library system : install boost_system ; + diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 8ae568511..13d3f7923 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -9,6 +9,7 @@ project : source-location ../src + : common-requirements $(boost_dependencies) : usage-requirements # pass these requirement to dependents (i.e. users) shared:BOOST_SYSTEM_DYN_LINK=1 static:BOOST_SYSTEM_STATIC_LINK=1 From 75e1a1e28b70c6a02690364505672e23ea43caaa Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 9 Aug 2024 20:26:47 -0500 Subject: [PATCH 9/9] Update build deps. --- test/Jamfile.v2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index b85caa5a0..7d3ae58c7 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -17,6 +17,8 @@ project : requirements + /boost/system//boost_system + /boost/core//boost_core msvc:on