Add VERBATIM to add_custom_target

Update .drone.jsonnet
Update build.jam, test/Jamfile
2025-12-24 07:38:06 +01:00 · 2024-08-28 20:45:54 +03:00 · 2024-08-28 20:45:27 +03:00 · 2024-08-28 20:28:59 +03:00 · 2024-07-25 17:19:46 -05:00 · 2024-07-23 22:34:24 -05:00
9 changed files with 75 additions and 39 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 []) +
@@ -99,7 +101,7 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
    linux_pipeline(
        "Linux 16.04 GCC 4.8 32/64",
        "cppalliance/droneubuntu1604:1",
-        { TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '11', ADDRMD: '32,64' },
+        { TOOLSET: 'gcc', COMPILER: 'g++-4.8', CXXSTD: '11', ADDRMD: '32,64' },
        "g++-4.8-multilib",
    ),

@@ -177,44 +179,37 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
    ),

    linux_pipeline(
-        "Linux 23.04 GCC 13 32 ASAN",
+        "Linux 23.04 GCC 13 32/64",
        "cppalliance/droneubuntu2304:1",
-        { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + asan,
+        { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32,64' },
        "g++-13-multilib",
    ),

    linux_pipeline(
-        "Linux 23.04 GCC 13 64 ASAN",
-        "cppalliance/droneubuntu2304:1",
-        { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + asan,
-        "g++-13-multilib",
-    ),
-
-    linux_pipeline(
-        "Linux 23.04 GCC 13 32 UBSAN",
-        "cppalliance/droneubuntu2304:1",
-        { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + ubsan,
-        "g++-13-multilib",
-    ),
-
-    linux_pipeline(
-        "Linux 23.04 GCC 13 64 UBSAN",
-        "cppalliance/droneubuntu2304:1",
-        { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + ubsan,
-        "g++-13-multilib",
-    ),
-
-    linux_pipeline(
-        "Linux 24.04 GCC 14 32",
+        "Linux 24.04 GCC 14 32 ASAN",
        "cppalliance/droneubuntu2404:1",
-        { TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' },
+        { TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + asan,
        "g++-14-multilib",
    ),

    linux_pipeline(
-        "Linux 24.04 GCC 14 64",
+        "Linux 24.04 GCC 14 64 ASAN",
        "cppalliance/droneubuntu2404:1",
-        { TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' },
+        { TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + asan,
+        "g++-14-multilib",
+    ),
+
+    linux_pipeline(
+        "Linux 24.04 GCC 14 32 UBSAN",
+        "cppalliance/droneubuntu2404:1",
+        { TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + ubsan,
+        "g++-14-multilib",
+    ),
+
+    linux_pipeline(
+        "Linux 24.04 GCC 14 64 UBSAN",
+        "cppalliance/droneubuntu2404:1",
+        { TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + ubsan,
        "g++-14-multilib",
    ),

--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -159,9 +159,6 @@ jobs:
            container: ubuntu:24.04
            os: ubuntu-latest
            install: clang-18
-          - toolset: clang
-            cxxstd: "11,14,17,2a"
-            os: macos-11
          - toolset: clang
            cxxstd: "11,14,17,20,2b"
            os: macos-12
@@ -180,6 +177,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
@@ -292,9 +293,9 @@ 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}}

@@ -340,9 +341,9 @@ 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}}

@@ -398,9 +399,9 @@ 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}}

--- a/build.jam
+++ b/build.jam
@@ -0,0 +1,22 @@
+# 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/assert//boost_assert
+    /boost/config//boost_config
+    /boost/mp11//boost_mp11
+    ;
+
+project /boost/variant2 ;
+
+explicit
+    [ alias boost_variant2 : : : : <include>include <library>$(boost_dependencies) ]
+    [ alias all : boost_variant2 test ]
+    ;
+
+call-if : boost-library variant2
+    ;
--- a/include/boost/variant2/variant.hpp
+++ b/include/boost/variant2/variant.hpp
@@ -83,7 +83,7 @@ struct monostate
 {
 };

-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1940)
+#if !BOOST_WORKAROUND(BOOST_MSVC, < 1950)

 constexpr bool operator<(monostate, monostate) noexcept { return false; }
 constexpr bool operator>(monostate, monostate) noexcept { return false; }
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -7,7 +7,8 @@
 #  http://www.boost.org/LICENSE_1_0.txt

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

 project
  : default-build
@@ -16,9 +17,14 @@ project

  : requirements

+    <library>/boost/variant2//boost_variant2
+    <library>/boost/core//boost_core
+    <library>/boost/container_hash//boost_container_hash
+
    <toolset>msvc:<warnings-as-errors>on
    <toolset>gcc:<warnings-as-errors>on
    <toolset>clang:<warnings-as-errors>on
+
  ;

 run quick.cpp ;
@@ -125,7 +131,7 @@ run variant_visit_by_index.cpp ;
 run variant_ostream_insert.cpp ;
 run is_output_streamable.cpp ;

-local JSON = <library>/boost//json/<warnings>off "<toolset>msvc-14.0:<build>no" "<toolset>msvc-14.2:<cxxflags>-wd5104" "<undefined-sanitizer>norecover:<link>static" ;
+local JSON = <library>/boost/json//boost_json/<warnings>off "<toolset>msvc-14.0:<build>no" "<toolset>msvc-14.2:<cxxflags>-wd5104" "<undefined-sanitizer>norecover:<link>static" ;

 run variant_json_value_from.cpp : : : $(JSON) ;
 run variant_json_value_to.cpp : : : $(JSON) ;
--- a/test/cmake_install_test/CMakeLists.txt
+++ b/test/cmake_install_test/CMakeLists.txt
@@ -14,4 +14,4 @@ target_link_libraries(quick Boost::variant2)
 enable_testing()
 add_test(quick quick)

-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
+add_custom_target(check VERBATIM COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
--- a/test/cmake_subdir_test/CMakeLists.txt
+++ b/test/cmake_subdir_test/CMakeLists.txt
@@ -18,4 +18,4 @@ target_link_libraries(quick Boost::variant2)
 enable_testing()
 add_test(quick quick)

-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
+add_custom_target(check VERBATIM COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
--- a/test/variant_json_value_from.cpp
+++ b/test/variant_json_value_from.cpp
@@ -2,6 +2,12 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt

+#include <boost/config.hpp>
+
+#if defined(BOOST_GCC) && BOOST_GCC < 50000
+# define BOOST_ALLOW_DEPRECATED
+#endif
+
 #include <boost/variant2/variant.hpp>
 #include <boost/json/value_from.hpp>
 #include <boost/json/serialize.hpp>
--- a/test/variant_json_value_to.cpp
+++ b/test/variant_json_value_to.cpp
@@ -2,6 +2,12 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt

+#include <boost/config.hpp>
+
+#if defined(BOOST_GCC) && BOOST_GCC < 50000
+# define BOOST_ALLOW_DEPRECATED
+#endif
+
 #include <boost/variant2/variant.hpp>
 #include <boost/json/value_to.hpp>
 #include <boost/json/serialize.hpp>
Author	SHA1	Message	Date
Peter Dimov	a4b167b723	Add VERBATIM to add_custom_target	2024-08-28 20:45:54 +03:00
Peter Dimov	c7c5eb2510	Update .drone.jsonnet	2024-08-28 20:45:27 +03:00
Peter Dimov	acf24454d8	Update build.jam, test/Jamfile	2024-08-28 20:28:59 +03:00
Rene Rivera	f78343e18d	Sync from upstream.	2024-07-25 17:19:46 -05:00
Rene Rivera	ea4394914c	Move inter-lib dependencies to a project variable and into the build targets.	2024-07-23 22:34:24 -05:00
Peter Dimov	f5cd36af3d	Update MSVC workaround	2024-07-21 22:55:40 +03:00
Peter Dimov	0e325dcf8d	Update ci.yml	2024-07-21 22:38:06 +03:00
Peter Dimov	e3cf721a23	Define BOOST_ALLOW_DEPRECATED in JSON tests for g++ 4.x	2024-07-21 22:20:27 +03:00
Peter Dimov	d4f0e57b36	Update .drone.jsonnet	2024-07-21 21:54:28 +03:00
Rene Rivera	f874a2cb1b	Update copyright dates.	2024-07-20 22:52:05 -05:00
Rene Rivera	fc088e7273	Change all <source> references to <library>.	2024-07-20 21:27:52 -05:00
Rene Rivera	4f207d7363	Bump B2 require to 5.2	2024-06-14 11:33:56 -05:00
Rene Rivera	429a82a52e	Sync from upstream.	2024-05-19 23:15:27 -05:00
Rene Rivera	bb13b5be08	Add requires-b2 check to top-level build file.	2024-05-05 09:00:01 -05:00
Rene Rivera	1324e32b33	Add missing import-search for cconfig/predef checks.	2024-05-04 23:33:36 -05:00
Rene Rivera	02303d662e	Sync from upstream.	2024-04-10 07:58:16 -05:00
Rene Rivera	09f3802347	Switch to library requirements instead of source. As source puts extra source in install targets.	2024-03-29 21:16:00 -05:00
Rene Rivera	5c34125b14	Make the library modular usable.	2024-03-11 08:38:17 -05:00