From 28b4ddeddb8ee7965d77f6c68e6b121840c3ce53 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Mon, 11 Mar 2024 08:38:17 -0500
Subject: [PATCH] Make the library modular usable.

---
 Jamfile         | 22 ----------------------
 build.jam       | 33 +++++++++++++++++++++++++++++++++
 test/Jamfile.v2 | 16 +++++++++-------
 3 files changed, 42 insertions(+), 29 deletions(-)
 delete mode 100644 Jamfile
 create mode 100644 build.jam

diff --git a/Jamfile b/Jamfile
deleted file mode 100644
index 1e3698c..0000000
--- a/Jamfile
+++ /dev/null
@@ -1,22 +0,0 @@
-#  Boost.Uuid Library Jamfile
-#
-#  Copyright (c) 2017 James E. King III
-#
-#  Use, modification, and distribution are subject to the
-#  Boost Software License, Version 1.0. (See accompanying file
-#  LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
-
-project libs/uuid
-    : requirements
-
-      <warnings>all
-
-      <toolset>clang:<cxxflags>-Wextra
-      <toolset>clang:<cxxflags>-pedantic
-
-      <toolset>gcc:<cxxflags>-Wextra
-      <toolset>gcc:<cxxflags>-pedantic
-    ;
-
-# please order by name to ease maintenance
-build-project test ;
diff --git a/build.jam b/build.jam
new file mode 100644
index 0000000..0cb1f5d
--- /dev/null
+++ b/build.jam
@@ -0,0 +1,33 @@
+# Copyright René Ferdinand Rivera Morell 2023
+# 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)
+
+import project ;
+
+project /boost/uuid
+    : common-requirements
+        <source>/boost/assert//boost_assert
+        <source>/boost/config//boost_config
+        <source>/boost/container_hash//boost_container_hash
+        <source>/boost/core//boost_core
+        <source>/boost/io//boost_io
+        <source>/boost/move//boost_move
+        <source>/boost/numeric_conversion//boost_numeric_conversion
+        <source>/boost/predef//boost_predef
+        <source>/boost/random//boost_random
+        <source>/boost/static_assert//boost_static_assert
+        <source>/boost/throw_exception//boost_throw_exception
+        <source>/boost/tti//boost_tti
+        <source>/boost/type_traits//boost_type_traits
+        <source>/boost/winapi//boost_winapi
+        <include>include
+    ;
+
+explicit
+    [ alias boost_uuid ]
+    [ alias all : boost_uuid test ]
+    ;
+
+call-if : boost-library uuid
+    ;
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 023515e..acc20b9 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -4,9 +4,9 @@
 # accompanying file LICENSE_1_0.txt or copy at
 # https://www.boost.org/LICENSE_1_0.txt)
 
-lib bcrypt ;
+searched-lib bcrypt ;
 
-project libs/uuid/test
+project
     : requirements
 
       # boost.jam defines BOOST_ALL_NO_LIB, this makes library management
@@ -23,6 +23,8 @@ project libs/uuid/test
       # link static for easier debugging
       <link>static
 
+      <warnings>pedantic
+
 ;
 
 import os ;
@@ -82,12 +84,12 @@ if ! [ os.environ UBSAN_OPTIONS ]
 {
 test-suite uuid-serialization :
     # test serializing uuids
-    [ run test_serialization.cpp ../../serialization/build//boost_serialization ]
+    [ run test_serialization.cpp /boost/serialization//boost_serialization ]
 
     # TODO - This test fails to like with boost_wserialization
     # [ run test_wserialization.cpp
-    #     ../../serialization/build//boost_serialization
-    #     ../../serialization/build//boost_wserialization
+    #     /boost/serialization//boost_serialization
+    #     /boost/serialization//boost_wserialization
     #     : : : <dependency>../../config/test/all//BOOST_NO_STD_WSTREAMBUF
     # ]
     ;
@@ -106,7 +108,7 @@ test-suite uuid :
     [ run test_uuid_no_simd.cpp ]
 
     # test uuid_io.hpp
-    [ run test_io.cpp ]
+    [ run test_io.cpp /boost/lexical_cast//boost_lexical_cast ]
 
     # test generators
     [ run test_nil_generator.cpp ]
@@ -136,7 +138,7 @@ test-suite uuid :
           : : : <build>no <toolset>msvc-12.0:<build>yes <variant>release <debug-symbols>on : test_msvc_simd_bug981648 ]
 
     # a small benchmark test for random generation
-    [ run test_bench_random.cpp ../../timer/build//boost_timer : : : <toolset>clang-cloudabi:<build>no ]
+    [ run test_bench_random.cpp /boost/timer//boost_timer : : : <toolset>clang-cloudabi:<build>no ]
 
     [ run test_entropy_error.cpp ]