Skip to content

Add support for modular build structure. #21

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.

Sign up for GitHub

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

Merged
pdimov merged 17 commits into from
Apr 14, 2025
Merged

Add support for modular build structure. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c52a4d0
Adjust CI to work with modular branches.
grafikrobot Apr 7, 2024
174e478
Add modular build setup.
grafikrobot Apr 7, 2024
e5f45d8
Add modular build setup.
grafikrobot Apr 7, 2024
5b1054a
Avoid complexities of shared libs for CI.
grafikrobot Apr 7, 2024
062a9d9
Fix filsystem lib refs.
grafikrobot Apr 8, 2024
2dd8967
Remove redundant build//install target.
grafikrobot Apr 13, 2024
a5b66cc
Fix reference to build in CI as a way to dist install.
grafikrobot Apr 13, 2024
b69e0bc
Build the dist target for tools by default.
grafikrobot Apr 24, 2024
fbf4ed6
Rework BOOST_BRANCH value to avoid modular branch name in the logic.
grafikrobot May 2, 2024
b7985ac
Use imperative declarations of explicit targets per @pdimov's prefere…
grafikrobot May 2, 2024
88c9347
Remove temp link=static that crept in for CI build.
grafikrobot May 2, 2024
09440ff
Add requires-b2 check to top-level build file.
grafikrobot May 5, 2024
d96b2b5
Bump B2 require to 5.2
grafikrobot Jun 14, 2024
26e5019
Sync from upstream.
grafikrobot Oct 10, 2024
6fdaf8d
Undo modular CI testing fork changes.
grafikrobot Oct 10, 2024
41630a4
Sync from upstream.
grafikrobot Apr 5, 2025
aa4cbf4
Need to explicitly install boostdep for this test.
grafikrobot Apr 5, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ jobs:
rm -rf tools/boostdep/*
cp -r $GITHUB_WORKSPACE/* tools/boostdep
./bootstrap.sh
./b2 tools/boostdep/build
./b2 tools/boostdep//dist

- name: Check exceptions
run: |
Expand Down
30 changes: 30 additions & 0 deletions build.jam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Copyright René Ferdinand Rivera Morell 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 ;

import option ;
import path ;

local DIST_DIR = [ option.get distdir ] ;
DIST_DIR ?= [ option.get build-dir ] ;
DIST_DIR ?= [ path.join $(BOOST_ROOT) dist ] ;
DIST_DIR ?= dist ;
DIST_DIR = [ path.root [ path.make $(DIST_DIR) ] [ path.pwd ] ] ;

project /boost/boostdep ;

install dist-bin
: build//boostdep/<link>static
: <install-type>EXE <location>$(DIST_DIR)/bin
: release ;
explicit install ;
alias boostdep : build//boostdep ;
explicit boostdep ;
alias all : boostdep test dist-bin ;
explicit all ;

# Install distribution files/execs by default.
alias dist : dist-bin ;
4 changes: 1 addition & 3 deletions build/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@

project : default-build release ;

exe boostdep : ../src/boostdep.cpp /boost//filesystem ;

install dist-bin : boostdep : <location>../../../dist/bin ;
exe boostdep : ../src/boostdep.cpp /boost/filesystem//boost_filesystem ;
12 changes: 6 additions & 6 deletions test/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import testing ;
path-constant ROOT : ../../.. ;
path-constant HERE : . ;

run ../src/boostdep.cpp /boost//filesystem : --boost-root $(ROOT) --capture-output assert --compare-output $(HERE)/assert-primary.txt : : : assert-primary-txt ;
run ../src/boostdep.cpp /boost//filesystem : --boost-root $(ROOT) --capture-output --secondary bind --compare-output $(HERE)/bind-secondary.txt : : : bind-secondary-txt ;
run ../src/boostdep.cpp /boost/filesystem//boost_filesystem : --boost-root $(ROOT) --capture-output assert --compare-output $(HERE)/assert-primary.txt : : : assert-primary-txt ;
run ../src/boostdep.cpp /boost/filesystem//boost_filesystem : --boost-root $(ROOT) --capture-output --secondary bind --compare-output $(HERE)/bind-secondary.txt : : : bind-secondary-txt ;

run ../src/boostdep.cpp /boost//filesystem : --boost-root $(ROOT) --capture-output --html --primary assert --compare-output $(HERE)/assert-primary.html : : : assert-primary-html ;
run ../src/boostdep.cpp /boost//filesystem : --boost-root $(ROOT) --capture-output --html --secondary bind --compare-output $(HERE)/bind-secondary.html : : : bind-secondary-html ;
run ../src/boostdep.cpp /boost/filesystem//boost_filesystem : --boost-root $(ROOT) --capture-output --html --primary assert --compare-output $(HERE)/assert-primary.html : : : assert-primary-html ;
run ../src/boostdep.cpp /boost/filesystem//boost_filesystem : --boost-root $(ROOT) --capture-output --html --secondary bind --compare-output $(HERE)/bind-secondary.html : : : bind-secondary-html ;

run ../src/boostdep.cpp /boost//filesystem : --boost-root $(ROOT) --csv --capture-output --primary assert --compare-output $(HERE)/assert-primary.csv : : : assert-primary-csv ;
run ../src/boostdep.cpp /boost//filesystem : --boost-root $(ROOT) --csv --capture-output --secondary bind --compare-output $(HERE)/bind-secondary.csv : : : bind-secondary-csv ;
run ../src/boostdep.cpp /boost/filesystem//boost_filesystem : --boost-root $(ROOT) --csv --capture-output --primary assert --compare-output $(HERE)/assert-primary.csv : : : assert-primary-csv ;
run ../src/boostdep.cpp /boost/filesystem//boost_filesystem : --boost-root $(ROOT) --csv --capture-output --secondary bind --compare-output $(HERE)/bind-secondary.csv : : : bind-secondary-csv ;
Loading