From 4a91291be0cfaea9e44028b66c2884ab858b83ff Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 01/11] Make the library modular usable. --- build.jam | 27 +++++++++++++++++++++++++++ build/Jamfile.v2 | 4 ---- test/Jamfile.v2 | 8 ++++---- 3 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 00000000..21021e44 --- /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/timer + : common-requirements + /boost/chrono//boost_chrono + /boost/config//boost_config + /boost/core//boost_core + /boost/io//boost_io + /boost/predef//boost_predef + /boost/system//boost_system + /boost/throw_exception//boost_throw_exception + include + ; + +explicit + [ alias boost_timer : build//boost_timer ] + [ alias all : boost_timer build test ] + ; + +call-if : boost-library timer + : install boost_timer + ; diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 777c50f1..ca90f2b3 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -7,8 +7,6 @@ # See library home page at http://www.boost.org/libs/timer -project boost/timer ; - SOURCES = auto_timers_construction cpu_timer ; lib boost_timer @@ -21,5 +19,3 @@ lib boost_timer shared:BOOST_TIMER_DYN_LINK=1 static:BOOST_TIMER_STATIC_LINK=1 ; - -boost-install boost_timer ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 07cb6b69..4e411598 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -19,10 +19,10 @@ project run ../example/auto_cpu_timer_example.cpp : : : always_show_run_output ; -run cpu_timer_info.cpp : : : always_show_run_output ; +run cpu_timer_info.cpp : : : always_show_run_output /boost/detail//boost_detail ; run cpu_timer_test.cpp - : : : always_show_run_output ; + : : : always_show_run_output /boost/detail//boost_detail ; run ../example/timex.cpp : echo "Hello, world" : : always_show_run_output ; @@ -32,5 +32,5 @@ run chrono_conflict_test.cpp /boost/chrono//boost_chrono : : : static ; run progress_display_test.cpp ; -run /boost/tools/inspect//inspect/release : $(parent) -text -brief : : always_show_run_output : inspect ; -explicit inspect ; +# run /boost/tools/inspect//inspect/release : $(parent) -text -brief : : always_show_run_output : inspect ; +# explicit inspect ; From c734e5e279559ef18349c6dcaa24ed8375aaa603 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:16:00 -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 21021e44..3b878900 100644 --- a/build.jam +++ b/build.jam @@ -7,13 +7,13 @@ import project ; project /boost/timer : common-requirements - /boost/chrono//boost_chrono - /boost/config//boost_config - /boost/core//boost_core - /boost/io//boost_io - /boost/predef//boost_predef - /boost/system//boost_system - /boost/throw_exception//boost_throw_exception + /boost/chrono//boost_chrono + /boost/config//boost_config + /boost/core//boost_core + /boost/io//boost_io + /boost/predef//boost_predef + /boost/system//boost_system + /boost/throw_exception//boost_throw_exception include ; From e9032ec302ea2668a82fba1bb0e89f7bf3208a34 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Apr 2024 20:17:15 -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 ca90f2b3..64628438 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -18,4 +18,5 @@ lib boost_timer : # usage-requirements shared:BOOST_TIMER_DYN_LINK=1 static:BOOST_TIMER_STATIC_LINK=1 + BOOST_TIMER_NO_LIB=1 ; From 9887606fe15a8e169e8c7f0f56d08684e0f02ca5 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 3b878900..1b21e9d3 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/timer From 1b99b0b579536a0b2661b06d79cfb3b2a443fff0 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 13 May 2024 21:47:55 -0500 Subject: [PATCH 05/11] Update dependencies. --- build.jam | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build.jam b/build.jam index 1b21e9d3..d7b92a9d 100644 --- a/build.jam +++ b/build.jam @@ -9,13 +9,9 @@ import project ; project /boost/timer : common-requirements - /boost/chrono//boost_chrono /boost/config//boost_config - /boost/core//boost_core /boost/io//boost_io /boost/predef//boost_predef - /boost/system//boost_system - /boost/throw_exception//boost_throw_exception include ; From 036d50868f04a753987f8d6326de20a8d9cd09a8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 14 May 2024 07:33:32 -0500 Subject: [PATCH 06/11] Add missing test deps. --- test/Jamfile.v2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 4e411598..b25d26f1 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -16,7 +16,7 @@ project : requirements /boost/timer//boost_timer ; - + run ../example/auto_cpu_timer_example.cpp : : : always_show_run_output ; run cpu_timer_info.cpp : : : always_show_run_output /boost/detail//boost_detail ; @@ -30,7 +30,7 @@ compile original_timer_test.cpp ; run chrono_conflict_test.cpp /boost/chrono//boost_chrono : : : static ; -run progress_display_test.cpp ; +run progress_display_test.cpp /boost/core//boost_core ; # run /boost/tools/inspect//inspect/release : $(parent) -text -brief : : always_show_run_output : inspect ; # explicit inspect ; From de7ea262d184e1a116ede0aa79f225c416f158b5 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 07/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 d7b92a9d..2071aa9c 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/timer : common-requirements From 8f488c2cc62afa9ef62f3c1f39612a3f47b085a7 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 21:26:48 -0500 Subject: [PATCH 08/11] Change all references to . --- test/Jamfile.v2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index b25d26f1..34688a6f 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -19,10 +19,10 @@ project run ../example/auto_cpu_timer_example.cpp : : : always_show_run_output ; -run cpu_timer_info.cpp : : : always_show_run_output /boost/detail//boost_detail ; +run cpu_timer_info.cpp : : : always_show_run_output /boost/detail//boost_detail ; run cpu_timer_test.cpp - : : : always_show_run_output /boost/detail//boost_detail ; + : : : always_show_run_output /boost/detail//boost_detail ; run ../example/timex.cpp : echo "Hello, world" : : always_show_run_output ; From f728b3a35a8830e6e9e7d5fce3bf178fb9119b31 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:03 -0500 Subject: [PATCH 09/11] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 2071aa9c..61e774b1 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 2aa00df18f9718d6a792034ae2c3e2b641b5d05b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:22 -0500 Subject: [PATCH 10/11] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 9 ++++++--- build/Jamfile.v2 | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.jam b/build.jam index 61e774b1..41dcf948 100644 --- a/build.jam +++ b/build.jam @@ -5,11 +5,13 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/config//boost_config + /boost/io//boost_io + /boost/predef//boost_predef ; + project /boost/timer : common-requirements - /boost/config//boost_config - /boost/io//boost_io - /boost/predef//boost_predef include ; @@ -21,3 +23,4 @@ explicit call-if : boost-library timer : install boost_timer ; + diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 64628438..593d09d9 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -9,6 +9,9 @@ SOURCES = auto_timers_construction cpu_timer ; +project + : common-requirements $(boost_dependencies) ; + lib boost_timer : ../src/$(SOURCES).cpp : # requirements From bba34d1e2703e8158445832c3c0d70c203b1b6ba Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 26 Jul 2024 17:53:46 -0500 Subject: [PATCH 11/11] Split b2 dependencies into public and private. --- build.jam | 4 +--- build/Jamfile.v2 | 8 +++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build.jam b/build.jam index 41dcf948..bf510643 100644 --- a/build.jam +++ b/build.jam @@ -6,9 +6,7 @@ require-b2 5.2 ; constant boost_dependencies : - /boost/config//boost_config - /boost/io//boost_io - /boost/predef//boost_predef ; + /boost/config//boost_config ; project /boost/timer : common-requirements diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 593d09d9..6b6ba9e0 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -9,8 +9,14 @@ SOURCES = auto_timers_construction cpu_timer ; +constant boost_dependencies_private : + /boost/io//boost_io + /boost/predef//boost_predef + ; + project - : common-requirements $(boost_dependencies) ; + : common-requirements $(boost_dependencies) + : requirements $(boost_dependencies_private) ; lib boost_timer : ../src/$(SOURCES).cpp