summaryrefslogtreecommitdiff
path: root/src/mongo
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2015-04-30 17:12:51 -0400
committerAndrew Morrow <acm@mongodb.com>2015-05-06 15:47:23 -0400
commit08d5bf44e8ffbb561d08c8e0e4d2cc923944cd0a (patch)
tree18830322f3d92e678b09e7e1c0cbd9999167b4ed /src/mongo
parent1e88a8d4baae5a7005bd6aa5ee022a2d363dd57c (diff)
downloadmongo-08d5bf44e8ffbb561d08c8e0e4d2cc923944cd0a.tar.gz
SERVER-9666 Push log and compress into own libraries in util
Diffstat (limited to 'src/mongo')
-rw-r--r--src/mongo/SConscript2
-rw-r--r--src/mongo/db/storage/mmap_v1/SConscript5
-rw-r--r--src/mongo/util/SConscript22
3 files changed, 26 insertions, 3 deletions
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 462bff9956c..f4ef26c0ce4 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -315,8 +315,6 @@ serverOnlyFiles = [ "db/background.cpp",
"db/storage_options.cpp",
"db/ttl.cpp",
"db/write_concern.cpp",
- "util/compress.cpp",
- "util/logfile.cpp",
]
if has_option( 'use-cpu-profiler' ):
diff --git a/src/mongo/db/storage/mmap_v1/SConscript b/src/mongo/db/storage/mmap_v1/SConscript
index f2c46938bf0..5bf9df68e07 100644
--- a/src/mongo/db/storage/mmap_v1/SConscript
+++ b/src/mongo/db/storage/mmap_v1/SConscript
@@ -32,7 +32,10 @@ env.Library(
LIBDEPS = [
'record_store_v1',
'record_access_tracker',
- 'btree']
+ 'btree',
+ '$BUILD_DIR/mongo/util/logfile',
+ '$BUILD_DIR/mongo/util/compress',
+ ]
)
env.Library(
diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript
index 0e1a47f609e..0b94752b7dc 100644
--- a/src/mongo/util/SConscript
+++ b/src/mongo/util/SConscript
@@ -411,3 +411,25 @@ env.CppUnitTest(
'foundation',
],
)
+
+compressEnv = env.Clone()
+compressEnv.InjectThirdPartyIncludePaths(libraries=['snappy'])
+compressEnv
+compressEnv.Library(
+ target='compress',
+ source=[
+ 'compress.cpp',
+ ],
+ LIBDEPS=[
+ ],
+)
+
+env.Library(
+ target='logfile',
+ source=[
+ 'logfile.cpp',
+ ],
+ LIBDEPS=[
+ ],
+)
+