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. #44

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions Jamfile

This file was deleted.

33 changes: 33 additions & 0 deletions build.jam
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# 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/config//boost_config
/boost/core//boost_core
/boost/move//boost_move
/boost/preprocessor//boost_preprocessor
/boost/ptr_container//boost_ptr_container
/boost/range//boost_range
/boost/static_assert//boost_static_assert
/boost/throw_exception//boost_throw_exception
/boost/tuple//boost_tuple
/boost/type_traits//boost_type_traits ;

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

explicit
[ alias boost_assign : : : : <library>$(boost_dependencies) ]
[ alias all : boost_assign test ]
;

call-if : boost-library assign
;

16 changes: 8 additions & 8 deletions test/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
import path ;
import regex ;

project : requirements <library>/boost/assign//boost_assign ;

rule assign-test ( name )
{
return [
run $(name).cpp /boost/test//boost_unit_test_framework/<link>static ]
run $(name).cpp /boost/test//boost_unit_test_framework/<link>static /boost/multi_index//boost_multi_index ]
;
}

Expand All @@ -27,10 +29,9 @@ rule test_headers
{
local all_rules = ;
local file ;
local headers_path = [ path.make $(BOOST_ROOT)/libs/assign/include/boost/assign ] ;
for file in [ path.glob-tree $(headers_path) : *.hpp : assign ]
for file in [ glob-tree-ex ../include/boost/assign : *.hpp : assign ]
{
local rel_file = [ path.relative-to $(headers_path) $(file) ] ;
local rel_file = [ path.relative-to ../include/boost/assign $(file) ] ;
# Note: The test name starts with '~' in order to group these tests in the test report table, preferably at the end.
# All '/' are replaced with '-' because apparently test scripts have a problem with test names containing slashes.
local test_name = [ regex.replace $(rel_file) "/" "-" ] ;
Expand All @@ -39,10 +40,9 @@ rule test_headers
all_rules += [ compile compile/decl_header.cpp : <define>"BOOST_ASSIGN_TEST_HEADER=$(rel_file)" <dependency>$(file) : $(decl_test_name) ] ;
}

local tests_path = [ path.make $(BOOST_ROOT)/libs/assign/test/compile-fail ] ;
for file in [ path.glob-tree $(tests_path) : *.cpp ]
for file in [ glob-tree-ex compile-fail : *.cpp ]
{
local rel_file = [ path.relative-to $(tests_path) $(file) ] ;
local rel_file = [ path.relative-to compile-fail $(file) ] ;
local test_name = [ regex.replace [ regex.replace $(rel_file) "/" "-" ] ".cpp" "" ] ;
local decl_test_name = cf-$(test_name) ;
# ECHO $(rel_file) ;
Expand All @@ -69,7 +69,7 @@ test-suite assign :
[ assign-test list_of_workaround ]
[ assign-test email_example ]
[ assign-test my_vector_example ]
[ assign-test multi_index_container ]
[ assign-test multi_index_container ]
;


Loading