SERVER-30065 Do libdeps dependency types by section, not tuple

17 files changed, 58 insertions, 43 deletions

diff --git a/src/mongo/client/SConscript b/src/mongo/client/SConscript
index 04a5bc5cce1..16dd55dafa0 100644
--- a/src/mongo/client/SConscript
+++ b/src/mongo/client/SConscript
@@ -172,6 +172,7 @@ clientDriverEnv.Library(
         '$BUILD_DIR/mongo/executor/thread_pool_task_executor',
         '$BUILD_DIR/mongo/rpc/command_status',
         '$BUILD_DIR/mongo/rpc/rpc',
+        '$BUILD_DIR/mongo/util/background_job',
         '$BUILD_DIR/mongo/util/md5',
         '$BUILD_DIR/mongo/util/net/network',
         'authentication',
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 2bb21284749..70b7fa064a1 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -132,6 +132,7 @@ env.Library(
         "dbmessage.cpp",
     ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/transport/transport_layer_common',
         '$BUILD_DIR/mongo/util/net/network',
     ]
@@ -362,6 +363,7 @@ env.Clone().InjectModule("enterprise").Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/util/cmdline_utils/cmdline_utils',
+        '$BUILD_DIR/mongo/util/fail_point',
         '$BUILD_DIR/mongo/transport/message_compressor',
         # The dependency on network is a temporary crutch that should go away once the
         # networking library has separate options
diff --git a/src/mongo/db/ftdc/SConscript b/src/mongo/db/ftdc/SConscript
index 2bb720d3231..222f5b1e112 100644
--- a/src/mongo/db/ftdc/SConscript
+++ b/src/mongo/db/ftdc/SConscript
@@ -23,6 +23,7 @@ ftdcEnv.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/bson/util/bson_extract',
+        '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/third_party/s2/s2', # For VarInt
         '$BUILD_DIR/third_party/shim_zlib',
diff --git a/src/mongo/db/query/datetime/SConscript b/src/mongo/db/query/datetime/SConscript
index 1334867552e..a9f8bb87746 100644
--- a/src/mongo/db/query/datetime/SConscript
+++ b/src/mongo/db/query/datetime/SConscript
@@ -24,6 +24,7 @@ timeZoneEnv.Library(
     ],
     LIBDEPS=[
         'date_time_support',
+        '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/third_party/shim_timelib',
     ]
 )
diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript
index d16122eb2cf..e1f8b71113f 100644
--- a/src/mongo/db/storage/wiredtiger/SConscript
+++ b/src/mongo/db/storage/wiredtiger/SConscript
@@ -53,6 +53,7 @@ if wiredtiger:
             '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception',
             '$BUILD_DIR/mongo/db/index/index_descriptor',
             '$BUILD_DIR/mongo/db/namespace_string',
+            '$BUILD_DIR/mongo/db/server_options_core',
             '$BUILD_DIR/mongo/db/service_context',
             '$BUILD_DIR/mongo/db/storage/index_entry_comparison',
             '$BUILD_DIR/mongo/db/storage/journal_listener',
diff --git a/src/mongo/db/update/SConscript b/src/mongo/db/update/SConscript
index 0ee72535349..4468b4c681d 100644
--- a/src/mongo/db/update/SConscript
+++ b/src/mongo/db/update/SConscript
@@ -113,6 +113,7 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/db/ops/update',
+        '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/db/query/query_planner',
         'update',
     ],
diff --git a/src/mongo/rpc/SConscript b/src/mongo/rpc/SConscript
index 8bcb6d45095..21ce820c49f 100644
--- a/src/mongo/rpc/SConscript
+++ b/src/mongo/rpc/SConscript
@@ -76,6 +76,7 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/client/read_preference',
+        '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/util/net/network',
     ],
 )
@@ -105,6 +106,7 @@ env.Library(
         'reply_builder_interface.cpp',
     ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/util/net/network',
     ],
 )
diff --git a/src/mongo/scripting/SConscript b/src/mongo/scripting/SConscript
index b6d940db845..dadf3936156 100644
--- a/src/mongo/scripting/SConscript
+++ b/src/mongo/scripting/SConscript
@@ -147,10 +147,12 @@ if usemozjs:
         LIBDEPS=[
             'bson_template_evaluator',
             'scripting_common',
-            ('$BUILD_DIR/third_party/shim_mozjs', libdeps.dependency.Private),
             '$BUILD_DIR/mongo/shell/mongojs',
             '$BUILD_DIR/mongo/db/service_context',
         ],
