SERVER-33889 Split dcommands and core into libraries for embedded vs standalone process applications. Refactored commands libraries throughout the codebase and made their uses be LIBDEPS_PRIVATE when possible as most commands don't export any symbols and don't even have headerfiles.

1 files changed, 19 insertions, 9 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 91344e17244..99287b19945 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -529,7 +529,6 @@ env.Library(
         'auth/authcore',
         'command_can_run_here',
         'commands/server_status_core',
-        'commands/test_commands_enabled',
         'service_context',
     ],
 )
@@ -594,7 +593,6 @@ env.Library(
         'catalog/database',
         'catalog/database_holder',
         'catalog/uuid_catalog',
-        'commands/server_status',
         'concurrency/lock_manager',
         'curop_metrics',
         'dbdirectclient',
@@ -605,6 +603,9 @@ env.Library(
         's/sharding_api_d',
         'views/views',
     ],
+    LIBDEPS_PRIVATE=[
+        'commands/server_status',
+    ]
 )
 
 env.CppUnitTest(
@@ -671,10 +672,11 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/auth/authmongod',
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
-        '$BUILD_DIR/mongo/db/commands/dcommands_fsync',
         '$BUILD_DIR/mongo/db/ops/write_ops_parsers',
         '$BUILD_DIR/mongo/db/s/sharding',
         '$BUILD_DIR/mongo/db/storage/storage_options',
+        '$BUILD_DIR/mongo/db/storage/storage_engine_lock_file',
+        '$BUILD_DIR/mongo/db/storage/storage_engine_metadata',
         '$BUILD_DIR/mongo/transport/service_entry_point',
         'command_can_run_here',
         'curop',
@@ -711,6 +713,9 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/catalog/uuid_catalog',
     ],
+    LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/commands/mongod_fcv',
+    ],
 )
 
 env.Library(
@@ -755,6 +760,8 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/catalog/collection_options',
         '$BUILD_DIR/mongo/db/catalog/index_create',
+    ],
+    LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/commands/list_collections_filter',
     ],
 )
@@ -765,7 +772,6 @@ env.Library(
         "curop_metrics.cpp",
     ],
     LIBDEPS=[
-        "commands/server_status_core",
         "curop",
     ],
 )
@@ -803,6 +809,7 @@ env.Library(
     LIBDEPS=[
         'dbhelpers',
         'index/index_access_method',
+        '$BUILD_DIR/mongo/db/stats/timer_stats',
         '$BUILD_DIR/mongo/db/storage/mmap_v1/mmap',
     ],
 )
@@ -1001,8 +1008,6 @@ env.Library(
         "catalog/index_key_validate",
         "cloner",
         "collection_index_usage_tracker",
-        "commands/dcommands",
-        "commands/killcursors_common",
         "common",
         "concurrency/lock_manager",
         "concurrency/write_conflict_exception",
@@ -1070,6 +1075,7 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
+        '$BUILD_DIR/mongo/db/commands/mongod_fcv',
         'dbdirectclient',
         'dbhelpers',
         'repair_database',
@@ -1262,12 +1268,14 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/s/client/sharding_client',
-        '$BUILD_DIR/mongo/s/commands/shared_cluster_commands',
         '$BUILD_DIR/mongo/s/coreshard',
         'dbdirectclient',
         'sessions_collection',
         'sessions_collection_sharded',
     ],
+    LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/s/commands/shared_cluster_commands',
+    ]
 )
 
 env.Library(
@@ -1291,7 +1299,6 @@ env.Library(
         env.Idlc('commands/end_sessions.idl')[0],
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/db/commands/server_status',
         'logical_session_cache',
         'logical_session_id',
         'logical_session_id_helpers',
@@ -1300,6 +1307,9 @@ env.Library(
         'service_liason',
         'kill_sessions',
     ],
+    LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/commands/server_status',
+    ]
 )
 
 env.Library(
@@ -1308,7 +1318,6 @@ env.Library(
         'transaction_reaper.cpp',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/commands/server_status',
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
         '$BUILD_DIR/mongo/s/client/shard_interface',
         '$BUILD_DIR/mongo/s/coreshard',
@@ -1623,6 +1632,7 @@ env.Library(
         'service_context_d_test_fixture.cpp',
     ],
     LIBDEPS= [
+        '$BUILD_DIR/mongo/db/commands/mongod',
         '$BUILD_DIR/mongo/db/serveronly',
         '$BUILD_DIR/mongo/db/storage/storage_options',
         '$BUILD_DIR/mongo/unittest/unittest',