Port boostorg/outcome#7 to standalone Outcome.

ned14 · Jul 26, 2024 · 16cbe67 · 16cbe67
1 parent 271fc9c
commit 16cbe67
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 8 deletions.
diff --git a/boostify/build.jam 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>include
+    ;
+
+explicit
+    [ alias boost_outcome : : : : <library>$(boost_dependencies) ]
+    [ alias all : boost_outcome test ]
+    ;
+
+call-if : boost-library outcome
+    ;
diff --git 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,16 +9,18 @@
 # 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
       [ requires cxx14_variable_templates cxx14_constexpr ]
       [ predef-require "!BOOST_COMP_GNUC" or "BOOST_COMP_GNUC >= 6.0" ]
       [ predef-require "!BOOST_COMP_CLANG" or "BOOST_COMP_CLANG >= 4.0" ]
       <define>BOOST_TEST_MODULE=Outcome
-      <library>../../test/build//boost_unit_test_framework
+      <library>/boost/test//boost_unit_test_framework
     ;
 
 {

diff --git a/doc/html b/doc/html
diff --git 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