Skip to content

Add modular library level build file. #194

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 18 commits into from
Jun 25, 2025
Merged

Add modular library level build file. #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
57aca38
Add modular library level build file.
grafikrobot Feb 4, 2024
3f8e7df
Make the library modular usable.
grafikrobot Mar 11, 2024
c1fa3c9
Add missing import-search for cconfig/predef checks.
grafikrobot May 5, 2024
c1da5c0
Add requires-b2 check to top-level build file.
grafikrobot May 5, 2024
246c62a
Remove extra import-search.
grafikrobot May 6, 2024
26a8e5a
Remove extra require-b2.
grafikrobot May 6, 2024
66d9296
Bump B2 require to 5.2
grafikrobot Jun 14, 2024
7c9d002
Update copyright dates.
grafikrobot Jul 21, 2024
b29ff8a
Move inter-lib dependencies to a project variable and into the build …
grafikrobot Jul 24, 2024
15c36eb
Adjust doc build to avoid boost-root references.
grafikrobot Jul 28, 2024
be1526a
Update build deps.
grafikrobot Jul 31, 2024
bed89da
Replace GHA CI with simpler working one based on alandefreitas/cpp-ac…
grafikrobot Apr 6, 2025
87bd4ae
GCC 4.8 is the minimum available.
grafikrobot Apr 6, 2025
64e551c
Move project global include to target local include.
grafikrobot Apr 7, 2025
89388be
Only msvc gets minor version tests.
grafikrobot Apr 10, 2025
11e1f09
Redo GHA CI to undo move to cpp-actions.
grafikrobot Jun 6, 2025
6bc3f6c
Update os/containers to account for unavailable packages in old conta…
grafikrobot Jun 6, 2025
6b31b4c
Tweaks per comments.
grafikrobot Jun 7, 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
131 changes: 61 additions & 70 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: "gcc 4.7"
buildtype: "boost"
packages: "g++-4.7"
os: "ubuntu-20.04"
os: "ubuntu-latest"
container: "ubuntu:16.04"
llvm_os: ""
llvm_ver: ""
Expand All @@ -29,7 +29,7 @@ jobs:
cxxstd: "11"
- name: "gcc 4.8"
packages: "g++-4.8"
os: "ubuntu-20.04"
os: "ubuntu-latest"
container: "ubuntu:16.04"
llvm_os: ""
llvm_ver: ""
Expand All @@ -38,7 +38,7 @@ jobs:
cxxstd: "11"
- name: "gcc 4.9"
packages: "g++-4.9"
os: "ubuntu-20.04"
os: "ubuntu-latest"
container: "ubuntu:16.04"
llvm_os: ""
llvm_ver: ""
Expand All @@ -47,7 +47,7 @@ jobs:
cxxstd: "11"
- name: "gcc 5"
packages: "g++-5"
os: "ubuntu-20.04"
os: "ubuntu-latest"
container: "ubuntu:16.04"
llvm_os: ""
llvm_ver: ""
Expand All @@ -56,52 +56,52 @@ jobs:
cxxstd: "11,14,1z"
- name: "gcc 6"
packages: "g++-6"
os: "ubuntu-20.04"
container: "ubuntu:16.04"
os: "ubuntu-latest"
container: "ubuntu:18.04"
llvm_os: ""
llvm_ver: ""
toolset: "gcc"
compiler: "g++-6"
cxxstd: "11,14,1z"
- name: "gcc 7"
packages: "g++-7"
os: "ubuntu-20.04"
container: ""
os: "ubuntu-latest"
container: "ubuntu:18.04"
llvm_os: ""
llvm_ver: ""
toolset: "gcc"
compiler: "g++-7"
cxxstd: "11,14,1z,17"
- name: "gcc 8"
packages: "g++-8"
os: "ubuntu-20.04"
container: ""
os: "ubuntu-latest"
container: "ubuntu:18.04"
llvm_os: ""
llvm_ver: ""
toolset: "gcc"
compiler: "g++-8"
cxxstd: "11,14,1z,17,2a"
- name: "gcc 9"
packages: "g++-9"
os: "ubuntu-20.04"
container: ""
os: "ubuntu-latest"
container: "ubuntu:20.04"
llvm_os: ""
llvm_ver: ""
toolset: "gcc"
compiler: "g++-9"
cxxstd: "11,14,17,2a"
- name: "gcc 10"
packages: "g++-10"
os: "ubuntu-20.04"
container: ""
os: "ubuntu-latest"
container: "ubuntu:20.04"
llvm_os: ""
llvm_ver: ""
toolset: "gcc"
compiler: "g++-10"
cxxstd: "11,14,17,20"
- name: "clang 3.5"
packages: "clang-3.5"
os: "ubuntu-20.04"
os: "ubuntu-latest"
container: "ubuntu:16.04"
llvm_os: "precise"
llvm_ver: "3.5"
Expand All @@ -110,7 +110,7 @@ jobs:
cxxstd: "11"
- name: "clang 3.6"
packages: "clang-3.6"
os: "ubuntu-20.04"
os: "ubuntu-latest"
container: "ubuntu:16.04"
llvm_os: "precise"
llvm_ver: "3.6"
Expand All @@ -119,7 +119,7 @@ jobs:
cxxstd: "11"
- name: "clang 3.7"
packages: "clang-3.7"
os: "ubuntu-20.04"
os: "ubuntu-latest"
container: "ubuntu:16.04"
llvm_os: "precise"
llvm_ver: "3.7"
Expand All @@ -128,7 +128,7 @@ jobs:
cxxstd: "11"
- name: "clang 3.8"
packages: "clang-3.8 libstdc++-4.9-dev"
os: "ubuntu-20.04"
os: "ubuntu-latest"
container: "ubuntu:16.04"
llvm_os: "precise"
llvm_ver: "3.8"
Expand All @@ -137,7 +137,7 @@ jobs:
cxxstd: "11,14"
- name: "clang 3.9"
packages: "clang-3.9 libstdc++-4.9-dev"
os: "ubuntu-20.04"
os: "ubuntu-latest"
container: "ubuntu:16.04"
llvm_os: "precise"
llvm_ver: "3.9"
Expand All @@ -146,7 +146,7 @@ jobs:
cxxstd: "11,14"
- name: "clang 4.0"
packages: "clang-4.0"
os: "ubuntu-20.04"
os: "ubuntu-latest"
container: "ubuntu:16.04"
llvm_os: "xenial"
llvm_ver: "4.0"
Expand All @@ -155,7 +155,7 @@ jobs:
cxxstd: "11,14"
- name: "clang 5.0"
packages: "clang-5.0"
os: "ubuntu-20.04"
os: "ubuntu-latest"
container: "ubuntu:16.04"
llvm_os: ""
llvm_ver: ""
Expand All @@ -164,7 +164,7 @@ jobs:
cxxstd: "11,14,1z,17"
- name: "clang 6.0"
packages: "clang-6.0"
os: "ubuntu-20.04"
os: "ubuntu-latest"
container: "ubuntu:16.04"
llvm_os: ""
llvm_ver: ""
Expand All @@ -173,44 +173,44 @@ jobs:
cxxstd: "11,14,1z,17,2a"
- name: "clang 7"
packages: "clang-7"
os: "ubuntu-20.04"
container: "ubuntu:16.04"
os: "ubuntu-latest"
container: "ubuntu:20.04"
llvm_os: "xenial"
llvm_ver: "7"
toolset: "clang"
compiler: "clang++-7"
cxxstd: "11,14,1z,17,2a"
cxxstd: "11,14,1z,17"
- name: "clang 8"
packages: "clang-8"
os: "ubuntu-20.04"
container: "ubuntu:16.04"
os: "ubuntu-latest"
container: "ubuntu:20.04"
llvm_os: "xenial"
llvm_ver: "8"
toolset: "clang"
compiler: "clang++-8"
cxxstd: "11,14,17,2a"
cxxstd: "11,14,17"
- name: "clang 9"
packages: "clang-9"
os: "ubuntu-20.04"
container: ""
os: "ubuntu-latest"
container: "ubuntu:20.04"
llvm_os: "focal"
llvm_ver: "9"
toolset: "clang"
compiler: "clang++-9"
cxxstd: "11,14,17,2a"
- name: "clang 10"
packages: "clang-10"
os: "ubuntu-20.04"
container: ""
os: "ubuntu-latest"
container: "ubuntu:20.04"
llvm_os: "focal"
llvm_ver: "10"
toolset: "clang"
compiler: "clang++-10"
cxxstd: "11,14,17,20"
- name: "clang 11"
packages: "clang-11"
os: "ubuntu-20.04"
container: ""
os: "ubuntu-latest"
container: "ubuntu:20.04"
sources: ""
llvm_os: "focal"
llvm_ver: "11"
Expand All @@ -219,8 +219,8 @@ jobs:
cxxstd: "11,14,17,20,latest"
- name: "clang 12"
packages: "clang-12"
os: "ubuntu-20.04"
container: ""
os: "ubuntu-latest"
container: "ubuntu:20.04"
sources: ""
llvm_os: "focal"
llvm_ver: "12"
Expand All @@ -229,16 +229,29 @@ jobs:
cxxstd: "11,14,17,20,latest"

