summaryrefslogtreecommitdiff
path: root/src/mongo/db
diff options
context:
space:
mode:
authorAndy Schwerin <schwerin@mongodb.com>2016-10-20 12:01:33 -0400
committerAndy Schwerin <schwerin@mongodb.com>2016-10-26 10:07:08 -0400
commit6d183707d5de7d246f9fc6dba55d9011a39cfc5f (patch)
tree6e95f1f58de08e2fae2851a31ecf39d8a9abe656 /src/mongo/db
parent684e0dcad58b7fd691b497e26843064a1252ccc8 (diff)
downloadmongo-6d183707d5de7d246f9fc6dba55d9011a39cfc5f.tar.gz
SERVER-26709 Merge mongo/platform/platform and mongo/util/foundation into mongo/base library.
Diffstat (limited to 'src/mongo/db')
-rw-r--r--src/mongo/db/SConscript7
-rw-r--r--src/mongo/db/commands/SConscript1
-rw-r--r--src/mongo/db/concurrency/SConscript1
-rw-r--r--src/mongo/db/fts/SConscript1
-rw-r--r--src/mongo/db/ops/SConscript1
-rw-r--r--src/mongo/db/pipeline/SConscript3
-rw-r--r--src/mongo/db/repl/SConscript2
-rw-r--r--src/mongo/db/stats/SConscript1
-rw-r--r--src/mongo/db/storage/SConscript2
-rw-r--r--src/mongo/db/storage/ephemeral_for_test/SConscript3
-rw-r--r--src/mongo/db/storage/mmap_v1/SConscript5
-rw-r--r--src/mongo/db/storage/wiredtiger/SConscript2
12 files changed, 6 insertions, 23 deletions
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index fdf52a9843e..d0b5dd113e1 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -47,7 +47,6 @@ env.Library(
'$BUILD_DIR/mongo/base',
'$BUILD_DIR/mongo/db/index_names',
'$BUILD_DIR/mongo/db/write_concern_options',
- '$BUILD_DIR/mongo/util/foundation',
]
)
@@ -197,7 +196,6 @@ env.Library(
],
LIBDEPS=[
'$BUILD_DIR/mongo/base',
- '$BUILD_DIR/mongo/util/foundation',
'$BUILD_DIR/mongo/util/md5',
]
)
@@ -210,7 +208,6 @@ env.Library(
],
LIBDEPS=[
'$BUILD_DIR/mongo/base',
- '$BUILD_DIR/mongo/util/foundation',
],
)
@@ -241,7 +238,7 @@ env.Library(
'namespace_string.cpp',
],
LIBDEPS=[
- '$BUILD_DIR/mongo/util/foundation',
+ '$BUILD_DIR/mongo/base',
],
)
@@ -262,7 +259,6 @@ env.Library(
],
LIBDEPS=[
"$BUILD_DIR/mongo/base",
- "$BUILD_DIR/mongo/util/foundation",
],
)
@@ -506,7 +502,6 @@ env.Library(
"lasterror.cpp",
],
LIBDEPS=[
- '$BUILD_DIR/mongo/util/foundation',
'service_context',
],
)
diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript
index 89fee1b8572..868484de229 100644
--- a/src/mongo/db/commands/SConscript
+++ b/src/mongo/db/commands/SConscript
@@ -75,7 +75,6 @@ env.Library(
'$BUILD_DIR/mongo/transport/message_compressor',
'$BUILD_DIR/mongo/transport/transport_layer_common',
'$BUILD_DIR/mongo/util/cmdline_utils/cmdline_utils',
- '$BUILD_DIR/mongo/util/foundation',
'$BUILD_DIR/mongo/util/ntservice',
'$BUILD_DIR/mongo/util/processinfo',
'server_status_core',
diff --git a/src/mongo/db/concurrency/SConscript b/src/mongo/db/concurrency/SConscript
index dd3679a1b78..c823280f415 100644
--- a/src/mongo/db/concurrency/SConscript
+++ b/src/mongo/db/concurrency/SConscript
@@ -23,7 +23,6 @@ env.Library(
LIBDEPS=[
'$BUILD_DIR/mongo/util/background_job',
'$BUILD_DIR/mongo/base',
- '$BUILD_DIR/mongo/util/foundation',
# Temporary crutch since the ssl cleanup is hard coded in background.cpp
'$BUILD_DIR/mongo/util/net/network',
'$BUILD_DIR/mongo/db/server_parameters',
diff --git a/src/mongo/db/fts/SConscript b/src/mongo/db/fts/SConscript
index d50fd5acdeb..45268af4500 100644
--- a/src/mongo/db/fts/SConscript
+++ b/src/mongo/db/fts/SConscript
@@ -55,7 +55,6 @@ baseEnv.Library('base', [
"$BUILD_DIR/mongo/db/bson/dotted_path_support",
"$BUILD_DIR/mongo/db/common",
"$BUILD_DIR/mongo/db/fts/unicode/unicode",
- "$BUILD_DIR/mongo/platform/platform",
"$BUILD_DIR/mongo/util/md5",
"$BUILD_DIR/third_party/shim_stemmer",
])
diff --git a/src/mongo/db/ops/SConscript b/src/mongo/db/ops/SConscript
index 69ba2abcb93..78ba7a0c635 100644
--- a/src/mongo/db/ops/SConscript
+++ b/src/mongo/db/ops/SConscript
@@ -13,7 +13,6 @@ env.Library(
'$BUILD_DIR/mongo/base',
'$BUILD_DIR/mongo/bson/mutable/mutable_bson',
'$BUILD_DIR/mongo/db/common',
- '$BUILD_DIR/mongo/util/foundation',
'$BUILD_DIR/mongo/db/matcher/expressions',
],
)
diff --git a/src/mongo/db/pipeline/SConscript b/src/mongo/db/pipeline/SConscript
index b55d164ec4c..3aeea52b08c 100644
--- a/src/mongo/db/pipeline/SConscript
+++ b/src/mongo/db/pipeline/SConscript
@@ -22,7 +22,7 @@ env.Library(
'field_path.cpp',
],
LIBDEPS=[
- '$BUILD_DIR/mongo/util/foundation',
+ '$BUILD_DIR/mongo/base',
]
)
@@ -45,7 +45,6 @@ env.Library(
LIBDEPS=[
'field_path',
'$BUILD_DIR/mongo/base',
- '$BUILD_DIR/mongo/util/foundation',
'$BUILD_DIR/mongo/util/intrusive_counter',
]
)
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index d92b0575b0a..c5588414d58 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -100,7 +100,6 @@ env.Library(
'task_runner',
'$BUILD_DIR/mongo/executor/network_interface',
'$BUILD_DIR/mongo/executor/task_executor_interface',
- '$BUILD_DIR/mongo/util/foundation',
'$BUILD_DIR/mongo/util/net/hostandport',
],
)
@@ -1050,7 +1049,6 @@ env.Library(
LIBDEPS=[
'optime',
'$BUILD_DIR/mongo/base',
- '$BUILD_DIR/mongo/util/foundation',
],
)
diff --git a/src/mongo/db/stats/SConscript b/src/mongo/db/stats/SConscript
index bf22a72eb58..5d8fc0e31be 100644
--- a/src/mongo/db/stats/SConscript
+++ b/src/mongo/db/stats/SConscript
@@ -9,7 +9,6 @@ env.Library(
],
LIBDEPS=[
'$BUILD_DIR/mongo/base',
- '$BUILD_DIR/mongo/util/foundation',
'$BUILD_DIR/mongo/util/concurrency/spin_lock',
],
)
diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript
index 4680e07f672..d65046ed6fa 100644
--- a/src/mongo/db/storage/SConscript
+++ b/src/mongo/db/storage/SConscript
@@ -1,3 +1,4 @@
+# -*- mode: python -*-
Import("env")
env.SConscript(
@@ -155,7 +156,6 @@ env.Library(
'storage_engine_lock_file_${TARGET_OS_FAMILY}.cpp',
],
LIBDEPS=[
- '$BUILD_DIR/mongo/platform/platform',
'paths',
]
)
diff --git a/src/mongo/db/storage/ephemeral_for_test/SConscript b/src/mongo/db/storage/ephemeral_for_test/SConscript
index 02e848fa9c2..c3ec899e74a 100644
--- a/src/mongo/db/storage/ephemeral_for_test/SConscript
+++ b/src/mongo/db/storage/ephemeral_for_test/SConscript
@@ -1,3 +1,4 @@
+# -*- mode: python -*-
Import("env")
env.Library(
@@ -8,7 +9,6 @@ env.Library(
LIBDEPS= [
'$BUILD_DIR/mongo/base',
'$BUILD_DIR/mongo/db/storage/oplog_hack',
- '$BUILD_DIR/mongo/util/foundation',
]
)
@@ -28,7 +28,6 @@ env.Library(
'$BUILD_DIR/mongo/db/repl/repl_coordinator_global',
'$BUILD_DIR/mongo/db/storage/index_entry_comparison',
'$BUILD_DIR/mongo/db/storage/journal_listener',
- '$BUILD_DIR/mongo/util/foundation',
]
)
diff --git a/src/mongo/db/storage/mmap_v1/SConscript b/src/mongo/db/storage/mmap_v1/SConscript
index e8d9893017f..cfb507c80d7 100644
--- a/src/mongo/db/storage/mmap_v1/SConscript
+++ b/src/mongo/db/storage/mmap_v1/SConscript
@@ -76,7 +76,6 @@ env.Library(
],
LIBDEPS= [
'$BUILD_DIR/mongo/base',
- '$BUILD_DIR/mongo/util/foundation',
]
)
@@ -88,7 +87,6 @@ env.Library(
LIBDEPS=[
'$BUILD_DIR/mongo/db/storage/paths',
'$BUILD_DIR/mongo/util/fail_point',
- '$BUILD_DIR/mongo/util/foundation',
'$BUILD_DIR/mongo/util/processinfo',
],
)
@@ -112,7 +110,6 @@ env.Library(
],
LIBDEPS=[
'file_allocator',
- '$BUILD_DIR/mongo/util/foundation',
'$BUILD_DIR/mongo/util/progress_meter',
'$BUILD_DIR/mongo/db/storage/storage_options'
],
@@ -194,7 +191,7 @@ if mmapv1:
env.CppUnitTest(target = 'namespace_test',
source = ['catalog/namespace_test.cpp'],
- LIBDEPS = ['$BUILD_DIR/mongo/util/foundation'])
+ LIBDEPS = ['$BUILD_DIR/mongo/base'])
env.CppUnitTest(
target='record_store_v1_simple_test',
diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript
index 0137d3d6535..032257889f0 100644
--- a/src/mongo/db/storage/wiredtiger/SConscript
+++ b/src/mongo/db/storage/wiredtiger/SConscript
@@ -1,3 +1,4 @@
+# -*- mode: python -*-
Import("env")
Import("wiredtiger")
Import("get_option")
@@ -55,7 +56,6 @@ if wiredtiger:
'$BUILD_DIR/mongo/db/storage/storage_options',
'$BUILD_DIR/mongo/util/concurrency/ticketholder',
'$BUILD_DIR/mongo/util/elapsed_tracker',
- '$BUILD_DIR/mongo/util/foundation',
'$BUILD_DIR/mongo/util/processinfo',
'$BUILD_DIR/third_party/shim_wiredtiger',
'$BUILD_DIR/third_party/shim_snappy',
View Lorry Controller Status