Skip to content

Commit

Permalink
Merge pull request #287 from grafikrobot/modular
Browse files Browse the repository at this point in the history
Add support for modular build structure.
  • Loading branch information
igaztanaga authored Aug 18, 2024
2 parents 0f44827 + df9132c commit c029dc3
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 18 deletions.
11 changes: 0 additions & 11 deletions Jamfile

This file was deleted.

27 changes: 27 additions & 0 deletions build.jam
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# 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/assert//boost_assert
/boost/config//boost_config
/boost/intrusive//boost_intrusive
/boost/move//boost_move ;

project /boost/container
: common-requirements
<include>include
;

explicit
[ alias boost_container : build//boost_container ]
[ alias all : boost_container example test ]
;

call-if : boost-library container
: install boost_container
;

6 changes: 3 additions & 3 deletions build/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@

import sequence ;

project boost/container
project
: source-location ../src
: common-requirements <library>$(boost_dependencies)
: usage-requirements # pass these requirement to dependents (i.e. users)
<link>shared:<define>BOOST_CONTAINER_DYN_LINK=1
<link>static:<define>BOOST_CONTAINER_STATIC_LINK=1
<define>BOOST_CONTAINER_NO_LIB=1
;

lib boost_container
: alloc_lib.c [ sequence.insertion-sort [ glob *.cpp ] ]
: <link>shared:<define>BOOST_CONTAINER_DYN_LINK=1
<link>static:<define>BOOST_CONTAINER_STATIC_LINK=1
;

boost-install boost_container ;
4 changes: 2 additions & 2 deletions doc/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ path-constant here : . ;

doxygen autodoc
:
[ glob ../../../boost/container/*.hpp ]
[ glob ../../../boost/container/pmr/*.hpp ]
[ glob ../include/boost/container/*.hpp ]
[ glob ../include/boost/container/pmr/*.hpp ]
:
<doxygen:param>EXTRACT_ALL=NO
<doxygen:param>HIDE_UNDOC_MEMBERS=YES
Expand Down
2 changes: 2 additions & 0 deletions example/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
# Boost Software License, Version 1.0. (See accompanying file
# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

import testing ;

# this rule enumerates through all the sources and invokes
# the run rule for each source, the result is a list of all
# the run rules, which we can pass on to the test_suite rule:
Expand Down
8 changes: 6 additions & 2 deletions test/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@
# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

project
: requirements
<link>shared:<define>BOOST_CONTAINER_DYN_LINK=1
: requirements
<library>/boost/iterator//boost_iterator
<library>/boost/utility//boost_utility
<library>/boost/tuple//boost_tuple

<link>shared:<define>BOOST_CONTAINER_DYN_LINK=1
<toolset>gcc-cygwin:<link>static
;

Expand Down

0 comments on commit c029dc3

Please sign in to comment.