Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for modular build structure. #500

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
32 changes: 32 additions & 0 deletions build.jam
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# 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 ;

path-constant BOOST_CONFIG_ROOT : . ;
import-search $(BOOST_CONFIG_ROOT)/checks ;

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

explicit
[ alias boost_config : : : : <library>$(boost_dependencies) ]
[ alias all : boost_config test ]
[ alias testing
: # sources
: # requirements
: # default-buidl
: # usage-requirements
<include>test
]
;

call-if : boost-library config
;

use-project /boost/architecture : checks/architecture ;

9 changes: 7 additions & 2 deletions test/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,20 @@

import feature ;
import testing ;
import notfile ;

project
: requirements
<toolset>gcc:<cxxflags>-Wno-deprecated-declarations
<library>/boost/core//boost_core
<library>/boost/detail//boost_detail
<library>/boost/type_traits//boost_type_traits
;


import modules ;
import ../checks/config : requires ;
import-search /boost/config/checks ;
import config : requires ;

local is_unix = [ modules.peek : UNIX ] ;

Expand Down Expand Up @@ -98,7 +103,7 @@ test-suite config
<threading>single
<define>BOOST_DYN_LINK=1
<define>BOOST_CONFIG_NO_LIB=1
<target-os>vxworks:<link>shared
<target-os>vxworks:<link>shared
:
config_link_test
]
Expand Down
10 changes: 5 additions & 5 deletions test/all/options_v2.jam
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# copyright John Maddock 2003
# Use, modification and distribution are subject to the
# Boost Software License, Version 1.0. (See accompanying file
# 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)

project
: requirements
: requirements
# threading tests require thread support turned on:
<threading>multi
;
local test-requirements = <library>../../test/build//boost_test_exec_monitor ;

local test-requirements = <library>/boost/test//boost_test_exec_monitor ;
10 changes: 5 additions & 5 deletions tools/Jamfile.v2
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Copyright John Maddock 2005.
# Use, modification and distribution are subject to the
# Boost Software License, Version 1.0. (See accompanying file
# 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)

run generate.cpp
../../regex/build//boost_regex
../../filesystem/build//boost_filesystem ../../system/build//boost_system
run generate.cpp
/boost/regex//boost_regex
/boost/filesystem//boost_filesystem /boost/system//boost_system
: ../../..
;

Expand Down
Loading