Update build.jam, test/Jamfile

Merge branch 'modular' of https://github.com/grafikrobot/boostorg.describe into feature/modular-b2
Update .drone.jsonnet
2026-01-26 18:33:08 +00:00 · 2024-08-21 20:59:01 +03:00 · 2024-08-21 20:54:19 +03:00 · 2024-08-21 19:01:46 +03:00 · 2024-08-21 18:18:20 +03:00 · 2024-07-23 22:34:24 -05:00
7 changed files with 120 additions and 27 deletions
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -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 []) +
@@ -186,6 +188,20 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
        "g++-12",
    ),

+    linux_pipeline(
+        "Linux 23.04 GCC 13",
+        "cppalliance/droneubuntu2304:1",
+        { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '03,11,14,17,20,2b' },
+        "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",
@@ -303,7 +319,27 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
        "cppalliance/droneubuntu2204:1",
        { TOOLSET: 'clang', COMPILER: 'clang++-15', CXXSTD: '03,11,14,17,20,2b' },
        "clang-15",
-        ["deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"],
+    ),
+
+    linux_pipeline(
+        "Linux 23.04 Clang 16",
+        "cppalliance/droneubuntu2304:1",
+        { TOOLSET: 'clang', COMPILER: 'clang++-16', CXXSTD: '03,11,14,17,20,2b' },
+        "clang-16",
+    ),
+
+    linux_pipeline(
+        "Linux 23.10 Clang 17",
+        "cppalliance/droneubuntu2310:1",
+        { TOOLSET: 'clang', COMPILER: 'clang++-17', CXXSTD: '03,11,14,17,20,2b' },
+        "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(
@@ -311,10 +347,16 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
        { TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '03,11,14,1z' },
    ),

+    macos_pipeline(
+        "MacOS 12.4 Xcode 13.4.1",
+        { TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '03,11,14,17,20,2b' },
+        xcode_version = "13.4.1", osx_version = "monterey", arch = "arm64",
+    ),
+
    windows_pipeline(
        "Windows VS2015 msvc-14.0",
        "cppalliance/dronevs2015",
-        { TOOLSET: 'msvc-14.0', CXXSTD: '14,latest' },
+        { TOOLSET: 'msvc-14.0', CXXSTD: '14,latest', B2_DONT_EMBED_MANIFEST: '1' },
    ),

    windows_pipeline(
--- a/.drone/drone.sh
+++ b/.drone/drone.sh
@@ -5,6 +5,7 @@
 # https://www.boost.org/LICENSE_1_0.txt

 set -ex
+export PATH=~/.local/bin:/usr/local/bin:$PATH

 DRONE_BUILD_DIR=$(pwd)

--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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"
@@ -115,33 +120,48 @@ jobs:
          - toolset: clang
            compiler: clang++-13
            cxxstd: "03,11,14,17,20,2b"
-            os: ubuntu-22.04
+            container: ubuntu:22.04
+            os: ubuntu-latest
            install: clang-13
          - toolset: clang
            compiler: clang++-14
            cxxstd: "03,11,14,17,20,2b"
-            os: ubuntu-22.04
+            container: ubuntu:22.04
+            os: ubuntu-latest
            install: clang-14
          - toolset: clang
            compiler: clang++-15
            cxxstd: "03,11,14,17,20,2b"
-            os: ubuntu-22.04
+            container: ubuntu:22.04
+            os: ubuntu-latest
            install: clang-15
          - toolset: clang
            compiler: clang++-16
            cxxstd: "03,11,14,17,20,2b"
-            os: ubuntu-latest
            container: ubuntu:23.04
+            os: ubuntu-latest
            install: clang-16
          - toolset: clang
-            cxxstd: "03,11,14,17,2a"
-            os: macos-11
+            compiler: clang++-17
+            cxxstd: "03,11,14,17,20,2b"
+            container: ubuntu:23.10
+            os: ubuntu-latest
+            install: clang-17
+          - toolset: clang
+            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}}
@@ -151,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
@@ -237,7 +261,7 @@ jobs:
    runs-on: ${{matrix.os}}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Setup Boost
        shell: cmd
@@ -275,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
@@ -323,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
@@ -381,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
@@ -441,7 +465,7 @@ jobs:
    runs-on: ${{matrix.os}}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Setup Boost
        shell: cmd
@@ -490,7 +514,7 @@ jobs:
    runs-on: ${{matrix.os}}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Setup Boost
        shell: cmd
@@ -557,7 +581,7 @@ jobs:
    runs-on: ${{matrix.os}}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Setup Boost
        shell: cmd
--- a/build.jam
+++ b/build.jam
@@ -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
+    ;
--- a/example/fmtlib_class_formatter.cpp
+++ b/example/fmtlib_class_formatter.cpp
@@ -18,7 +18,7 @@ template<class T> struct fmt::formatter<T, char, std::enable_if_t<

        if( it != end && *it != '}' )
        {
-            ctx.error_handler().on_error( "invalid format" );
+            throw_format_error( "invalid format" );
        }

        return it;
--- a/example/fmtlib_enum_formatter.cpp
+++ b/example/fmtlib_enum_formatter.cpp
@@ -25,7 +25,7 @@ public:

        if( i1 != i2 )
        {
-            ctx.error_handler().on_error( "invalid format" );
+            throw_format_error( "invalid format" );
        }

        return i1;
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -4,11 +4,16 @@

 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
-  <toolset>msvc:<warnings-as-errors>on
-  <toolset>clang:<warnings-as-errors>on
-  <toolset>gcc:<warnings-as-errors>on
+  $(WERROR)
  <toolset>clang:<cxxflags>"-Wno-unused-private-field" ;

 run quick.cpp ;
@@ -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 "-<toolset>gcc:<warnings-as-errors>on" "-<toolset>clang:<warnings-as-errors>on" ;
+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) ;
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
Peter Dimov	50719b2123	Update .drone.jsonnet	2024-03-23 20:27:08 +02:00
Peter Dimov	8f3b04a3d9	Disable warnings-as-errors=on in serialization.cpp for MSVC as well	2024-03-23 20:22:22 +02:00
Rene Rivera	9da33c4629	Make the library modular usable.	2024-03-11 08:32:57 -05:00
Peter Dimov	fad199e782	Merge pull request #44 from denzor200/actualize_fmt Actualize examples to build with latest `fmt`	2023-12-13 17:29:06 +02:00
Peter Dimov	e005f6950c	Update ci.yml	2023-12-13 17:12:12 +02:00
Denis Mikhailov	2e5dcc80b2	Update fmtlib_enum_formatter.cpp	2023-11-25 22:22:10 +01:00
Denis Mikhailov	ba1459ac84	Update fmtlib_class_formatter.cpp	2023-11-25 22:21:33 +01:00