Merge pull request #121 from grafikrobot/modular

Add support for modular build structure.
2025-08-01 05:24:30 +02:00 · 2024-09-03 11:59:17 -07:00
parent faac048d59 bbfcdf1322
commit 7f07838f8b
10 changed files with 110 additions and 67 deletions
--- a/11
+++ b/11
@@ -1,11 +0,0 @@
-#  Boost.Algorithm Library Jamfile
-#
-#  Copyright (c) 2018 James E. King III
-#
-#  Use, modification, and distribution are subject to 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)
-
-# please order by name to ease maintenance
-build-project example ;
-build-project test ;
--- a/build.jam
+++ b/build.jam
@@ -0,0 +1,42 @@
+# 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/array//boost_array
+    /boost/assert//boost_assert
+    /boost/bind//boost_bind
+    /boost/concept_check//boost_concept_check
+    /boost/config//boost_config
+    /boost/core//boost_core
+    /boost/exception//boost_exception
+    /boost/function//boost_function
+    /boost/iterator//boost_iterator
+    /boost/mpl//boost_mpl
+    /boost/range//boost_range
+    /boost/regex//boost_regex
+    /boost/static_assert//boost_static_assert
+    /boost/throw_exception//boost_throw_exception
+    /boost/tuple//boost_tuple
+    /boost/type_traits//boost_type_traits
+    /boost/unordered//boost_unordered ;
+
+project /boost/algorithm
+    : common-requirements
+        <include>include
+    ;
+
+explicit
+    [ alias boost_algorithm : : : : <library>$(boost_dependencies) ]
+    [ alias all : boost_algorithm test
+        example
+        minmax/example minmax/test
+        string/example string/test
+        ]
+    ;
+
+call-if : boost-library algorithm
+    ;
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -18,11 +18,11 @@ using boostbook ;

 doxygen autodoc
    :
