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

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
16 changes: 5 additions & 11 deletions .github/workflows/ci.yml
grafikrobot marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ jobs:
then
apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y sudo software-properties-common tzdata wget curl apt-transport-https make apt-file unzip libssl-dev build-essential autotools-dev autoconf automake g++ libc++-helpers python ruby cpio gcc-multilib g++-multilib pkgconf python3 ccache libpython-dev

# install pip:
python_version=$(python3 -c 'import sys; print("{0.major}.{0.minor}".format(sys.version_info))')
if [[ ${python_version} =~ ^3\.[0-5]$ ]]; then
Expand All @@ -229,12 +229,12 @@ jobs:
fi
wget https://bootstrap.pypa.io/pip/$python_version/get-pip.py
python3 get-pip.py

# install git:
# apt-get install -y git
apt-add-repository ppa:git-core/ppa
apt-get -o Acquire::Retries=$NET_RETRY_COUNT update && apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y git

# install cmake:
# apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y cmake
sudo pip3 install cmake
Expand Down Expand Up @@ -332,15 +332,9 @@ jobs:
fi
cd ..
git clone -b "$BOOST_BRANCH" --depth 1 "https://github.com/boostorg/boost.git" "boost-root"

cd boost-root
# mkdir -p libs/$LIBRARY
# cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
# git submodule update --init tools/boostdep
git submodule update --init --recursive
mkdir -p libs/$SELF
cp -r $GITHUB_WORKSPACE/* libs/$SELF

cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
git submodule update --init tools/boostdep
DEPINST_ARGS+=("$LIBRARY")
python tools/boostdep/depinst/depinst.py "${DEPINST_ARGS[@]}"
if [ -z "${{matrix.cmake_tests}}" ]
Expand Down
10 changes: 0 additions & 10 deletions Jamfile

This file was deleted.

29 changes: 29 additions & 0 deletions build.jam
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# 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/container_hash//boost_container_hash
/boost/core//boost_core
/boost/static_assert//boost_static_assert
/boost/throw_exception//boost_throw_exception
/boost/utility//boost_utility ;

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

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

call-if : boost-library static_string
;

3 changes: 2 additions & 1 deletion doc/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ project static_string/doc ;
import boostbook ;
import type ;
import os ;
import ../../../tools/docca/docca.jam ;
import-search /boost/docca ;
import docca ;

docca.reference reference.qbk
:
Expand Down
6 changes: 4 additions & 2 deletions test/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
#

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

local defines =
[ requires
Expand All @@ -20,6 +21,7 @@ local defines =
]
;

project : requirements $(defines) ;
project : requirements $(defines)
<library>/boost/static_string//boost_static_string ;

run static_string.cpp ;
Loading