← Back to branch summary

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

« back to all changes in this revision

Viewing changes to SConstruct

  • 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:
SConstruct
172
172
add_option( "ssl" , "Enable SSL" , 0 , True )
173
173
 
174
174
# library choices
175
 
add_option( "usesm" , "use spider monkey for javascript" , 0 , True )
176
 
add_option( "usev8" , "use v8 for javascript" , 0 , True )
 
175
add_option( "disable-scripting" , "do not build support for javascript" , 0 , True )
177
176
 
178
177
# mongo feature options
179
178
add_option( "noshell", "don't build shell" , 0 , True )
275
274
debugLogging = has_option( "debugBuildAndLogging" )
276
275
noshell = has_option( "noshell" ) 
277
276
 
278
 
usesm = has_option( "usesm" )
279
 
usev8 = has_option( "usev8" ) 
 
277
disable_scripting = has_option( "disable-scripting" )
280
278
 
281
279
asio = has_option( "asio" )
282
280
 
425
423
else:
426
424
    boostVersion = "-" + boostVersion
427
425
 
428
 
if ( not ( usesm or usev8 or justClientLib) ):
 
426
if disable_scripting or justClientLib:
 
427
    usev8 = False
 
428
else:
429
429
    usev8 = True
430
430
    options_topass["usev8"] = True
431
431
 
768
768
        print( "removing precompiled headers" )
769
769
        os.unlink( env.File("$BUILD_DIR/mongo/pch.h.$GCHSUFFIX").abspath ) # gcc uses the file if it exists
770
770
 
771
 
if usesm:
772
 
    env.Append( CPPDEFINES=["JS_C_STRINGS_ARE_UTF8"] )
773
 
 
774
771
if "uname" in dir(os):
775
772
    hacks = buildscripts.findHacks( os.uname() )
776
773
    if hacks is not None:
1138
1135
Export("testEnv")
1139
1136
Export("has_option use_system_version_of_library")
1140
1137
Export("installSetup")
1141
 
Export("usesm usev8")
 
1138
Export("usev8")
1142
1139
Export("darwin windows solaris linux freebsd nix")
1143
1140
Export('module_sconscripts')
1144
1141
Export("debugBuild")