SERVER-32987 Move the contents of the 'uuid' library to be under 'base'

(cherry picked from commit e62e26b324bcf4584e53cf24f8e853842d294dba)

10 files changed, 2 insertions, 32 deletions

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 426e57cafd2..5d6ec52d141 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -130,6 +130,7 @@ baseSource=[
     'util/text.cpp',
     'util/time_support.cpp',
     'util/timer.cpp',
+    'util/uuid.cpp',
     'util/version.cpp',
 ]
 
diff --git a/src/mongo/base/SConscript b/src/mongo/base/SConscript
index 80dc007a4bb..27c0bbf756c 100644
--- a/src/mongo/base/SConscript
+++ b/src/mongo/base/SConscript
@@ -48,6 +48,7 @@ env.CppUnitTest('base_test',
                  'status_test.cpp',
                  'status_with_test.cpp',
                  'string_data_test.cpp',
+                 'uuid_test.cpp',
                 ])
 
 env.Library(
diff --git a/src/mongo/util/uuid_test.cpp b/src/mongo/base/uuid_test.cpp
index c6b0388ef06..c6b0388ef06 100644
--- a/src/mongo/util/uuid_test.cpp
+++ b/src/mongo/base/uuid_test.cpp
diff --git a/src/mongo/bson/SConscript b/src/mongo/bson/SConscript
index ea50a9124cf..941f7cdc2f0 100644
--- a/src/mongo/bson/SConscript
+++ b/src/mongo/bson/SConscript
@@ -71,7 +71,6 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/util/uuid',
     ],
 )
 
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 16d05673543..5abc22b68df 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -507,7 +507,6 @@ env.Library(
         'commands/server_status_core',
         'commands/test_commands_enabled',
         'service_context',
-        '$BUILD_DIR/mongo/util/uuid',
         '$BUILD_DIR/mongo/db/catalog/uuid_catalog',
     ],
 )
@@ -875,7 +874,6 @@ env.Library(
         '$BUILD_DIR/mongo/crypto/sha256_block',
         '$BUILD_DIR/mongo/crypto/sha_block_${MONGO_CRYPTO}',
         '$BUILD_DIR/mongo/idl/idl_parser',
-        '$BUILD_DIR/mongo/util/uuid',
         'server_parameters',
     ],
 )
diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript
index fc1b39ab35c..170c89d4ebc 100644
--- a/src/mongo/db/catalog/SConscript
+++ b/src/mongo/db/catalog/SConscript
@@ -21,7 +21,6 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/server_parameters',
-        '$BUILD_DIR/mongo/util/uuid',
     ],
 )
 
@@ -193,7 +192,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/namespace_string',
         '$BUILD_DIR/mongo/db/storage/storage_options',
         '$BUILD_DIR/mongo/util/decorable',
-        '$BUILD_DIR/mongo/util/uuid',
     ],
 )
 
@@ -319,7 +317,6 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/db/repl/replmocks',
         '$BUILD_DIR/mongo/db/repl/storage_interface_impl',
         '$BUILD_DIR/mongo/db/service_context_d_test_fixture',
-        '$BUILD_DIR/mongo/util/uuid',
     ],
 )
 
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index 88d1a566629..97d520f1fa9 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -352,7 +352,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/namespace_string',
         '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/mongo/util/decorable',
-        '$BUILD_DIR/mongo/util/uuid',
     ],
 )
 
diff --git a/src/mongo/idl/SConscript b/src/mongo/idl/SConscript
index d7b68634932..87c5d3c2158 100644
--- a/src/mongo/idl/SConscript
+++ b/src/mongo/idl/SConscript
@@ -24,6 +24,5 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/namespace_string',
         '$BUILD_DIR/mongo/idl/idl_parser',
-        '$BUILD_DIR/mongo/util/uuid',
     ],
 )
diff --git a/src/mongo/shell/SConscript b/src/mongo/shell/SConscript
index 090ec5b7cc6..3db44b18a52 100644
--- a/src/mongo/shell/SConscript
+++ b/src/mongo/shell/SConscript
@@ -61,6 +61,5 @@ env.Library(
     ],
     LIBDEPS=[
         "$BUILD_DIR/mongo/base",
-        "$BUILD_DIR/mongo/util/uuid"
     ],
 )
diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript
index bdcc18e55fc..8062fc7e0e1 100644
--- a/src/mongo/util/SConscript
+++ b/src/mongo/util/SConscript
@@ -98,29 +98,6 @@ env.CppUnitTest(
 )
 
 env.Library(
-    target='uuid',
-    source=[
-        'uuid.cpp',
-    ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/util/decorable',
-        '$BUILD_DIR/third_party/murmurhash3/murmurhash3',
-    ],
-)
-
-env.CppUnitTest(
-    target='uuid_test',
-    source=[
-        'uuid_test.cpp',
-    ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/base',
-        'uuid',
-    ],
-)
-
-env.Library(
     target='summation',
     source=[
         'summation.cpp',