-        [ glob ../../../boost/algorithm/*.hpp 
-               ../../../boost/algorithm/searching/*.hpp
-               ../../../boost/algorithm/cxx11/*.hpp
-               ../../../boost/algorithm/cxx14/*.hpp
-               ../../../boost/algorithm/cxx17/*.hpp
+        [ glob ../include/boost/algorithm/*.hpp
+               ../include/boost/algorithm/searching/*.hpp
+               ../include/boost/algorithm/cxx11/*.hpp
+               ../include/boost/algorithm/cxx14/*.hpp
+               ../include/boost/algorithm/cxx17/*.hpp
        ]
    :
       <doxygen:param>"PREDEFINED=\"BOOST_ALGORITHM_DOXYGEN=1\""
--- a/example/Jamfile.v2
+++ b/example/Jamfile.v2
@@ -8,9 +8,9 @@
 #  See http://www.boost.org for updates, documentation, and revision history.


-project /boost/algorithm/example
+project
    : requirements
-      <include>../../../
+      <library>/boost/algorithm//boost_algorithm
      <optimization>speed
      <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS
      <toolset>msvc:<define>NOMINMAX
--- a/minmax/example/Jamfile
+++ b/minmax/example/Jamfile
@@ -7,6 +7,11 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 #

+project
+    : requirements
+        <library>/boost/algorithm//boost_algorithm
+        <library>/boost/timer//boost_timer ;
+
 exe minmax_ex : minmax_ex.cpp ;
 exe minmax_timer : minmax_timer.cpp ;

--- a/minmax/test/Jamfile.v2
+++ b/minmax/test/Jamfile.v2
@@ -9,9 +9,11 @@

 import testing ;

+project : requirements <library>/boost/algorithm//boost_algorithm ;
+
 alias unit_test_framework
    : # sources
-        /boost//unit_test_framework
+        /boost/test//boost_unit_test_framework
    ;

 {
--- a/string/doc/Jamfile.v2
+++ b/string/doc/Jamfile.v2
@@ -18,32 +18,32 @@ boostbook string_algo : string_algo.xml autodoc

 doxygen autodoc
    :
-    [ glob ../../../../boost/algorithm/string.hpp ]
-    [ glob ../../../../boost/algorithm/string_regex.hpp ]
+    [ glob ../../include/boost/algorithm/string.hpp ]
+    [ glob ../../include/boost/algorithm/string_regex.hpp ]

-    [ glob ../../../../boost/algorithm/string/classification.hpp ]
-    [ glob ../../../../boost/algorithm/string/iterator_range.hpp ]       
-    [ glob ../../../../boost/algorithm/string/sequence_traits.hpp ]
-    [ glob ../../../../boost/algorithm/string/std_containers_traits.hpp ]
-    [ glob ../../../../boost/algorithm/string/concept.hpp ]
-    [ glob ../../../../boost/algorithm/string/compare.hpp ]
-    [ glob ../../../../boost/algorithm/string/constants.hpp ]
-    [ glob ../../../../boost/algorithm/string/case_conv.hpp ]
-    [ glob ../../../../boost/algorithm/string/find.hpp ]
-    [ glob ../../../../boost/algorithm/string/finder.hpp ]
-    [ glob ../../../../boost/algorithm/string/find_iterator.hpp ]
-    [ glob ../../../../boost/algorithm/string/trim.hpp ]
-    [ glob ../../../../boost/algorithm/string/predicate.hpp ]
-    [ glob ../../../../boost/algorithm/string/split.hpp ]
-    [ glob ../../../../boost/algorithm/string/iter_find.hpp ]
-    [ glob ../../../../boost/algorithm/string/erase.hpp ]
-    [ glob ../../../../boost/algorithm/string/join.hpp ]
-    [ glob ../../../../boost/algorithm/string/replace.hpp ]
-    [ glob ../../../../boost/algorithm/string/find_format.hpp ]
-    [ glob ../../../../boost/algorithm/string/formatter.hpp ]
-    [ glob ../../../../boost/algorithm/string/regex.hpp ]
-    [ glob ../../../../boost/algorithm/string/regex_find_format.hpp ]
-    [ glob ../../../../boost/algorithm/string/trim_all.hpp ]
+    [ glob ../../include/boost/algorithm/string/classification.hpp ]
+    [ glob ../../include/boost/algorithm/string/iterator_range.hpp ]
+    [ glob ../../include/boost/algorithm/string/sequence_traits.hpp ]
+    [ glob ../../include/boost/algorithm/string/std_containers_traits.hpp ]
+    [ glob ../../include/boost/algorithm/string/concept.hpp ]
+    [ glob ../../include/boost/algorithm/string/compare.hpp ]
+    [ glob ../../include/boost/algorithm/string/constants.hpp ]
+    [ glob ../../include/boost/algorithm/string/case_conv.hpp ]
+    [ glob ../../include/boost/algorithm/string/find.hpp ]
+    [ glob ../../include/boost/algorithm/string/finder.hpp ]
+    [ glob ../../include/boost/algorithm/string/find_iterator.hpp ]
+    [ glob ../../include/boost/algorithm/string/trim.hpp ]
+    [ glob ../../include/boost/algorithm/string/predicate.hpp ]
+    [ glob ../../include/boost/algorithm/string/split.hpp ]
+    [ glob ../../include/boost/algorithm/string/iter_find.hpp ]
+    [ glob ../../include/boost/algorithm/string/erase.hpp ]
+    [ glob ../../include/boost/algorithm/string/join.hpp ]
+    [ glob ../../include/boost/algorithm/string/replace.hpp ]
+    [ glob ../../include/boost/algorithm/string/find_format.hpp ]
+    [ glob ../../include/boost/algorithm/string/formatter.hpp ]
+    [ glob ../../include/boost/algorithm/string/regex.hpp ]
+    [ glob ../../include/boost/algorithm/string/regex_find_format.hpp ]
+    [ glob ../../include/boost/algorithm/string/trim_all.hpp ]
    :
    <doxygen:param>HIDE_UNDOC_MEMBERS=YES
    <doxygen:param>EXTRACT_PRIVATE=NO
--- a/string/example/Jamfile
+++ b/string/example/Jamfile
@@ -7,6 +7,7 @@
 #
 #  See http://www.boost.org for updates, documentation, and revision history.

+project : requirements <library>/boost/algorithm//boost_algorithm ;

 exe conv_example : conv_example.cpp ;
 exe predicate_example : predicate_example.cpp ;
--- a/string/test/Jamfile.v2
+++ b/string/test/Jamfile.v2
@@ -9,9 +9,11 @@

 import testing ;

+project : requirements <library>/boost/algorithm//boost_algorithm ;
+
 alias unit_test_framework
    : # sources
-        /boost//unit_test_framework
+        /boost/test//boost_unit_test_framework
    ;

 test-suite algorithm/string
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -9,9 +9,11 @@

 import testing ;

+project : requirements <library>/boost/algorithm//boost_algorithm ;
+
 alias unit_test_framework
    : # sources
-        /boost//unit_test_framework
+        /boost/test//boost_unit_test_framework
    ;