runs-on: ${{ matrix.os }}
container: ${{ matrix.container }}
container:
image: ${{matrix.container}}
volumes:
- /node20217:/node20217:rw,rshared
- ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }}

steps:
- name: Check if running in container
if: matrix.container != ''
run: echo "GHA_CONTAINER=${{ matrix.container }}" >> $GITHUB_ENV
- name: If running in container, upgrade packages
if: matrix.container != ''
- name: Setup container environment
if: matrix.container
run: |
apt-get -o Acquire::Retries=3 update && DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata && apt-get -o Acquire::Retries=3 install -y sudo software-properties-common wget apt-transport-https make apt-file sudo unzip libssl-dev build-essential g++ git
apt-get update
apt-get -y install sudo python3 git g++ curl xz-utils

- name: Install nodejs20glibc2.17
if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }}
run: |
curl -LO https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz
tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
ldd /__e/node20/bin/node

- name: Install packages
if: matrix.packages
run: sudo apt-get -y install ${{matrix.packages}}

- uses: actions/checkout@v2

Expand All @@ -256,19 +269,6 @@ jobs:
TRAVIS_OS_NAME: "linux"
run: |
set -e
for i in {1..3}; do sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" && break || sleep 2; done
if test -n "${LLVM_OS}" ; then
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
if test -n "${LLVM_VER}" ; then
sudo -E apt-add-repository "deb http://apt.llvm.org/${LLVM_OS}/ llvm-toolchain-${LLVM_OS}-${LLVM_VER} main"
else
# Snapshot (i.e. trunk) build of clang
sudo -E apt-add-repository "deb http://apt.llvm.org/${LLVM_OS}/ llvm-toolchain-${LLVM_OS} main"
fi
fi
sudo -E apt-get -o Acquire::Retries=3 update
sudo -E DEBIAN_FRONTEND=noninteractive apt-get -o Acquire::Retries=3 -y --no-install-suggests --no-install-recommends install ${PACKAGES}

