diff options
| author | Andrew Morrow <acm@mongodb.com> | 2015-05-01 15:06:00 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2015-05-06 15:47:23 -0400 |
| commit | 0b0d3f8276b5462829c75ae49f322a964cc8d510 (patch) | |
| tree | 94328fc7ec78b658e6f15bdc5e088d202cb3d994 /src | |
| parent | 316c11f1744fd26820ed8b31525e2da2fdbe3d9b (diff) | |
| download | mongo-0b0d3f8276b5462829c75ae49f322a964cc8d510.tar.gz | |
SERVER-9666 Push paths into new lib under util
Diffstat (limited to 'src')
| -rw-r--r-- | src/mongo/SConscript | 3 | ||||
| -rw-r--r-- | src/mongo/db/storage/SConscript | 1 | ||||
| -rw-r--r-- | src/mongo/db/storage/mmap_v1/SConscript | 1 | ||||
| -rw-r--r-- | src/mongo/dbtests/SConscript | 1 | ||||
| -rw-r--r-- | src/mongo/util/SConscript | 12 |
5 files changed, 16 insertions, 2 deletions
diff --git a/src/mongo/SConscript b/src/mongo/SConscript index c13cff15a74..238feff54ab 100644 --- a/src/mongo/SConscript +++ b/src/mongo/SConscript @@ -142,8 +142,7 @@ env.Library('version', '$BUILD_DIR/mongo/base/base' ]) -commonFiles = [ "util/paths.cpp", - "util/concurrency/task.cpp", +commonFiles = [ "util/concurrency/task.cpp", "util/password.cpp", "util/concurrency/rwlockimpl.cpp", "util/text_startuptest.cpp", diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript index eb241491337..84b9c6e439b 100644 --- a/src/mongo/db/storage/SConscript +++ b/src/mongo/db/storage/SConscript @@ -104,6 +104,7 @@ env.Library( 'storage_engine_lock_file_${TARGET_OS_FAMILY}.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/util/paths', ] ) diff --git a/src/mongo/db/storage/mmap_v1/SConscript b/src/mongo/db/storage/mmap_v1/SConscript index 1a0d63bd889..187b1fa18cc 100644 --- a/src/mongo/db/storage/mmap_v1/SConscript +++ b/src/mongo/db/storage/mmap_v1/SConscript @@ -36,6 +36,7 @@ env.Library( '$BUILD_DIR/mongo/util/logfile', '$BUILD_DIR/mongo/util/compress', '$BUILD_DIR/mongo/util/file_allocator', + '$BUILD_DIR/mongo/util/paths', ] ) diff --git a/src/mongo/dbtests/SConscript b/src/mongo/dbtests/SConscript index 9a7faf3ffe3..ef85520bba0 100644 --- a/src/mongo/dbtests/SConscript +++ b/src/mongo/dbtests/SConscript @@ -114,6 +114,7 @@ dbtest = env.Program( "$BUILD_DIR/mongo/s/cluster_ops_impl", "$BUILD_DIR/mongo/db/serveronly", "$BUILD_DIR/mongo/util/signal_handlers_synchronous", + "$BUILD_DIR/mongo/util/paths", "mocklib", "testframework", ], diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript index 537cdd93ccc..0bdee733517 100644 --- a/src/mongo/util/SConscript +++ b/src/mongo/util/SConscript @@ -422,6 +422,7 @@ compressEnv.Library( 'compress.cpp', ], LIBDEPS=[ + 'paths', ], ) @@ -431,6 +432,7 @@ env.Library( 'logfile.cpp', ], LIBDEPS=[ + 'paths', ], ) @@ -440,5 +442,15 @@ env.Library( 'file_allocator.cpp', ], LIBDEPS=[ + 'paths', + ], +) + +env.Library( + target='paths', + source=[ + 'paths.cpp', + ], + LIBDEPS=[ ], ) |