Merge pull request #121 from grafikrobot/modular

mclow · web-flow · commit 7f07838f8beb · 2024-09-03T11:59:17.000-07:00
Add support for modular build structure.
diff --git a/Jamfile b/Jamfile
diff --git 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
+    ;
diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
@@ -16,18 +16,18 @@ using quickbook ;
 using doxygen ;
 using boostbook ;
 
-doxygen autodoc 
-    : 
-        [ glob ../../../boost/algorithm/*.hpp 
-               ../../../boost/algorithm/searching/*.hpp
-               ../../../boost/algorithm/cxx11/*.hpp
-               ../../../boost/algorithm/cxx14/*.hpp
-               ../../../boost/algorithm/cxx17/*.hpp
+doxygen autodoc
+    :
+        [ 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\""
        <doxygen:param>WARNINGS=YES # Default NO, but useful to see warnings, especially in a logfile.
-    ; 
+    ;
 
 
 xml algorithm : algorithm.qbk ;
@@ -36,7 +36,7 @@ boostbook standalone
   :
     algorithm
   :
-    <dependency>autodoc 
+    <dependency>autodoc
     <xsl:param>boost.root=../../../..
     <xsl:param>"boost.doxygen.reftitle=Boost.Algorithms C++ Reference"
     <xsl:param>chapter.autolabel=0
diff --git 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
diff --git 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 ;
 
diff --git a/minmax/test/Jamfile.v2 b/minmax/test/Jamfile.v2
@@ -9,17 +9,19 @@
 
 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/minmax
    : [ run minmax_element_test.cpp unit_test_framework
        : : : : minmax_element ]
      [ run minmax_test.cpp unit_test_framework
-       : : : : minmax ]      
+       : : : : minmax ]
    ;
 }
 
diff --git a/string/doc/Jamfile.v2 b/string/doc/Jamfile.v2
@@ -10,40 +10,40 @@
 import toolset ;
 toolset.using doxygen ;
 
-boostbook string_algo : string_algo.xml autodoc 
+boostbook string_algo : string_algo.xml autodoc
 	:
         <xsl:param>boost.root=../../../../..
         <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
 	;
 
 doxygen autodoc
-    :   
-    [ glob ../../../../boost/algorithm/string.hpp ]
-    [ glob ../../../../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.hpp ]
+    [ glob ../../include/boost/algorithm/string_regex.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
@@ -53,7 +53,7 @@ doxygen autodoc
     <doxygen:param>SEARCH_INCLUDES=YES
     <doxygen:param>PREDEFINED="BOOST_STRING_TYPENAME=typename \"BOOST_STATIC_CONSTANT(type,var)=static const type var;\""
     ;
-        
+
 
 
 
diff --git 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 ;
diff --git a/string/test/Jamfile.v2 b/string/test/Jamfile.v2
@@ -9,31 +9,33 @@
 
 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
-    : [ run 
+    : [ run
             trim_test.cpp unit_test_framework
           : :
             :
             : trim
         ]
-      [ run 
+      [ run
             conv_test.cpp unit_test_framework
           : :
             :
             : conv
         ]
-      [ run 
+      [ run
             predicate_test.cpp unit_test_framework
           : :
             :
             : predicate
         ]
-      [ run 
+      [ run
             find_test.cpp unit_test_framework
           : :
             :
@@ -51,23 +53,23 @@ test-suite algorithm/string
             :
             : join
         ]
-      [ run 
+      [ run
             replace_test.cpp unit_test_framework
           : :
             :
             : replace
         ]
-      [ run 
+      [ run
             regex_test.cpp unit_test_framework
             ../../../regex/build//boost_regex
           : :
-            :   
+            :
             : regex
         ]
-      [ run 
+      [ run
             find_format_test.cpp unit_test_framework
           : :
-            :   
+            :
             : find_format
         ]
     ;
diff --git 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
     ;
 
 
@@ -85,7 +87,7 @@ alias unit_test_framework
 
 # Is_partitioned_until tests
      [ run is_partitioned_until_test.cpp unit_test_framework    : : : : is_partitioned_until_test ]
-   
+
 # Apply_permutation tests
      [ run apply_permutation_test.cpp unit_test_framework    : : : : apply_permutation_test ]
 # Find tests

Original file line number	Diff line number	Diff line change
`@@ -9,17 +9,19 @@`
`9`	`9`
`10`	`10`	`import testing ;`
`11`	`11`
	`12`	`+project : requirements <library>/boost/algorithm//boost_algorithm ;`
	`13`	`+`
`12`	`14`	`alias unit_test_framework`
`13`	`15`	`: # sources`
`14`		`- /boost//unit_test_framework`
`15`		`- ;`
	`16`	`+ /boost/test//boost_unit_test_framework`
	`17`	`+ ;`
`16`	`18`
`17`	`19`	`{`
`18`	`20`	`test-suite algorithm/minmax`
`19`	`21`	`: [ run minmax_element_test.cpp unit_test_framework`
`20`	`22`	`: : : : minmax_element ]`
`21`	`23`	`[ run minmax_test.cpp unit_test_framework`
`22`		`- : : : : minmax ]`
	`24`	`+ : : : : minmax ]`
`23`	`25`	`;`
`24`	`26`	`}`
`25`	`27`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`# See http://www.boost.org for updates, documentation, and revision history.`
`9`	`9`
	`10`	`+project : requirements <library>/boost/algorithm//boost_algorithm ;`
`10`	`11`
`11`	`12`	`exe conv_example : conv_example.cpp ;`
`12`	`13`	`exe predicate_example : predicate_example.cpp ;`
Original file line number	Diff line number	Diff line change
`@@ -9,31 +9,33 @@`
`9`	`9`
`10`	`10`	`import testing ;`
`11`	`11`
	`12`	`+project : requirements <library>/boost/algorithm//boost_algorithm ;`
	`13`	`+`
`12`	`14`	`alias unit_test_framework`
`13`	`15`	`: # sources`
`14`		`- /boost//unit_test_framework`
`15`		`- ;`
	`16`	`+ /boost/test//boost_unit_test_framework`
	`17`	`+ ;`
`16`	`18`
`17`	`19`	`test-suite algorithm/string`
`18`		`- : [ run`
	`20`	`+ : [ run`
`19`	`21`	`trim_test.cpp unit_test_framework`
`20`	`22`	`: :`
`21`	`23`	`:`
`22`	`24`	`: trim`
`23`	`25`	`]`
`24`		`- [ run`
	`26`	`+ [ run`
`25`	`27`	`conv_test.cpp unit_test_framework`
`26`	`28`	`: :`
`27`	`29`	`:`
`28`	`30`	`: conv`
`29`	`31`	`]`
`30`		`- [ run`
	`32`	`+ [ run`
`31`	`33`	`predicate_test.cpp unit_test_framework`
`32`	`34`	`: :`
`33`	`35`	`:`
`34`	`36`	`: predicate`
`35`	`37`	`]`
`36`		`- [ run`
	`38`	`+ [ run`
`37`	`39`	`find_test.cpp unit_test_framework`
`38`	`40`	`: :`
`39`	`41`	`:`
`@@ -51,23 +53,23 @@ test-suite algorithm/string`
`51`	`53`	`:`
`52`	`54`	`: join`
`53`	`55`	`]`
`54`		`- [ run`
	`56`	`+ [ run`
`55`	`57`	`replace_test.cpp unit_test_framework`
`56`	`58`	`: :`
`57`	`59`	`:`
`58`	`60`	`: replace`
`59`	`61`	`]`
`60`		`- [ run`
	`62`	`+ [ run`
`61`	`63`	`regex_test.cpp unit_test_framework`
`62`	`64`	`../../../regex/build//boost_regex`
`63`	`65`	`: :`
`64`		`- :`
	`66`	`+ :`
`65`	`67`	`: regex`
`66`	`68`	`]`
`67`		`- [ run`
	`69`	`+ [ run`
`68`	`70`	`find_format_test.cpp unit_test_framework`
`69`	`71`	`: :`
`70`		`- :`
	`72`	`+ :`
`71`	`73`	`: find_format`
`72`	`74`	`]`
`73`	`75`	`;`