export TRAVIS_BUILD_DIR=$(pwd)
export TRAVIS_BRANCH=${TRAVIS_BRANCH:-$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')}
export VCS_COMMIT_ID=$GITHUB_SHA
Expand Down Expand Up @@ -297,10 +297,9 @@ jobs:
fail-fast: false
matrix:
include:
- name: "xcode 11.7"
os: "macos-10.15"
- name: "xcode"
os: "macos-15"
cxx: "clang++"
xcode_version: 11.7
toolset: "clang"
compiler: "clang++"
cxxstd: "11,14,17"
Expand All @@ -310,12 +309,6 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Set DEVELOPER_DIR
if: matrix.xcode_version != ''
run: echo "DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode_version }}.app/Contents/Developer" >> $GITHUB_ENV
- name: Test DEVELOPER_DIR
run: echo $DEVELOPER_DIR

- name: "osx"
shell: bash
env:
Expand Down Expand Up @@ -357,13 +350,12 @@ jobs:
fail-fast: false
matrix:
include:
- toolset: msvc-14.1
cxxstd: "11,14,17"
arch: 32
os: windows-2016
- toolset: msvc-14.2
cxxstd: "11,14,17,latest"
os: windows-2019
- toolset: msvc-14.3
cxxstd: "11,14,17,20,latest"
os: windows-2022

runs-on: ${{matrix.os}}

Expand Down Expand Up @@ -393,4 +385,3 @@ jobs:
git submodule update --init libs/headers
cmd /c bootstrap
b2 libs\callable_traits\test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} address-model="32,64" && b2 libs\callable_traits\example toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} address-model="32,64"

19 changes: 19 additions & 0 deletions build.jam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# 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 ;

project /boost/callable_traits
;

explicit
[ alias boost_callable_traits : : :
: <include>include <library>$(boost_dependencies) ]
[ alias all : boost_callable_traits example test ]
;

call-if : boost-library callable_traits
;

Loading
Loading