+        LIBDEPS_PRIVATE=[
+            '$BUILD_DIR/third_party/shim_mozjs',
+        ],
     )
 else:
     env.Library(
diff --git a/src/mongo/transport/SConscript b/src/mongo/transport/SConscript
index 8da74dcae3b..ce0679290c9 100644
--- a/src/mongo/transport/SConscript
+++ b/src/mongo/transport/SConscript
@@ -62,6 +62,7 @@ tlEnv.Library(
         '$BUILD_DIR/mongo/db/auth/authentication_restriction',
         '$BUILD_DIR/third_party/shim_asio',
         '$BUILD_DIR/mongo/base/system_error',
+        '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/mongo/db/stats/counters',
     ],
@@ -86,6 +87,7 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/auth/authentication_restriction',
+        '$BUILD_DIR/mongo/db/server_options_core',
         "$BUILD_DIR/mongo/db/service_context",
         '$BUILD_DIR/mongo/db/stats/counters',
         "$BUILD_DIR/mongo/util/processinfo",
diff --git a/src/mongo/util/net/SConscript b/src/mongo/util/net/SConscript
index 33dd488cb1b..83151f8f3a8 100644
--- a/src/mongo/util/net/SConscript
+++ b/src/mongo/util/net/SConscript
@@ -14,24 +14,25 @@ env.Library(
         "message.cpp",
         "message_port.cpp",
         "op_msg.cpp",
+        "private/socket_poll.cpp",
+        "private/ssl_expiration.cpp",
         "sock.cpp",
         "sockaddr.cpp",
         "socket_exception.cpp",
-        "socket_poll.cpp",
-        "ssl_expiration.cpp",
         "ssl_manager.cpp",
         "ssl_options.cpp",
         "thread_idle_callback.cpp",
-
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/auth/auth_rolename',
+        '$BUILD_DIR/mongo/util/concurrency/ticketholder',
+        '$BUILD_DIR/mongo/util/decorable',
+    ],
+    LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/bson/dotted_path_support',
         '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/util/background_job',
-        '$BUILD_DIR/mongo/util/concurrency/ticketholder',
-        '$BUILD_DIR/mongo/util/decorable',
         '$BUILD_DIR/mongo/util/fail_point',
         '$BUILD_DIR/mongo/util/options_parser/options_parser',
     ],
@@ -45,6 +46,7 @@ env.CppUnitTest(
         'sock_test.cpp',
     ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/util/fail_point',
         'network',
     ],
 )
diff --git a/src/mongo/util/net/socket_poll.cpp b/src/mongo/util/net/private/socket_poll.cpp
index f52da54355e..88a96e85849 100644
--- a/src/mongo/util/net/socket_poll.cpp
+++ b/src/mongo/util/net/private/socket_poll.cpp
@@ -30,7 +30,7 @@
 
 #include "mongo/base/init.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/net/socket_poll.h"
