← Back to branch summary

~ubuntu-branches/ubuntu/trusty/juju-mongodb/trusty-proposed

« back to all changes in this revision

Viewing changes to src/mongo/SConscript

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-01-07 14:48:30 UTC
  • Revision ID: package-import@ubuntu.com-20140107144830-lf56ymgnxftryn78
Tags: 2.4.8-0ubuntu4
* Disable javascript scripting support:
  - d/rules: Pass --disable-scripting, drop config options for v8 and sm,
    only run C++ based tests during smoke testing.
  - d/p/0001-Add-option-to-disable-javascript.patch: Cherry picked changes 
    from Michael Hudson to add support for disabling javascript support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mongo/SConscript
10
10
Import("shellEnv")
11
11
Import("testEnv")
12
12
Import("has_option")
13
 
Import("usesm usev8")
 
13
Import("usev8")
14
14
Import("installSetup")
15
15
Import("enforce_glibc")
16
16
Import("darwin windows solaris linux nix")
310
310
env.CppUnitTest('bson_template_evaluator_test', ['scripting/bson_template_evaluator_test.cpp'],
311
311
                LIBDEPS=['bson_template_evaluator'])
312
312
 
313
 
if usesm:
314
 
    env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_spidermonkey.cpp',
315
 
                                                             'scripting/sm_db.cpp'],
316
 
                      LIBDEPS=['$BUILD_DIR/third_party/js-1.7/js', 'bson_template_evaluator'])
317
 
elif usev8:
 
313
if usev8:
318
314
    env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_v8.cpp',
319
315
                                                             'scripting/v8_db.cpp',
320
316
                                                             'scripting/v8_utils.cpp',