summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTad Marshall <tad@10gen.com>2012-04-12 10:00:22 -0400
committerTad Marshall <tad@10gen.com>2012-04-12 10:00:22 -0400
commite819261720e48699679c511c69f2f82c2c6a94ab (patch)
tree128d3b2e825397d46f8ab0470b358ae98fa9645a /src
parent869e8b4ace0d6f7e0379ca412f73a118b1ab3312 (diff)
downloadmongo-e819261720e48699679c511c69f2f82c2c6a94ab.tar.gz
Clean up SConscript for JavaScript-to-CPP operations
Remove incorrect and unnecessary dependency, make filenames of shell/utils.js and shell/utils_sh.js explicit to aid grepping and renaming, add comment about file additions that go into shell/mongo-servers.cpp.
Diffstat (limited to 'src')
-rw-r--r--src/mongo/SConscript12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index d05bb3ed2b7..910567426b5 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -392,13 +392,13 @@ if darwin or env["_HAVEPCAP"]:
# --- shell ---
-# note, if you add a file here, you need to add it in scripting/engine.cpp and shell/createCPPfromJavaScriptFiles.js as well
-env.Depends( "shell/dbshell.cpp",
- env.JSHeader( "shell/mongo.cpp" ,
- Glob( "shell/utils*.js" ) +
- [ "shell/db.js","shell/mongo.js","shell/mr.js","shell/query.js","shell/collection.js"] ) )
+# if you add a file here, you need to add it in scripting/engine.cpp and shell/createCPPfromJavaScriptFiles.js as well
+env.JSHeader( "shell/mongo.cpp" ,
+ [ "shell/utils.js","shell/utils_sh.js","shell/db.js","shell/mongo.js","shell/mr.js","shell/query.js","shell/collection.js"] )
-env.JSHeader( "shell/mongo-server.cpp" , ["shell/servers.js", "shell/shardingtest.js", "shell/servers_misc.js", "shell/replsettest.js", "shell/replsetbridge.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( "shell/mongo-server.cpp" ,
+ ["shell/servers.js", "shell/shardingtest.js", "shell/servers_misc.js", "shell/replsettest.js", "shell/replsetbridge.js"] )
coreShellFiles = [ "shell/dbshell.cpp",
"shell/shell_utils.cpp",