SERVER-9666 Make SConscript invocation more hierarchical

8 files changed, 72 insertions, 32 deletions

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index f7b0b9e305f..a81a90b9fd2 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -24,49 +24,18 @@ env.SConscript(
         'base',
         'client',
         'crypto',
-        'crypto/tom',
         'db',
-        'db/auth',
-        'db/catalog',
-        'db/commands',
-        'db/concurrency',
-        'db/exec',
-        'db/fts',
-        'db/geo',
-        'db/index',
-        'db/matcher',
-        'db/ops',
-        'db/pipeline',
-        'db/query',
-        'db/repl',
-        'db/sorter',
-        'db/stats',
-        'db/storage',
-        'db/storage/devnull',
-        'db/storage/in_memory',
-        'db/storage/kv',
-        'db/storage/mmap_v1',
-        'db/storage/wiredtiger',
         'dbtests',
-        'installer/msi',
+        'installer',
         'logger',
         'platform',
         'rpc',
         's',
-        's/catalog',
-        's/catalog/legacy',
-        's/client',
-        's/commands',
         'scripting',
         'shell',
         'tools',
         'unittest',
         'util',
-        'util/cmdline_utils',
-        'util/concurrency',
-        'util/mongoutils',
-        'util/net',
-        'util/options_parser',
     ],
 )
 
diff --git a/src/mongo/crypto/SConscript b/src/mongo/crypto/SConscript
index 969a818a6cc..d11ae9d6376 100644
--- a/src/mongo/crypto/SConscript
+++ b/src/mongo/crypto/SConscript
@@ -2,6 +2,12 @@
 
 Import("env")
 
+env.SConscript(
+    dirs=[
+        'tom',
+    ],
+)
+
 env.Library('crypto_tom',
            ['crypto_tom.cpp'],
            LIBDEPS=['tom/tomcrypt'])
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 8e9340301ae..dc25bbc0aa7 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -2,6 +2,27 @@
 
 Import("env")
 
+env.SConscript(
+    dirs=[
+        'auth',
+        'catalog',
+        'commands',
+        'concurrency',
+        'exec',
+        'fts',
+        'geo',
+        'index',
+        'matcher',
+        'ops',
+        'pipeline',
+        'query',
+        'repl',
+        'sorter',
+        'stats',
+        'storage',
+    ],
+)
+
 #
 # The db/'common' lib has the abstractions that are shared by components of the
 # server. Ideally, many of the object in 'coredb' should be moved here when their dependencies
diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript
index 7858d6f40ae..483bca69e06 100644
--- a/src/mongo/db/storage/SConscript
+++ b/src/mongo/db/storage/SConscript
@@ -1,5 +1,16 @@
 Import("env")
 
+env.SConscript(
+    dirs=[
+        'devnull',
+        'in_memory',
+        'kv',
+        'mmap_v1',
+        'wiredtiger',
+    ],
+)
+
+
 env.Library(
     target='index_entry_comparison',
     source=[
diff --git a/src/mongo/installer/SConscript b/src/mongo/installer/SConscript
new file mode 100644
index 00000000000..841d4841626
--- /dev/null
+++ b/src/mongo/installer/SConscript
@@ -0,0 +1,9 @@
+# -*- mode: python; -*-
+
+Import("env")
+
+env.SConscript(
+    dirs=[
+        'msi',
+    ],
+)
diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript
index bcd47c95a04..39f8484ee85 100644
--- a/src/mongo/s/SConscript
+++ b/src/mongo/s/SConscript
@@ -2,6 +2,14 @@
 
 Import("env")
 
+env.SConscript(
+    dirs=[
+        'catalog',
+        'client',
+        'commands',
+    ],
+)
+
 #
 # Schema and backward compatibility code for "config" collections.
 #
diff --git a/src/mongo/s/catalog/SConscript b/src/mongo/s/catalog/SConscript
index 9479cc7c109..ea269063333 100644
--- a/src/mongo/s/catalog/SConscript
+++ b/src/mongo/s/catalog/SConscript
@@ -2,6 +2,12 @@
 
 Import("env")
 
+env.SConscript(
+    dirs=[
+        'legacy',
+    ],
+)
+
 env.Library(
     target='catalog_types',
     source=[
diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript
index 4897a41cf87..b5dd35fd885 100644
--- a/src/mongo/util/SConscript
+++ b/src/mongo/util/SConscript
@@ -5,6 +5,16 @@ Import("get_option")
 Import("has_option")
 Import("use_system_version_of_library")
 
+env.SConscript(
+    dirs=[
+        'cmdline_utils',
+        'concurrency',
+        'mongoutils',
+        'net',
+        'options_parser',
+    ],
+)
+
 env.Library(
     target='intrusive_counter',
     source=[