+#include "mongo/util/net/private/socket_poll.h"
 
 namespace mongo {
 
diff --git a/src/mongo/util/net/socket_poll.h b/src/mongo/util/net/private/socket_poll.h
index 379dc8226be..379dc8226be 100644
--- a/src/mongo/util/net/socket_poll.h
+++ b/src/mongo/util/net/private/socket_poll.h
diff --git a/src/mongo/util/net/ssl_expiration.cpp b/src/mongo/util/net/private/ssl_expiration.cpp
index 98a8b51d8ad..208c6132395 100644
--- a/src/mongo/util/net/ssl_expiration.cpp
+++ b/src/mongo/util/net/private/ssl_expiration.cpp
@@ -27,7 +27,7 @@
 
 #define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kControl
 
-#include "mongo/util/net/ssl_expiration.h"
+#include "mongo/util/net/private/ssl_expiration.h"
 
 #include <string>
 
diff --git a/src/mongo/util/net/ssl_expiration.h b/src/mongo/util/net/private/ssl_expiration.h
index fc56c3968c7..fc56c3968c7 100644
--- a/src/mongo/util/net/ssl_expiration.h
+++ b/src/mongo/util/net/private/ssl_expiration.h
diff --git a/src/mongo/util/net/sock.cpp b/src/mongo/util/net/sock.cpp
index f0fc3cfde79..35e614da95d 100644
--- a/src/mongo/util/net/sock.cpp
+++ b/src/mongo/util/net/sock.cpp
@@ -61,8 +61,8 @@
 #include "mongo/util/log.h"
 #include "mongo/util/mongoutils/str.h"
 #include "mongo/util/net/message.h"
+#include "mongo/util/net/private/socket_poll.h"
 #include "mongo/util/net/socket_exception.h"
-#include "mongo/util/net/socket_poll.h"
 #include "mongo/util/net/ssl_manager.h"
 #include "mongo/util/quick_exit.h"
 
diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp
index b0d762375bc..560e562c7ee 100644
--- a/src/mongo/util/net/ssl_manager.cpp
+++ b/src/mongo/util/net/ssl_manager.cpp
@@ -53,9 +53,9 @@
 #include "mongo/util/exit.h"
 #include "mongo/util/log.h"
 #include "mongo/util/mongoutils/str.h"
+#include "mongo/util/net/private/ssl_expiration.h"
 #include "mongo/util/net/sock.h"
 #include "mongo/util/net/socket_exception.h"
-#include "mongo/util/net/ssl_expiration.h"
 #include "mongo/util/net/ssl_options.h"
 #include "mongo/util/net/ssl_types.h"
 #include "mongo/util/scopeguard.h"
diff --git a/src/third_party/SConscript b/src/third_party/SConscript
index 917b3020979..523f28e028c 100644
--- a/src/third_party/SConscript
+++ b/src/third_party/SConscript
@@ -123,8 +123,8 @@ else:
     pcreEnv.InjectThirdPartyIncludePaths(libraries=['pcre'])
     pcreEnv.SConscript('pcre' + pcreSuffix + '/SConscript', exports={ 'env' : pcreEnv })
     pcreEnv = pcreEnv.Clone(
-        LIBDEPS=[
-            ('pcre' + pcreSuffix + '/pcrecpp', libdeps.dependency.Interface),
+        LIBDEPS_INTERFACE=[
+            'pcre' + pcreSuffix + '/pcrecpp',
         ])
 
 pcreEnv.Library(
@@ -153,12 +153,12 @@ else:
     boostEnv.InjectThirdPartyIncludePaths(libraries=['boost'])
     boostEnv.SConscript(boostDirectory + '/SConscript', exports={ 'env' : boostEnv })
     boostEnv = boostEnv.Clone(
-        LIBDEPS=[
-            (boostDirectory + '/boost_program_options', libdeps.dependency.Interface),
-            (boostDirectory + '/boost_filesystem', libdeps.dependency.Interface),
-            (boostDirectory + '/boost_thread', libdeps.dependency.Interface),
-            (boostDirectory + '/boost_system', libdeps.dependency.Interface),
-            (boostDirectory + '/boost_iostreams', libdeps.dependency.Interface),
+        LIBDEPS_INTERFACE=[
+            boostDirectory + '/boost_program_options',
+            boostDirectory + '/boost_filesystem',
+            boostDirectory + '/boost_thread',
+            boostDirectory + '/boost_system',
+            boostDirectory + '/boost_iostreams',
         ])
 
 boostEnv.Library(
@@ -179,8 +179,8 @@ else:
     snappyEnv.InjectMongoIncludePaths()
     snappyEnv.SConscript('snappy' + snappySuffix + '/SConscript', exports={ 'env' : snappyEnv })
     snappyEnv = snappyEnv.Clone(
-        LIBDEPS=[
-            ('snappy' + snappySuffix + '/snappy',  libdeps.dependency.Interface),
+        LIBDEPS_INTERFACE=[
+            'snappy' + snappySuffix + '/snappy',
         ])
 
 snappyEnv.Library(
@@ -199,8 +199,8 @@ else:
     zlibEnv.InjectThirdPartyIncludePaths(libraries=['zlib'])
     zlibEnv.SConscript('zlib' + zlibSuffix + '/SConscript', exports={ 'env' : zlibEnv })
     zlibEnv = zlibEnv.Clone(
-        LIBDEPS=[
-            ('zlib' + zlibSuffix + '/zlib', libdeps.dependency.Interface),
+        LIBDEPS_INTERFACE=[
+            'zlib' + zlibSuffix + '/zlib',
         ])
 
 zlibEnv.Library(
@@ -213,9 +213,9 @@ if usemozjs:
     mozjsEnv = env.Clone()
     mozjsEnv.SConscript('mozjs' + mozjsSuffix + '/SConscript', exports={'env' : mozjsEnv })
     mozjsEnv = mozjsEnv.Clone(
-        LIBDEPS=[
-            ('mozjs' + mozjsSuffix + '/mozjs', libdeps.dependency.Interface),
-            ('shim_zlib', libdeps.dependency.Interface),
+        LIBDEPS_INTERFACE=[
+            'mozjs' + mozjsSuffix + '/mozjs',
+            'shim_zlib',
         ])
 
     mozjsEnv.Library(
@@ -236,8 +236,8 @@ if (gperftoolsEnv['MONGO_ALLOCATOR'] == "tcmalloc"):
         gperftoolsEnv.InjectThirdPartyIncludePaths(libraries=['gperftools'])
         gperftoolsEnv.SConscript('gperftools' + gperftoolsSuffix + '/SConscript', exports={ 'env' : gperftoolsEnv })
         gperftoolsEnv = gperftoolsEnv.Clone(
-            LIBDEPS=[
-                ('gperftools' + gperftoolsSuffix + '/tcmalloc_minimal', libdeps.dependency.Interface),
+            LIBDEPS_INTERFACE=[
+                'gperftools' + gperftoolsSuffix + '/tcmalloc_minimal',
             ])
 
 gperftoolsEnv.Library(
@@ -257,8 +257,8 @@ else:
     stemmerEnv.InjectThirdPartyIncludePaths(libraries=['stemmer'])
     stemmerEnv.SConscript('libstemmer_c/SConscript', exports={ 'env' : stemmerEnv })
     stemmerEnv = stemmerEnv.Clone(
-        LIBDEPS=[
-             ('libstemmer_c/stemmer', libdeps.dependency.Interface),
+        LIBDEPS_INTERFACE=[
+             'libstemmer_c/stemmer',
         ])
 
 stemmerEnv.Library(
@@ -278,8 +278,8 @@ else:
     yamlEnv.InjectThirdPartyIncludePaths(libraries=['yaml', 'boost'])
     yamlEnv.SConscript('yaml-cpp' + yamlSuffix + '/SConscript', exports={ 'env' : yamlEnv })
     yamlEnv = yamlEnv.Clone(
-        LIBDEPS=[
-            ('yaml-cpp' + yamlSuffix + '/yaml', libdeps.dependency.Interface),
+        LIBDEPS_INTERFACE=[
+            'yaml-cpp' + yamlSuffix + '/yaml',
         ])
 
 yamlEnv.Library(
@@ -294,8 +294,8 @@ if env.TargetOSIs('solaris'):
     tzEnv.InjectThirdPartyIncludePaths(libraries=['tz'])
     tzEnv.SConscript('tz/SConscript', exports={ 'env' : tzEnv })
     tzEnv = tzEnv.Clone(
-        LIBDEPS=[
-            ('tz/tz', libdeps.dependency.Interface),
+        LIBDEPS_INTERFACE=[
+            'tz/tz',
         ])
 
 tzEnv.Library(
@@ -309,8 +309,8 @@ timelibEnv = env.Clone();
 timelibEnv.InjectThirdPartyIncludePaths(libraries=['timelib'])
 timelibEnv.SConscript('timelib' + timelibSuffix + '/SConscript', exports={ 'env' : timelibEnv })
 timelibEnv = timelibEnv.Clone(
-    LIBDEPS=[
-        ('timelib' + timelibSuffix + '/timelib', libdeps.dependency.Interface),
+    LIBDEPS_INTERFACE=[
+        'timelib' + timelibSuffix + '/timelib',
     ])
 
 timelibEnv.Library(
@@ -330,8 +330,8 @@ if wiredtiger:
         wiredtigerEnv.InjectThirdPartyIncludePaths(libraries=['wiredtiger'])
         wiredtigerEnv.SConscript('wiredtiger/SConscript', exports={ 'env' : wiredtigerEnv })
         wiredtigerEnv = wiredtigerEnv.Clone(
-            LIBDEPS=[
-                 ('wiredtiger/wiredtiger', libdeps.dependency.Interface),
+            LIBDEPS_INTERFACE=[
+                 'wiredtiger/wiredtiger',
             ])
 
     wiredtigerEnv.Library(
@@ -350,8 +350,8 @@ else:
     asioEnv.InjectThirdPartyIncludePaths(libraries=['asio'])
     asioEnv.SConscript('asio-master/SConscript', exports={ 'env' : asioEnv })
     asioEnv = asioEnv.Clone(
-        LIBDEPS=[
-            ('asio-master/asio', libdeps.dependency.Interface),
+        LIBDEPS_INTERFACE=[
+            'asio-master/asio',
         ])
 
 asioEnv.Library(
@@ -370,8 +370,8 @@ else:
     intelDecimal128Env.InjectThirdPartyIncludePaths(libraries=['intel_decimal128'])
     intelDecimal128Env.SConscript('IntelRDFPMathLib20U1/SConscript', exports={ 'env' : intelDecimal128Env })
     intelDecimal128Env = intelDecimal128Env.Clone(
-	LIBDEPS=[
-	    ('IntelRDFPMathLib20U1/intel_decimal128', libdeps.dependency.Interface),
+	LIBDEPS_INTERFACE=[
+	    'IntelRDFPMathLib20U1/intel_decimal128',
 	])
 
 intelDecimal128Env.Library(
@@ -392,8 +392,8 @@ else:
     icuEnv.InjectThirdPartyIncludePaths(libraries=['icu'])
     icuEnv.SConscript('icu4c' + icuSuffix + '/source/SConscript', exports={ 'env' : icuEnv })
     icuEnv = icuEnv.Clone(
-        LIBDEPS=[
-            ('icu4c' + icuSuffix + '/source/icu_i18n', libdeps.dependency.Interface),
+        LIBDEPS_INTERFACE=[
+            'icu4c' + icuSuffix + '/source/icu_i18n',
         ])
 
 icuEnv.Library(