Add support for modular build structure.

.github/workflows/ci.yml

@@ -110,13 +110,13 @@ jobs:
             install:
               - g++-12-multilib
           - name: UBSAN
-            toolset: gcc-12
-            cxxstd: "17"
+            toolset: gcc-13
+            cxxstd: "11"
             address_model: 64
             ubsan: 1
-            os: ubuntu-22.04
+            os: ubuntu-24.04
             install:
-              - g++-12-multilib
+              - g++-13-multilib
 
           # Linux, clang
           - toolset: clang

build.jam

@@ -0,0 +1,60 @@
+# 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/algorithm//boost_algorithm
+    /boost/assert//boost_assert
+    /boost/bind//boost_bind
+    /boost/config//boost_config
+    /boost/core//boost_core
+    /boost/detail//boost_detail
+    /boost/exception//boost_exception
+    /boost/function//boost_function
+    /boost/io//boost_io
+    /boost/iterator//boost_iterator
+    /boost/mpl//boost_mpl
+    /boost/numeric_conversion//boost_numeric_conversion
+    /boost/optional//boost_optional
+    /boost/preprocessor//boost_preprocessor
+    /boost/smart_ptr//boost_smart_ptr
+    /boost/static_assert//boost_static_assert
+    /boost/type_traits//boost_type_traits
+    /boost/utility//boost_utility ;
+
+project /boost/test
+    : common-requirements
+        <include>include
+    ;
+
+explicit
+    [ alias boost_test : : : : <library>$(boost_dependencies) ]
+    [ alias boost_prg_exec_monitor : build//boost_prg_exec_monitor ]
+    [ alias boost_test_exec_monitor : build//boost_test_exec_monitor ]
+    [ alias boost_unit_test_framework : build//boost_unit_test_framework ]
+    [ alias prg_exec_monitor : boost_prg_exec_monitor ]
+    [ alias test_exec_monitor : boost_test_exec_monitor ]
+    [ alias unit_test_framework : boost_unit_test_framework ]
+    [ alias boost_included_prg_exec_monitor : : : : <library>$(boost_dependencies) ]
+    [ alias boost_included_test_exec_monitor : : : : <library>$(boost_dependencies) ]
+    [ alias boost_included_unit_test_framework : : : : <library>$(boost_dependencies) ]
+    [ alias included : : : : <library>$(boost_dependencies) ]
+    [ alias included_prg_exec_monitor : boost_included_prg_exec_monitor ]
+    [ alias included_test_exec_monitor : boost_included_test_exec_monitor ]
+    [ alias included_unit_test_framework : boost_included_unit_test_framework ]
+    [ alias all : example test
+        boost_prg_exec_monitor
+        boost_test_exec_monitor
+        boost_unit_test_framework ]
+    ;
+
+call-if : boost-library test
+    : install
+        boost_prg_exec_monitor
+        boost_test_exec_monitor
+        boost_unit_test_framework
+    ;
+

build/Jamfile.v2

@@ -6,12 +6,14 @@
 
 import os ;
 
-import ../../predef/tools/check/predef
+import-search /boost/predef/tools/check ;
+import predef
     : check
     : predef-check ;
 
-project boost/test
+project
     : source-location ../src
+    : common-requirements <library>$(boost_dependencies)
     : requirements <link>shared:<define>BOOST_TEST_DYN_LINK=1
                    <toolset>borland:<cxxflags>-w-8080
                    <target-os>cygwin:<define>_POSIX_C_SOURCE=200112L
@@ -26,7 +28,7 @@ project boost/test
                    # <warnings-as-errors>on
 
     : usage-requirements
-                   <define>BOOST_TEST_NO_AUTO_LINK=1
+                   <define>BOOST_TEST_NO_LIB=1
                    # Disable Warning about boost::noncopyable not being exported
                    <link>shared,<toolset>msvc:<cxxflags>-wd4275
     ;
@@ -113,7 +115,3 @@ lib boost_unit_test_framework
 alias minimal ;
 
 alias included ;
-
-boost-install boost_prg_exec_monitor
-              boost_test_exec_monitor
-              boost_unit_test_framework ;

doc/Jamfile.v2

@@ -14,80 +14,82 @@ using boostbook ;
 
 import doxygen ;
 
+path-constant TEST_ROOT : .. ;
+
 doxygen doxygen_reference_generated_doc
     :
-      $(BOOST_ROOT)/libs/test/include/boost/test/debug_config.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/detail/global_typedef.hpp      
-      $(BOOST_ROOT)/libs/test/include/boost/test/debug.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/execution_monitor.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/framework.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/tools/assertion_result.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/unit_test.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/tree/observer.hpp
+      $(TEST_ROOT)/include/boost/test/debug_config.hpp
+      $(TEST_ROOT)/include/boost/test/detail/global_typedef.hpp
+      $(TEST_ROOT)/include/boost/test/debug.hpp
+      $(TEST_ROOT)/include/boost/test/execution_monitor.hpp
+      $(TEST_ROOT)/include/boost/test/framework.hpp
+      $(TEST_ROOT)/include/boost/test/tools/assertion_result.hpp
+      $(TEST_ROOT)/include/boost/test/unit_test.hpp
+      $(TEST_ROOT)/include/boost/test/tree/observer.hpp
 
       # logs and formatters
-      $(BOOST_ROOT)/libs/test/include/boost/test/unit_test_log.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/output/xml_log_formatter.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/output/plain_report_formatter.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/output/compiler_log_formatter.hpp
+      $(TEST_ROOT)/include/boost/test/unit_test_log.hpp
+      $(TEST_ROOT)/include/boost/test/output/xml_log_formatter.hpp
+      $(TEST_ROOT)/include/boost/test/output/plain_report_formatter.hpp
+      $(TEST_ROOT)/include/boost/test/output/compiler_log_formatter.hpp
 
       # reports
-      $(BOOST_ROOT)/libs/test/include/boost/test/output/xml_report_formatter.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/unit_test_log_formatter.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/results_reporter.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/results_collector.hpp
+      $(TEST_ROOT)/include/boost/test/output/xml_report_formatter.hpp
+      $(TEST_ROOT)/include/boost/test/unit_test_log_formatter.hpp
+      $(TEST_ROOT)/include/boost/test/results_reporter.hpp
+      $(TEST_ROOT)/include/boost/test/results_collector.hpp
 
       # progress monitor
-      $(BOOST_ROOT)/libs/test/include/boost/test/progress_monitor.hpp
+      $(TEST_ROOT)/include/boost/test/progress_monitor.hpp
 
       # test cases and suites
-      $(BOOST_ROOT)/libs/test/include/boost/test/tree/test_unit.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/parameterized_test.hpp
+      $(TEST_ROOT)/include/boost/test/tree/test_unit.hpp
+      $(TEST_ROOT)/include/boost/test/parameterized_test.hpp
 
       # execution monitor source files
-      $(BOOST_ROOT)/libs/test/include/boost/test/execution_monitor.hpp
+      $(TEST_ROOT)/include/boost/test/execution_monitor.hpp
 
       # output test stream
-      $(BOOST_ROOT)/libs/test/include/boost/test/tools/output_test_stream.hpp
+      $(TEST_ROOT)/include/boost/test/tools/output_test_stream.hpp
 
       # datasets
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/fwd.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/test_case.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/for_each_sample.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/size.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/delayed.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/initializer_list.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/array.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/collection.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/generate.hpp
-
-
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/grid.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/join.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/singleton.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/zip.hpp
+      $(TEST_ROOT)/include/boost/test/data/monomorphic/fwd.hpp
+      $(TEST_ROOT)/include/boost/test/data/test_case.hpp
+      $(TEST_ROOT)/include/boost/test/data/for_each_sample.hpp
+      $(TEST_ROOT)/include/boost/test/data/size.hpp
+      $(TEST_ROOT)/include/boost/test/data/monomorphic/delayed.hpp
+      $(TEST_ROOT)/include/boost/test/data/monomorphic/initializer_list.hpp
+      $(TEST_ROOT)/include/boost/test/data/monomorphic/array.hpp
+      $(TEST_ROOT)/include/boost/test/data/monomorphic/collection.hpp
+      $(TEST_ROOT)/include/boost/test/data/monomorphic/generate.hpp
+
+
+      $(TEST_ROOT)/include/boost/test/data/monomorphic/grid.hpp
+      $(TEST_ROOT)/include/boost/test/data/monomorphic/join.hpp
+      $(TEST_ROOT)/include/boost/test/data/monomorphic/singleton.hpp
+      $(TEST_ROOT)/include/boost/test/data/monomorphic/zip.hpp
 
       # datasets generators
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/config.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/generators.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/generators/keywords.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/generators/random.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/generators/xrange.hpp
+      $(TEST_ROOT)/include/boost/test/data/config.hpp
+      $(TEST_ROOT)/include/boost/test/data/monomorphic/generators.hpp
+      $(TEST_ROOT)/include/boost/test/data/monomorphic/generators/keywords.hpp
+      $(TEST_ROOT)/include/boost/test/data/monomorphic/generators/random.hpp
+      $(TEST_ROOT)/include/boost/test/data/monomorphic/generators/xrange.hpp
 
       # utils
-      $(BOOST_ROOT)/libs/test/include/boost/test/utils/algorithm.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/utils/named_params.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/tools/floating_point_comparison.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/utils/is_forward_iterable.hpp
+      $(TEST_ROOT)/include/boost/test/utils/algorithm.hpp
+      $(TEST_ROOT)/include/boost/test/utils/named_params.hpp
+      $(TEST_ROOT)/include/boost/test/tools/floating_point_comparison.hpp
+      $(TEST_ROOT)/include/boost/test/utils/is_forward_iterable.hpp
 
       # BOOST_TEST related functions
-      $(BOOST_ROOT)/libs/test/include/boost/test/tools/detail/bitwise_manip.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/tools/detail/lexicographic_manip.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/tools/detail/per_element_manip.hpp
-      $(BOOST_ROOT)/libs/test/include/boost/test/tools/detail/tolerance_manip.hpp
+      $(TEST_ROOT)/include/boost/test/tools/detail/bitwise_manip.hpp
+      $(TEST_ROOT)/include/boost/test/tools/detail/lexicographic_manip.hpp
+      $(TEST_ROOT)/include/boost/test/tools/detail/per_element_manip.hpp
+      $(TEST_ROOT)/include/boost/test/tools/detail/tolerance_manip.hpp
 
       # others
-      $(BOOST_ROOT)/libs/test/include/boost/test/unit_test_parameters.hpp
+      $(TEST_ROOT)/include/boost/test/unit_test_parameters.hpp
     :
         <doxygen:param>EXTRACT_ALL=YES
         <doxygen:param>"PREDEFINED=\"BOOST_TEST_DECL=\" \\
@@ -102,8 +104,8 @@ doxygen doxygen_reference_generated_doc
         <doxygen:param>MACRO_EXPANSION=YES
         <doxygen:param>EXPAND_ONLY_PREDEF=YES
         <doxygen:param>SEARCH_INCLUDES=YES
-        <doxygen:param>INCLUDE_PATH=$(BOOST_ROOT)/libs/test/include
-        <doxygen:param>EXAMPLE_PATH=$(BOOST_ROOT)/libs/test/doc/examples
+        <doxygen:param>INCLUDE_PATH=$(TEST_ROOT)/include
+        <doxygen:param>EXAMPLE_PATH=$(TEST_ROOT)/doc/examples
         <doxygen:param>BRIEF_MEMBER_DESC=YES
         <doxygen:param>REPEAT_BRIEF=YES
         <doxygen:param>ALWAYS_DETAILED_SEC=YES

example/Jamfile.v2

@@ -11,7 +11,8 @@ import testing ;
 import os ;
 
 # requirements
-import ../../config/checks/config : requires ;
+import-search /boost/config/checks ;
+import config : requires ;
 
 local HAS_UBSAN = "NO_UBSAN" ; # need to defined something
 if [ os.environ UBSAN ]
@@ -22,21 +23,22 @@ if [ os.environ UBSAN ]
 ECHO $(HAS_UBSAN:J) ;
 
 # Project
-project boost/test-examples
+project
     :
     : requirements
+      <library>/boost/test//boost_test
       <toolset>clang:<cxxflags>-Wno-c99-extensions <define>$(HAS_UBSAN:J)
     ;
 
 # Define aliases for the needed libs to get shorter names
 alias prg_exec_monitor
     : # sources
-        /boost//prg_exec_monitor
+        /boost/test//boost_prg_exec_monitor
     ;
 
 alias unit_test_framework
     : # sources
-        /boost//unit_test_framework
+        /boost/test//boost_unit_test_framework
     ;
 
 # make aliases explicit so the libraries will only be built when requested
@@ -60,7 +62,7 @@ alias boost_test_examples
     [ run      unit_test_example_08.cpp unit_test_framework ]
     [ run      unit_test_example_09_1.cpp
                unit_test_example_09_2.cpp unit_test_framework ]
-    [ run-fail unit_test_example_10.cpp unit_test_framework/<link>static ]
+    [ run-fail unit_test_example_10.cpp unit_test_framework/<link>static : : : <library>/boost/lexical_cast//boost_lexical_cast ]
     [ run-fail unit_test_example_11.cpp unit_test_framework/<link>static ]
     [ link     unit_test_example_12.cpp unit_test_framework/<link>static ]
     [ run      unit_test_example_13.cpp ]