Compare commits

...

15 Commits

Author SHA1 Message Date
Peter Dimov
2fb95498ea Update build.jam, test/Jamfile 2024-08-21 20:59:01 +03:00
Peter Dimov
8a0ade0ad0 Merge branch 'modular' of https://github.com/grafikrobot/boostorg.describe into feature/modular-b2 2024-08-21 20:54:19 +03:00
Peter Dimov
1508f66184 Update .drone.jsonnet 2024-08-21 19:01:46 +03:00
Peter Dimov
ac298922b0 Update ci.yml 2024-08-21 18:18:20 +03:00
Rene Rivera
86099f1d78 Move inter-lib dependencies to a project variable and into the build targets. 2024-07-23 22:34:24 -05:00
Rene Rivera
d25e48348e Update copyright dates. 2024-07-20 22:52:05 -05:00
Rene Rivera
76c036a2d7 Change all <source> references to <library>. 2024-07-20 19:38:12 -05:00
Rene Rivera
879d4b2a22 Bump B2 require to 5.2 2024-06-14 11:33:55 -05:00
Rene Rivera
202203112b Add requires-b2 check to top-level build file. 2024-05-05 09:00:01 -05:00
Rene Rivera
882b168de8 Sync from upstream. 2024-04-20 15:34:25 -05:00
Peter Dimov
1ddee6c39a Revert "Update doc/Jamfile"
This reverts commit 9899acb4c9.
2024-04-16 22:36:26 +03:00
Peter Dimov
9899acb4c9 Update doc/Jamfile 2024-04-16 22:17:19 +03:00
Rene Rivera
84ce044885 Switch to library requirements instead of source. As source puts extra source in install targets. 2024-03-29 21:15:58 -05:00
Rene Rivera
120b9edaed Sync from upstream. 2024-03-23 16:03:15 -05:00
Rene Rivera
9da33c4629 Make the library modular usable. 2024-03-11 08:32:57 -05:00
4 changed files with 73 additions and 16 deletions

View File

