Skip to content

Commit 3950d79

Browse files
authored
Merge pull request #26 from grafikrobot/modular
Add support for modular build structure.
2 parents bd1db93 + ee24a02 commit 3950d79

File tree

6 files changed

+56
-38
lines changed

6 files changed

+56
-38
lines changed

build.jam

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Copyright René Ferdinand Rivera Morell 2023-2024
2+
# Distributed under the Boost Software License, Version 1.0.
3+
# (See accompanying file LICENSE_1_0.txt or copy at
4+
# http://www.boost.org/LICENSE_1_0.txt)
5+
6+
require-b2 5.2 ;
7+
8+
constant boost_dependencies :
9+
/boost/assert//boost_assert
10+
/boost/config//boost_config
11+
/boost/conversion//boost_conversion
12+
/boost/core//boost_core
13+
/boost/exception//boost_exception
14+
/boost/fusion//boost_fusion
15+
/boost/integer//boost_integer
16+
/boost/iterator//boost_iterator
17+
/boost/lexical_cast//boost_lexical_cast
18+
/boost/mpl//boost_mpl
19+
/boost/numeric_conversion//boost_numeric_conversion
20+
/boost/optional//boost_optional
21+
/boost/preprocessor//boost_preprocessor
22+
/boost/proto//boost_proto
23+
/boost/range//boost_range
24+
/boost/smart_ptr//boost_smart_ptr
25+
/boost/static_assert//boost_static_assert
26+
/boost/throw_exception//boost_throw_exception
27+
/boost/type_traits//boost_type_traits
28+
/boost/typeof//boost_typeof
29+
/boost/utility//boost_utility ;
30+
31+
project /boost/xpressive
32+
;
33+
34+
explicit
35+
[ alias boost_xpressive : : :
36+
: <include>include <library>$(boost_dependencies) ]
37+
[ alias all : boost_xpressive example perf test tools ]
38+
;
39+
40+
call-if : boost-library xpressive
41+
;
42+

doc/Jamfile.v2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import quickbook ;
77

88
doxygen autodoc
99
:
10-
[ glob ../../../boost/xpressive/*.hpp ]
11-
[ glob ../../../boost/xpressive/traits/*.hpp ]
10+
[ glob ../include/boost/xpressive/*.hpp ]
11+
[ glob ../include/boost/xpressive/traits/*.hpp ]
1212
:
1313
<doxygen:param>EXTRACT_ALL=YES
1414
<doxygen:param>"PREDEFINED=\"BOOST_XPRESSIVE_DOXYGEN_INVOKED\" \\

example/Jamfile.v2

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,19 @@
44

55
project
66
: requirements
7+
<library>/boost/xpressive//boost_xpressive
78
<toolset>msvc-8.0:<define>_SCL_SECURE_NO_DEPRECATE
89
<toolset>msvc-9.0:<define>_SCL_SECURE_NO_DEPRECATE
910
<toolset>msvc,<stdlib>stlport:<define>_STLP_EXPOSE_GLOBALS_IMPLEMENTATION
11+
<library>/boost/assign//boost_assign
1012
;
1113

12-
exe examples
14+
exe examples
1315
:
1416
main.cpp
15-
:
16-
<include>$(BOOST_ROOT)
1717
;
1818

1919
exe numbers
2020
:
2121
numbers.cpp
22-
:
23-
<include>$(BOOST_ROOT)
2422
;

perf/Jamfile.v2

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,19 @@
44
# License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
55
# http://www.boost.org/LICENSE_1_0.txt)
66

7-
#project
8-
# : requirements <library>../../../../boost/libs/regex/build//boost_regex
9-
# ;
7+
project : requirements <library>/boost/xpressive//boost_xpressive ;
108

11-
BOOST_REGEX_SOURCES =
12-
c_regex_traits
13-
cpp_regex_traits
14-
cregex
15-
fileiter
16-
icu
17-
instances
18-
posix_api
19-
regex
20-
regex_debug
21-
regex_raw_buffer
22-
regex_traits_defaults
23-
static_mutex
24-
w32_regex_traits
25-
wc_regex_traits
26-
wide_posix_api
27-
winstances
28-
usinstances ;
29-
30-
exe xprperf
31-
:
9+
exe xprperf
10+
:
3211
command_line.cpp
3312
main.cpp
3413
time_boost.cpp
3514
time_dynamic_xpressive.cpp
3615
time_static_xpressive.cpp
37-
$(BOOST_ROOT)/libs/regex/src/$(BOOST_REGEX_SOURCES).cpp
16+
/boost/regex//boost_regex
17+
/boost/timer//boost_timer
18+
/boost/test//boost_unit_test_framework
3819
:
39-
<include>$(BOOST_ROOT)
40-
<define>BOOST_REGEX_NO_LIB=1
41-
<define>BOOST_REGEX_RECURSIVE
42-
<define>BOOST_REGEX_USE_CPP_LOCALE
4320
<define>BOOST_XPRESSIVE_USE_CPP_TRAITS
21+
<define>BOOST_TIMER_ENABLE_DEPRECATED
4422
;

test/Jamfile.v2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import testing ;
77

88
project
99
: requirements
10+
<library>/boost/xpressive//boost_xpressive
1011
<toolset>intel:<debug-symbols>off
1112
# Turn off debug symbols on MSVC to bring down the size of object files
1213
<toolset>msvc:<debug-symbols>off

tools/Jamfile.v2

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
project
66
: requirements
7+
<library>/boost/xpressive//boost_xpressive
78
<toolset>intel:<debug-symbols>off
89
<toolset>msvc-7.1:<debug-symbols>off
910
<toolset>msvc-8.0:<define>_SCL_SECURE_NO_DEPRECATE
@@ -16,6 +17,4 @@ project
1617
exe perl2xpr
1718
:
1819
perl2xpr.cpp
19-
:
20-
<include>$(BOOST_ROOT)
2120
;

0 commit comments

Comments
 (0)