← Back to branch summary

~ubuntu-branches/ubuntu/wily/juju-mongodb/wily-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-22 14:52:36 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20140122145236-exgvx1pxk4fu9o4c
Tags: 2.4.9-0ubuntu1
https://launchpad.net/bugs/1270098
* New upstream point release.
* d/p/0003-SERVER-12064-Use-gcc-atomic-builtins-if-available.patch:
  Dropped - not really needed for this version on mongodb.
* d/install: Don't ship mongo binary, its broken without a JS engine
  (LP: #1270098).
* d/p/0005-disable-jstests.patch: Dropped in preference to updates to
  d/p/0001-Add-option-to-disable-javascript.patch - rebased on revised
  upstream pull request.
* d/rules: Don't strip binaries during build so we get a ddeb.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mongo/SConscript
6
6
import itertools
7
7
from buildscripts import utils
8
8
 
 
9
Import("disable_scripting")
9
10
Import("env")
10
11
Import("shellEnv")
11
12
Import("testEnv")
672
673
test = testEnv.Install(
673
674
    '#/',
674
675
    testEnv.Program("test",
675
 
                    [ f for f in Glob("dbtests/*.cpp") if not str(f).endswith('framework.cpp') ],
 
676
                    [ f for f in Glob("dbtests/*.cpp")
 
677
                      if not str(f).endswith('framework.cpp') and
 
678
                         not (str(f).endswith('jstests.cpp') and disable_scripting)],
676
679
                    LIBDEPS = [
677
680
                       "mongocommon",
678
681
                       "serveronly",