diff options
| author | Jason Carey <jcarey@argv.me> | 2015-07-09 14:05:20 -0400 |
|---|---|---|
| committer | Jason Carey <jcarey@argv.me> | 2015-07-14 16:15:54 -0400 |
| commit | e749ffad9b4fe3110d97f366ebe39e7c9a4edd9d (patch) | |
| tree | 927e727645da9bfc80095bb124860e31e58e9d77 /buildscripts | |
| parent | 1af5f44f9ba2b7cff8e0457798b7a25b64e9fe69 (diff) | |
| download | mongo-e749ffad9b4fe3110d97f366ebe39e7c9a4edd9d.tar.gz | |
SERVER-18531 Integrate SpiderMonkey
Provides SpiderMonkey 38.0.1esr as a JS engine for mongo and mongod.
Diffstat (limited to 'buildscripts')
| -rwxr-xr-x | buildscripts/packager-enterprise.py | 2 | ||||
| -rwxr-xr-x | buildscripts/packager.py | 2 | ||||
| -rw-r--r-- | buildscripts/utils.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/buildscripts/packager-enterprise.py b/buildscripts/packager-enterprise.py index bbc9c28995e..26e10b553e5 100755 --- a/buildscripts/packager-enterprise.py +++ b/buildscripts/packager-enterprise.py @@ -335,7 +335,7 @@ def unpack_binaries_into(build_os, arch, spec, where): try: sysassert(["tar", "xvzf", rootdir+"/"+tarfile(build_os, arch, spec)]) release_dir = glob('mongodb-linux-*')[0] - for releasefile in "bin", "snmp", "LICENSE.txt", "README", "THIRD-PARTY-NOTICES": + for releasefile in "bin", "snmp", "LICENSE.txt", "README", "THIRD-PARTY-NOTICES", "MPL-2": os.rename("%s/%s" % (release_dir, releasefile), releasefile) os.rmdir(release_dir) except Exception: diff --git a/buildscripts/packager.py b/buildscripts/packager.py index 54b2c53ee22..6896eabb542 100755 --- a/buildscripts/packager.py +++ b/buildscripts/packager.py @@ -385,7 +385,7 @@ def unpack_binaries_into(build_os, arch, spec, where): try: sysassert(["tar", "xvzf", rootdir+"/"+tarfile(build_os, arch, spec)]) release_dir = glob('mongodb-linux-*')[0] - for releasefile in "bin", "GNU-AGPL-3.0", "README", "THIRD-PARTY-NOTICES": + for releasefile in "bin", "GNU-AGPL-3.0", "README", "THIRD-PARTY-NOTICES", "MPL-2": print "moving file: %s/%s" % (release_dir, releasefile) os.rename("%s/%s" % (release_dir, releasefile), releasefile) os.rmdir(release_dir) diff --git a/buildscripts/utils.py b/buildscripts/utils.py index 62a2b1d13eb..a05a4f6f9f9 100644 --- a/buildscripts/utils.py +++ b/buildscripts/utils.py @@ -24,10 +24,10 @@ def getAllSourceFiles( arr=None , prefix="." ): for x in os.listdir( prefix ): if x.startswith( "." ) or x.startswith( "pcre-" ) or x.startswith( "32bit" ) or x.startswith( "mongodb-" ) or x.startswith("debian") or x.startswith( "mongo-cxx-driver" ): continue - # XXX: Avoid conflict between v8 and v8-3.25 source files in + # XXX: Avoid conflict between v8, v8-3.25 and mozjs source files in # src/mongo/scripting # Remove after v8-3.25 migration. - if x.find("v8-3.25") != -1: + if x.find("v8-3.25") != -1 or x.find("mozjs") != -1: continue full = prefix + "/" + x if os.path.isdir( full ) and not os.path.islink( full ): |