SERVER-9666 Push shell js generation into shell directory

mongodb · Apr 29, 2015 · a6c7170 · a6c7170
1 parent 26c5ad2
commit a6c7170
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 31 deletions.
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
@@ -58,6 +58,7 @@ env.SConscript(
         's/client',
         's/commands',
         'scripting',
+        'shell',
         'tools',
         'unittest',
         'util',
@@ -634,37 +635,6 @@ if env.TargetOSIs('osx') or env["_HAVEPCAP"]:
 
 # --- shell ---
 
-# if you add a file here, you need to add it in scripting/engine.cpp and shell/createCPPfromJavaScriptFiles.js as well
-env.JSHeader(
-            target="shell/mongo.cpp",
-            source=[
-                "shell/assert.js",
-                "shell/bulk_api.js",
-                "shell/collection.js",
-                "shell/db.js",
-                "shell/explain_query.js",
-                "shell/explainable.js",
-                "shell/mongo.js",
-                "shell/mr.js",
-                "shell/query.js",
-                "shell/types.js",
-                "shell/upgrade_check.js",
-                "shell/utils.js",
-                "shell/utils_sh.js",
-                "shell/utils_auth.js",
-            ])
-
-# if you add a file here, you need to add it in shell/shell_utils.cpp and shell/createCPPfromJavaScriptFiles.js as well
-env.JSHeader(
-            target="shell/mongo-server.cpp",
-            source=[
-                "shell/servers.js",
-                "shell/shardingtest.js",
-                "shell/servers_misc.js",
-                "shell/replsettest.js",
-                "shell/replsetbridge.js"
-             ])
-
 if not has_option('noshell') and usev8:
     shell_core_env = env.Clone()
     if has_option("safeshell"):

diff --git a/src/mongo/shell/SConscript b/src/mongo/shell/SConscript
@@ -0,0 +1,36 @@
+# -*- mode: python; -*-
+
+Import("env")
+
+# if you add a file here, you need to add it in scripting/engine.cpp and shell/createCPPfromJavaScriptFiles.js as well
+env.JSHeader(
+    target="mongo.cpp",
+    source=[
+        "assert.js",
+        "bulk_api.js",
+        "collection.js",
+        "db.js",
+        "explain_query.js",
+        "explainable.js",
+        "mongo.js",
+        "mr.js",
+        "query.js",
+        "types.js",
+        "upgrade_check.js",
+        "utils.js",
+        "utils_sh.js",
+        "utils_auth.js",
+    ],
+)
+
+# if you add a file here, you need to add it in shell/shell_utils.cpp and shell/createCPPfromJavaScriptFiles.js as well
+env.JSHeader(
+    target="mongo-server.cpp",
+    source=[
+        "servers.js",
+        "shardingtest.js",
+        "servers_misc.js",
+        "replsettest.js",
+        "replsetbridge.js"
+    ],
+)