Update build.jam, build/Jamfile, test/Jamfile

boostorg · Aug 28, 2024 · 0715397 · 0715397
1 parent e639810
commit 0715397
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 30 deletions.
diff --git a/build.jam b/build.jam
@@ -1,18 +1,16 @@
-# Copyright René Ferdinand Rivera Morell 2023-2024
+# Copyright 2023-2024 René Ferdinand Rivera Morell
+# Copyright 2024 Peter Dimov
 # 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)
+# https://www.boost.org/LICENSE_1_0.txt
 
 require-b2 5.2 ;
 
 constant boost_dependencies :
-    /boost/config//boost_config ;
-
-project /boost/timer
-    : common-requirements
-        <include>include
+    /boost/config//boost_config
     ;
 
+project /boost/timer ;
+
 explicit
     [ alias boost_timer : build//boost_timer ]
     [ alias all : boost_timer build test ]
@@ -21,4 +19,3 @@ explicit
 call-if : boost-library timer
     : install boost_timer
     ;
-
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
@@ -7,25 +7,28 @@
 
 # See library home page at http://www.boost.org/libs/timer
 
-SOURCES = auto_timers_construction cpu_timer ;
-
 constant boost_dependencies_private :
     /boost/io//boost_io
     /boost/predef//boost_predef
     ;
 
 project
-    : common-requirements <library>$(boost_dependencies)
-    : requirements <library>$(boost_dependencies_private) ;
-
-lib boost_timer
-   : ../src/$(SOURCES).cpp
-   : # requirements
-     <link>shared:<define>BOOST_TIMER_DYN_LINK=1
-     <link>static:<define>BOOST_TIMER_STATIC_LINK=1
-   : # default-build
-   : # usage-requirements
-     <link>shared:<define>BOOST_TIMER_DYN_LINK=1
-     <link>static:<define>BOOST_TIMER_STATIC_LINK=1
-     <define>BOOST_TIMER_NO_LIB=1
-   ;
+    : common-requirements
+
+      <include>../include
+
+      <library>$(boost_dependencies)
+
+      <link>shared:<define>BOOST_TIMER_DYN_LINK=1
+      <link>static:<define>BOOST_TIMER_STATIC_LINK=1
+
+      <define>BOOST_TIMER_NO_LIB=1
+
+    : requirements
+
+      <library>$(boost_dependencies_private)
+;
+
+local SOURCES = auto_timers_construction cpu_timer ;
+
+lib boost_timer : ../src/$(SOURCES).cpp ;
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
@@ -15,22 +15,26 @@ path-constant parent : .. ;  # so that inspect will start in boost-root/libs/tim
 project
     : requirements
       <library>/boost/timer//boost_timer
+      <library>/boost/core//boost_core
+      <library>/boost/detail//boost_detail
     ;
 
-run ../example/auto_cpu_timer_example.cpp : : : <test-info>always_show_run_output ;
+run ../example/auto_cpu_timer_example.cpp
+  : : : <test-info>always_show_run_output ;
 
-run cpu_timer_info.cpp : : : <test-info>always_show_run_output <library>/boost/detail//boost_detail ;
+run cpu_timer_info.cpp
+  : : : <test-info>always_show_run_output ;
 
 run cpu_timer_test.cpp
-  : : : <test-info>always_show_run_output <library>/boost/detail//boost_detail ;
+  : : : <test-info>always_show_run_output ;
 
 run ../example/timex.cpp : echo "Hello, world" : : <test-info>always_show_run_output ;
 
 compile original_timer_test.cpp ;
 
-run chrono_conflict_test.cpp /boost/chrono//boost_chrono : : : <link>static ;
+run chrono_conflict_test.cpp : : : <library>/boost/chrono//boost_chrono <link>static ;
 
-run progress_display_test.cpp /boost/core//boost_core ;
+run progress_display_test.cpp ;
 
 # run /boost/tools/inspect//inspect/<variant>release : $(parent) -text -brief : : <test-info>always_show_run_output : inspect ;
 # explicit inspect ;