Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

add the js engine back to buildInfo; still need to clean this up post…

… 2.4
  • Loading branch information...
commit cb0a61089a26e690e266d97f883adcd885325c92 1 parent 8434261
@scotthernandez scotthernandez authored
View
2  SConscript.buildinfo
@@ -26,6 +26,7 @@ buildinfo_template = '''
namespace mongo {
const char * gitVersion() { return "%(git_version)s"; }
+ const char * compiledJSEngine() { return "%(js_engine)s"; }
const char * allocator() { return "%(allocator)s"; }
const char * loaderFlags() { return "%(loader_flags)s"; }
const char * compilerFlags() { return "%(compiler_flags)s"; }
@@ -39,6 +40,7 @@ def generate_buildinfo(env, target, source, **kw):
git_version += " modules: " + ", ".join(env["MONGO_MODULES"])
contents = str(source[0]) % dict(git_version=git_version,
+ js_engine="V8" if GetOption('usev8') else "SpiderMonkey",
sys_info=getSysInfo(),
allocator=GetOption('allocator'),
loader_flags=env.subst('$LINKFLAGS $LDFLAGS',
View
3  src/mongo/util/version.cpp
@@ -99,6 +99,7 @@ namespace mongo {
#ifndef _SCONS
// only works in scons
const char * gitVersion() { return "not-scons"; }
+ const char * compiledJSEngine() { return ""; }
const char * allocator() { return ""; }
const char * loaderFlags() { return ""; }
const char * compilerFlags() { return ""; }
@@ -141,6 +142,8 @@ namespace mongo {
<< "compilerFlags" << compilerFlags()
<< "allocator" << allocator()
<< "versionArray" << versionArray
+ << "javascriptEngine" << compiledJSEngine()
+/*TODO: add this back once the module system is in place -- maybe once we do something like serverstatus with callbacks*/
// << "interpreterVersion" << globalScriptEngine->getInterpreterVersionString()
<< "bits" << ( sizeof( int* ) == 4 ? 32 : 64 );
result.appendBool( "debug" , debug );
View
1  src/mongo/util/version.h
@@ -34,6 +34,7 @@ namespace mongo {
void appendBuildInfo(BSONObjBuilder& result);
const char * gitVersion();
+ const char * compiledJSEngine();
const char * allocator();
const char * loaderFlags();
const char * compilerFlags();
Please sign in to comment.
Something went wrong with that request. Please try again.