mirror
/
mongo
mirror of https://github.com/mongodb/mongo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SERVER-40242 Update banner inclusions for vendored tools

This commit is contained in:
Spencer Jackson 2019-03-22 13:22:44 -04:00
parent 92d941353e
commit e5d7bb7eaf
No known key found for this signature in database
GPG Key ID: 8C7FA5856CA7F642
16 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildscripts/packager.py
View File

@ -492,7 +492,7 @@ def unpack_binaries_into(build_os, arch, spec, where):
try: try:
sysassert(["tar", "xvzf", rootdir + "/" + tarfile(build_os, arch, spec)]) sysassert(["tar", "xvzf", rootdir + "/" + tarfile(build_os, arch, spec)])
release_dir = glob('mongodb-linux-*')[0] release_dir = glob('mongodb-linux-*')[0]
for releasefile in "bin", "LICENSE-Community.txt", "README", "THIRD-PARTY-NOTICES", "MPL-2": for releasefile in "bin", "LICENSE-Community.txt", "README", "THIRD-PARTY-NOTICES", "THIRD-PARTY-NOTICES.gotools", "MPL-2":
print "moving file: %s/%s" % (release_dir, releasefile) print "moving file: %s/%s" % (release_dir, releasefile)
os.rename("%s/%s" % (release_dir, releasefile), releasefile) os.rename("%s/%s" % (release_dir, releasefile), releasefile)
os.rmdir(release_dir) os.rmdir(release_dir)

2
buildscripts/packager_enterprise.py
View File

@ -218,7 +218,7 @@ def unpack_binaries_into(build_os, arch, spec, where):
try: try:
packager.sysassert(["tar", "xvzf", rootdir + "/" + tarfile(build_os, arch, spec)]) packager.sysassert(["tar", "xvzf", rootdir + "/" + tarfile(build_os, arch, spec)])
release_dir = glob('mongodb-linux-*')[0] release_dir = glob('mongodb-linux-*')[0]
for releasefile in "bin", "snmp", "LICENSE-Enterprise.txt", "README", "THIRD-PARTY-NOTICES", "MPL-2": for releasefile in "bin", "snmp", "LICENSE-Enterprise.txt", "README", "THIRD-PARTY-NOTICES", "THIRD-PARTY-NOTICES.gotools", "MPL-2":
os.rename("%s/%s" % (release_dir, releasefile), releasefile) os.rename("%s/%s" % (release_dir, releasefile), releasefile)
os.rmdir(release_dir) os.rmdir(release_dir)
except Exception: except Exception:

1
debian/mongodb-enterprise-server.docs vendored
View File

@ -6,4 +6,5 @@ snmp/MONGODBINC-MIB.txt
LICENSE-Enterprise.txt LICENSE-Enterprise.txt
README README
THIRD-PARTY-NOTICES THIRD-PARTY-NOTICES
THIRD-PARTY-NOTICES.gotools
MPL-2 MPL-2

1
debian/mongodb-enterprise-unstable-server.docs vendored
View File

@ -6,4 +6,5 @@ snmp/MONGODBINC-MIB.txt
LICENSE-Enterprise.txt LICENSE-Enterprise.txt
README README
THIRD-PARTY-NOTICES THIRD-PARTY-NOTICES
THIRD-PARTY-NOTICES.gotools
MPL-2 MPL-2

1
debian/mongodb-org-server.docs vendored
View File

@ -1,4 +1,5 @@
LICENSE-Community.txt LICENSE-Community.txt
README README
THIRD-PARTY-NOTICES THIRD-PARTY-NOTICES
THIRD-PARTY-NOTICES.gotools
MPL-2 MPL-2

1
debian/mongodb-org-unstable-server.docs vendored
View File

@ -1,4 +1,5 @@
LICENSE-Community.txt LICENSE-Community.txt
README README
THIRD-PARTY-NOTICES THIRD-PARTY-NOTICES
THIRD-PARTY-NOTICES.gotools
MPL-2 MPL-2

3
etc/evergreen.yml
View File

@ -1026,6 +1026,9 @@ functions:
"../../../../../../mongo-tools/$i${exe|}" --version "../../../../../../mongo-tools/$i${exe|}" --version
done done
mkdir -p ../../../../../../mongo-tools/distsrc
cp THIRD-PARTY-NOTICES ../../../../../../mongo-tools/distsrc/THIRD-PARTY-NOTICES.gotools
"get modified patch files": "get modified patch files":
command: shell.exec command: shell.exec
params: params:

