diff options
Diffstat (limited to 'src/mongo/SConscript')
| -rw-r--r-- | src/mongo/SConscript | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/mongo/SConscript b/src/mongo/SConscript index 679a0a091ba..67ddee7fd4c 100644 --- a/src/mongo/SConscript +++ b/src/mongo/SConscript @@ -28,7 +28,8 @@ env.SConscript(['base/SConscript', 's/SConscript', 'unittest/SConscript', 'util/concurrency/SConscript', - 'util/options_parser/SConscript']) + 'util/options_parser/SConscript', + 'util/cmdline_utils/SConscript']) def add_exe( v ): return "${PROGPREFIX}%s${PROGSUFFIX}" % v @@ -371,6 +372,8 @@ env.StaticLibrary("coredb", [ 'db/exec/working_set', '$BUILD_DIR/mongo/foundation', '$BUILD_DIR/third_party/shim_snappy', + 'server_options', + '$BUILD_DIR/mongo/util/cmdline_utils/cmdline_utils', ]) coreServerFiles = [ "db/client_basic.cpp", @@ -542,6 +545,8 @@ serverOnlyFiles = [ "db/curop.cpp", "db/compact.cpp", "db/dbcommands_admin.cpp", "db/write_concern.cpp", + "db/startup_warnings.cpp", + "db/storage_options.cpp", # most commands are only for mongod "db/commands/apply_ops.cpp", @@ -563,16 +568,12 @@ serverOnlyFiles = [ "db/curop.cpp", "db/pipeline/document_source_cursor.cpp", "db/driverHelpers.cpp" ] -env.Library("dbcmdline", ["db/cmdline.cpp", "db/server_options.cpp"], +env.Library("server_options", ["db/server_options.cpp"], LIBDEPS=['bson', 'server_parameters', '$BUILD_DIR/mongo/util/options_parser/options_parser', + '$BUILD_DIR/mongo/util/cmdline_utils/cmdline_utils', ]) -env.CppUnitTest('cmdline_test', 'db/cmdline_test.cpp', - LIBDEPS=['bson', - 'dbcmdline', - '$BUILD_DIR/mongo/util/options_parser/options_parser', - ]) env.CppUnitTest('diskloc_test', 'db/diskloc_test.cpp', LIBDEPS=[]) @@ -609,6 +610,8 @@ mongosLibraryFiles = [ "s/balancer_policy.cpp", "s/writeback_listener.cpp", "s/version_manager.cpp", + "s/version_mongos.cpp", + "s/mongos_persistence_stubs.cpp", ] env.Library( "mongoscore", @@ -618,15 +621,19 @@ env.Library( "mongoscore", ] ) env.CppUnitTest( "balancer_policy_test" , [ "s/balancer_policy_tests.cpp" ] , - LIBDEPS=["mongoscore", "coreshard", "mongocommon","coreserver","coredb","dbcmdline","mongodandmongos"] , - NO_CRUTCH=True) + LIBDEPS=["mongoscore", + "coreshard", + "mongocommon", + "coreserver", + "coredb", + "mongodandmongos"], + NO_CRUTCH=True) env.CppUnitTest("dbclient_rs_test", [ "client/dbclient_rs_test.cpp" ], LIBDEPS=[ "coredb", "coreserver", "coreshard", - "dbcmdline", "mocklib", "mongocommon", "mongodandmongos", @@ -638,7 +645,6 @@ env.CppUnitTest("scoped_db_conn_test", [ "client/scoped_db_conn_test.cpp" ], "coredb", "coreserver", "coreshard", - "dbcmdline", "mongocommon", "mongodandmongos", "mongoscore"], @@ -651,7 +657,6 @@ env.CppUnitTest("shard_conn_test", [ "s/shard_conn_test.cpp" ], "mongocommon", "coreserver", "coredb", - "dbcmdline", "mongodandmongos", "mocklib", "$BUILD_DIR/mongo/db/auth/authmocks"], @@ -663,7 +668,6 @@ env.CppUnitTest("shard_test", [ "s/shard_test.cpp" ], "mongocommon", "coreserver", "coredb", - "dbcmdline", "mongodandmongos", "mocklib"], NO_CRUTCH=True) @@ -674,7 +678,6 @@ env.CppUnitTest('config_server_tests', [ 's/config_server_tests.cpp' ], "mongocommon", "coreserver", "coredb", - "dbcmdline", "mongodandmongos", "mocklib"], NO_CRUTCH=True) @@ -735,7 +738,6 @@ env.StaticLibrary("serveronly", serverOnlyFiles, "db/fts/ftsmongod", "db/common", "db/ops/update_driver", - "dbcmdline", "defaultversion", "geoparser", "geoquery", @@ -820,7 +822,7 @@ env.Install( '#/', [ # mongos mongos = env.Program( "mongos", [ "s/server.cpp", "s/mongos_options.cpp" ] , - LIBDEPS=["mongoscore", "coreserver", "coredb", "mongocommon", "coreshard", "dbcmdline", "ntservice", + LIBDEPS=["mongoscore", "coreserver", "coredb", "mongocommon", "coreshard", "ntservice", "mongodandmongos", "s/upgrade", "s/write_ops", "s/write_op_impl"]) env.Install( '#/', mongos ) |