From 16cbe6776d534d218f2275ee0461acb6d4b3f7ac Mon Sep 17 00:00:00 2001 From: "Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)" Date: Fri, 26 Jul 2024 15:41:00 +0100 Subject: [PATCH] Port https://github.com/boostorg/outcome/pull/7 to standalone Outcome. --- boostify/build.jam | 26 ++++++++++++++++++++++++++ boostify/test/Jamfile.v2 | 10 ++++++---- doc/html | 2 +- include/outcome/detail/revision.hpp | 6 +++--- 4 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 boostify/build.jam diff --git a/boostify/build.jam b/boostify/build.jam new file mode 100644 index 00000000..99db56fa --- /dev/null +++ b/boostify/build.jam @@ -0,0 +1,26 @@ +# 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/exception//boost_exception + /boost/system//boost_system + /boost/throw_exception//boost_throw_exception ; + +project /boost/outcome + : common-requirements + include + ; + +explicit + [ alias boost_outcome : : : : $(boost_dependencies) ] + [ alias all : boost_outcome test ] + ; + +call-if : boost-library outcome + ; diff --git a/boostify/test/Jamfile.v2 b/boostify/test/Jamfile.v2 index ef158969..9d6b1fb0 100644 --- a/boostify/test/Jamfile.v2 +++ b/boostify/test/Jamfile.v2 @@ -1,6 +1,6 @@ # Boost.Outcome Library test Jamfile # -# Copyright (C) 2017-2019 Niall Douglas +# Copyright (C) 2017-2024 Niall Douglas # # Use, modification, and distribution is subject to the Boost Software # License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -9,8 +9,10 @@ # See http://www.boost.org/libs/outcome for documentation. import testing ; -import ../../config/checks/config : requires ; -import ../../predef/tools/check/predef : check require : predef-check predef-require ; +import-search /boost/config/checks ; +import config : requires ; +import-search /boost/predef/tools/check ; +import predef : check require : predef-check predef-require ; project : requirements @@ -18,7 +20,7 @@ project [ predef-require "!BOOST_COMP_GNUC" or "BOOST_COMP_GNUC >= 6.0" ] [ predef-require "!BOOST_COMP_CLANG" or "BOOST_COMP_CLANG >= 4.0" ] BOOST_TEST_MODULE=Outcome - ../../test/build//boost_unit_test_framework + /boost/test//boost_unit_test_framework ; { diff --git a/doc/html b/doc/html index 44cb512e..7b9dfc17 160000 --- a/doc/html +++ b/doc/html @@ -1 +1 @@ -Subproject commit 44cb512ecc7c62e1af09ed1526b8ff19c1b21c0d +Subproject commit 7b9dfc17d38a5099f4dca564e8fdf045be58dba0 diff --git a/include/outcome/detail/revision.hpp b/include/outcome/detail/revision.hpp index c936c1c6..b6312858 100644 --- a/include/outcome/detail/revision.hpp +++ b/include/outcome/detail/revision.hpp @@ -22,6 +22,6 @@ Distributed under the Boost Software License, Version 1.0. */ // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time -#define OUTCOME_PREVIOUS_COMMIT_REF e30438653a080acf5929c35c7802d40824dbae9b -#define OUTCOME_PREVIOUS_COMMIT_DATE "2024-07-17 23:08:38 +00:00" -#define OUTCOME_PREVIOUS_COMMIT_UNIQUE e3043865 +#define OUTCOME_PREVIOUS_COMMIT_REF 271fc9cf0693edb87d52fb496deb2baf54d4ebaa +#define OUTCOME_PREVIOUS_COMMIT_DATE "2024-07-18 14:03:54 +00:00" +#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 271fc9cf