1
rpm/mongodb-enterprise-init.spec
View File

@ -257,6 +257,7 @@ fi
%files tools %files tools
%defattr(-,root,root,-) %defattr(-,root,root,-)
#%doc README #%doc README
%doc THIRD-PARTY-NOTICES.gotools
%{_bindir}/bsondump %{_bindir}/bsondump
%{_bindir}/install_compass %{_bindir}/install_compass

1
rpm/mongodb-enterprise-unstable-init.spec
View File

@ -246,6 +246,7 @@ fi
%files tools %files tools
%defattr(-,root,root,-) %defattr(-,root,root,-)
#%doc README #%doc README
%doc THIRD-PARTY-NOTICES.gotools
%{_bindir}/bsondump %{_bindir}/bsondump
%{_bindir}/install_compass %{_bindir}/install_compass

1
rpm/mongodb-enterprise-unstable.spec
View File

@ -248,6 +248,7 @@ fi
%files tools %files tools
%defattr(-,root,root,-) %defattr(-,root,root,-)
#%doc README #%doc README
%doc THIRD-PARTY-NOTICES.gotools
%{_bindir}/bsondump %{_bindir}/bsondump
%{_bindir}/install_compass %{_bindir}/install_compass

1
rpm/mongodb-enterprise.spec
View File

@ -257,6 +257,7 @@ fi
%files tools %files tools
%defattr(-,root,root,-) %defattr(-,root,root,-)
#%doc README #%doc README
%doc THIRD-PARTY-NOTICES.gotools
%{_bindir}/bsondump %{_bindir}/bsondump
%{_bindir}/install_compass %{_bindir}/install_compass

1
rpm/mongodb-org-init.spec
View File

@ -251,6 +251,7 @@ fi
%files tools %files tools
%defattr(-,root,root,-) %defattr(-,root,root,-)
#%doc README #%doc README
%doc THIRD-PARTY-NOTICES.gotools
%{_bindir}/bsondump %{_bindir}/bsondump
%{_bindir}/install_compass %{_bindir}/install_compass

1
rpm/mongodb-org-unstable-init.spec
View File

@ -239,6 +239,7 @@ fi
%files tools %files tools
%defattr(-,root,root,-) %defattr(-,root,root,-)
#%doc README #%doc README
%doc THIRD-PARTY-NOTICES.gotools
%{_bindir}/bsondump %{_bindir}/bsondump
%{_bindir}/install_compass %{_bindir}/install_compass

1
rpm/mongodb-org-unstable.spec
View File

@ -239,6 +239,7 @@ fi
%files tools %files tools
%defattr(-,root,root,-) %defattr(-,root,root,-)
#%doc README #%doc README
%doc THIRD-PARTY-NOTICES.gotools
%{_bindir}/bsondump %{_bindir}/bsondump
%{_bindir}/install_compass %{_bindir}/install_compass

1
rpm/mongodb-org.spec
View File

@ -251,6 +251,7 @@ fi
%files tools %files tools
%defattr(-,root,root,-) %defattr(-,root,root,-)
#%doc README #%doc README
%doc THIRD-PARTY-NOTICES.gotools
%{_bindir}/bsondump %{_bindir}/bsondump
%{_bindir}/install_compass %{_bindir}/install_compass

4
src/mongo/SConscript
View File

@ -717,7 +717,11 @@ def installExternalBinary( e, name_str ):
# "--use-new-tools" adds dependencies for rewritten (Go) tools # "--use-new-tools" adds dependencies for rewritten (Go) tools
# It is required for "dist" but optional for "install" # It is required for "dist" but optional for "install"
if has_option("use-new-tools"): if has_option("use-new-tools"):
env.Append(MODULE_BANNERS=[env.File('#/src/mongo-tools/distsrc/THIRD-PARTY-NOTICES.gotools')])
toolsRoot = "src/mongo-tools" toolsRoot = "src/mongo-tools"
for t in rewrittenTools: for t in rewrittenTools:
installExternalBinary(env, "%s/%s" % (toolsRoot, t)) installExternalBinary(env, "%s/%s" % (toolsRoot, t))
if has_option("build-mongoreplay") and get_option("build-mongoreplay") == "true": if has_option("build-mongoreplay") and get_option("build-mongoreplay") == "true":