@@ -32,6 +32,8 @@ local linux_pipeline(name, image, environment, packages = "", sources = [], arch
commands:
[
'set -e',
'uname -a',
'echo $DRONE_STAGE_MACHINE',
'wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -',
] +
(if sources != [] then [ ('apt-add-repository "' + source + '"') for source in sources ] else []) +
@@ -193,6 +195,13 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
"g++-13",
),
linux_pipeline(
"Linux 24.04 GCC 14",
"cppalliance/droneubuntu2404:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '03,11,14,17,20,2b' },
"g++-14",
),
linux_pipeline(
"Linux 16.04 Clang 3.5",
"cppalliance/droneubuntu1604:1",
@@ -326,6 +335,13 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
"clang-17",
),
linux_pipeline(
"Linux 24.04 Clang 18",
"cppalliance/droneubuntu2404:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-18', CXXSTD: '03,11,14,17,20,2b' },
"clang-18",
),
macos_pipeline(
"MacOS 10.15 Xcode 12.2",
{ TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '03,11,14,1z' },

View File

@@ -59,6 +59,11 @@ jobs:
os: ubuntu-latest
container: ubuntu:23.04
install: g++-13
- toolset: gcc-14
cxxstd: "03,11,14,17,20,2b"
os: ubuntu-latest
container: ubuntu:24.04
install: g++-14
- toolset: clang
compiler: clang++-3.9
cxxstd: "03,11,14"
@@ -143,14 +148,20 @@ jobs:
os: ubuntu-latest
install: clang-17
- toolset: clang
cxxstd: "03,11,14,17,2a"
os: macos-11
compiler: clang++-18
cxxstd: "03,11,14,17,20,2b"
container: ubuntu:24.04
os: ubuntu-latest
install: clang-18
- toolset: clang
cxxstd: "03,11,14,17,20,2b"
os: macos-12
- toolset: clang
cxxstd: "03,11,14,17,20,2b"
os: macos-13
- toolset: clang
cxxstd: "03,11,14,17,20,2b"
os: macos-14
runs-on: ${{matrix.os}}
container: ${{matrix.container}}
@@ -160,6 +171,10 @@ jobs:
shell: bash
steps:
- name: Enable Node 16
run: |
echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
- uses: actions/checkout@v3
- name: Setup container environment
@@ -246,7 +261,7 @@ jobs:
runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Boost
shell: cmd
@@ -284,14 +299,14 @@ jobs:
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
- os: macos-11
- os: macos-12
- os: macos-13
- os: macos-14
runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install packages
if: matrix.install
@@ -332,14 +347,14 @@ jobs:
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
- os: macos-11
- os: macos-12
- os: macos-13
- os: macos-14
runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install packages
if: matrix.install
@@ -390,14 +405,14 @@ jobs:
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
- os: macos-11
- os: macos-12
- os: macos-13
- os: macos-14
runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install packages
if: matrix.install
@@ -450,7 +465,7 @@ jobs:
runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Boost
shell: cmd
@@ -499,7 +514,7 @@ jobs:
runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Boost
shell: cmd
@@ -566,7 +581,7 @@ jobs:
runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Boost
shell: cmd

20
build.jam Normal file
View File

@@ -0,0 +1,20 @@
# Copyright 2023-2024 René Ferdinand Rivera Morell
# Copyright 2024 Peter Dimov
# Distributed under the Boost Software License, Version 1.0.
# https://www.boost.org/LICENSE_1_0.txt
require-b2 5.2 ;
constant boost_dependencies :
/boost/mp11//boost_mp11
;
project /boost/describe ;
explicit
[ alias boost_describe : : : : <include>include <library>$(boost_dependencies) ]
[ alias all : boost_describe test ]
;
call-if : boost-library describe
;

View File

@@ -7,6 +7,11 @@ import testing ;
local WERROR = <toolset>msvc:<warnings-as-errors>on <toolset>clang:<warnings-as-errors>on <toolset>gcc:<warnings-as-errors>on ;
project : requirements
<library>/boost/describe//boost_describe
<library>/boost/container_hash//boost_container_hash
<library>/boost/core//boost_core
<library>/boost/variant2//boost_variant2
<warnings>extra
$(WERROR)
<toolset>clang:<cxxflags>"-Wno-unused-private-field" ;
@@ -87,8 +92,8 @@ explicit describe_cxx14 ;
local CXX14 = [ check-target-builds describe_cxx14 describe_cxx14 : : <build>no ] "<toolset>msvc-14.0:<cxxflags>-wd4100" ;
local JSON = <library>/boost//json/<warnings>off "<toolset>msvc-14.2:<cxxflags>-wd5104" ;
local SERIALIZATION = <library>/boost//serialization/<warnings>off -$(WERROR) ;
local JSON = <library>/boost/json//boost_json/<warnings>off "<toolset>msvc-14.2:<cxxflags>-wd5104" ;
local SERIALIZATION = <library>/boost/serialization//boost_serialization/<warnings>off -$(WERROR) ;
run ../example/printing_enums_ct.cpp : : : $(CXX14) ;
run ../example/printing_enums_rt.cpp : : : $(CXX14) ;
@@ -98,9 +103,10 @@ run ../example/print_function.cpp : : : $(CXX14) ;
run ../example/to_json.cpp : : : $(CXX14) $(JSON) ;
run ../example/from_json.cpp : : : $(CXX14) $(JSON) ;
run ../example/serialization.cpp : : : $(CXX14) $(SERIALIZATION) ;
run ../example/json_rpc.cpp : : : $(CXX14) $(JSON) ;
run ../example/json_rpc.cpp : : : $(CXX14) $(JSON) <library>/boost/utility//boost_utility
"<toolset>gcc-14,<cxxstd>14:<build>no" ; # mysterious segmentation fault
run ../example/hash_value.cpp : : : $(CXX14) ;
run ../example/equality.cpp : : : $(CXX14) ;
link ../example/console.cpp : $(CXX14) $(JSON) ;
link ../example/console.cpp : $(CXX14) $(JSON) <library>/boost/utility//boost_utility ;
run ../example/struct_to_tuple.cpp : : : $(CXX14) ;
run ../example/pm_to_string.cpp : : : $(CXX14) ;