SERVER-40242 Update banner inclusions for vendored tools

16 files changed, 21 insertions, 2 deletions

diff --git a/buildscripts/packager.py b/buildscripts/packager.py
index f5c265580b0..5a753f6e1c1 100755
--- a/buildscripts/packager.py
+++ b/buildscripts/packager.py
@@ -492,7 +492,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", "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)
             os.rename("%s/%s" % (release_dir, releasefile), releasefile)
         os.rmdir(release_dir)
diff --git a/buildscripts/packager_enterprise.py b/buildscripts/packager_enterprise.py
index 7681d369671..ea7b65052f6 100755
--- a/buildscripts/packager_enterprise.py
+++ b/buildscripts/packager_enterprise.py
@@ -218,7 +218,7 @@ def unpack_binaries_into(build_os, arch, spec, where):
     try:
         packager.sysassert(["tar", "xvzf", rootdir + "/" + tarfile(build_os, arch, spec)])
         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.rmdir(release_dir)
     except Exception:
diff --git a/debian/mongodb-enterprise-server.docs b/debian/mongodb-enterprise-server.docs
index 923fcdeafce..3671b46a1ef 100644
--- a/debian/mongodb-enterprise-server.docs
+++ b/debian/mongodb-enterprise-server.docs
@@ -6,4 +6,5 @@ snmp/MONGODBINC-MIB.txt
 LICENSE-Enterprise.txt
 README
 THIRD-PARTY-NOTICES
+THIRD-PARTY-NOTICES.gotools
 MPL-2
diff --git a/debian/mongodb-enterprise-unstable-server.docs b/debian/mongodb-enterprise-unstable-server.docs
index 923fcdeafce..3671b46a1ef 100644
--- a/debian/mongodb-enterprise-unstable-server.docs
+++ b/debian/mongodb-enterprise-unstable-server.docs
@@ -6,4 +6,5 @@ snmp/MONGODBINC-MIB.txt
 LICENSE-Enterprise.txt
 README
 THIRD-PARTY-NOTICES
+THIRD-PARTY-NOTICES.gotools
 MPL-2
diff --git a/debian/mongodb-org-server.docs b/debian/mongodb-org-server.docs
index a280026b6f9..7692ac510de 100644
--- a/debian/mongodb-org-server.docs
+++ b/debian/mongodb-org-server.docs
@@ -1,4 +1,5 @@
 LICENSE-Community.txt
 README
 THIRD-PARTY-NOTICES
+THIRD-PARTY-NOTICES.gotools
 MPL-2
diff --git a/debian/mongodb-org-unstable-server.docs b/debian/mongodb-org-unstable-server.docs
index a280026b6f9..7692ac510de 100644
--- a/debian/mongodb-org-unstable-server.docs
+++ b/debian/mongodb-org-unstable-server.docs
@@ -1,4 +1,5 @@
 LICENSE-Community.txt
 README
 THIRD-PARTY-NOTICES
+THIRD-PARTY-NOTICES.gotools
 MPL-2
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index e5e27a5b529..350e66be105 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -1026,6 +1026,9 @@ functions:
             "../../../../../../mongo-tools/$i${exe|}" --version
         done
 
+        mkdir -p ../../../../../../mongo-tools/distsrc
+        cp THIRD-PARTY-NOTICES ../../../../../../mongo-tools/distsrc/THIRD-PARTY-NOTICES.gotools
+
   "get modified patch files":
     command: shell.exec
     params:
diff --git a/rpm/mongodb-enterprise-init.spec b/rpm/mongodb-enterprise-init.spec
index aded1721269..a2090892a26 100644
--- a/rpm/mongodb-enterprise-init.spec
+++ b/rpm/mongodb-enterprise-init.spec
@@ -257,6 +257,7 @@ fi
 %files tools
 %defattr(-,root,root,-)
 #%doc README
+%doc THIRD-PARTY-NOTICES.gotools
 
 %{_bindir}/bsondump
 %{_bindir}/install_compass
diff --git a/rpm/mongodb-enterprise-unstable-init.spec b/rpm/mongodb-enterprise-unstable-init.spec
index 7a5ce6ffe59..d0681c9b15d 100644
--- a/rpm/mongodb-enterprise-unstable-init.spec
+++ b/rpm/mongodb-enterprise-unstable-init.spec
@@ -246,6 +246,7 @@ fi
 %files tools
 %defattr(-,root,root,-)
 #%doc README
+%doc THIRD-PARTY-NOTICES.gotools
 
 %{_bindir}/bsondump
 %{_bindir}/install_compass
diff --git a/rpm/mongodb-enterprise-unstable.spec b/rpm/mongodb-enterprise-unstable.spec
index d847a718029..68086ed8b6c 100644
--- a/rpm/mongodb-enterprise-unstable.spec
+++ b/rpm/mongodb-enterprise-unstable.spec
@@ -248,6 +248,7 @@ fi
 %files tools
 %defattr(-,root,root,-)
 #%doc README
+%doc THIRD-PARTY-NOTICES.gotools
 
 %{_bindir}/bsondump
 %{_bindir}/install_compass
diff --git a/rpm/mongodb-enterprise.spec b/rpm/mongodb-enterprise.spec
index 3888ee63dc8..517eb60760f 100644
--- a/rpm/mongodb-enterprise.spec
+++ b/rpm/mongodb-enterprise.spec
@@ -257,6 +257,7 @@ fi
 %files tools
 %defattr(-,root,root,-)
 #%doc README
+%doc THIRD-PARTY-NOTICES.gotools
 
 %{_bindir}/bsondump
 %{_bindir}/install_compass
diff --git a/rpm/mongodb-org-init.spec b/rpm/mongodb-org-init.spec
index d2fb97d63e5..8af5df1f7d4 100644
--- a/rpm/mongodb-org-init.spec
+++ b/rpm/mongodb-org-init.spec
@@ -251,6 +251,7 @@ fi
 %files tools
 %defattr(-,root,root,-)
 #%doc README
+%doc THIRD-PARTY-NOTICES.gotools
 
 %{_bindir}/bsondump
 %{_bindir}/install_compass
diff --git a/rpm/mongodb-org-unstable-init.spec b/rpm/mongodb-org-unstable-init.spec
index 46dfb1c0c74..56e6598e226 100644
--- a/rpm/mongodb-org-unstable-init.spec
+++ b/rpm/mongodb-org-unstable-init.spec
@@ -239,6 +239,7 @@ fi
 %files tools
 %defattr(-,root,root,-)
 #%doc README
+%doc THIRD-PARTY-NOTICES.gotools
 
 %{_bindir}/bsondump
 %{_bindir}/install_compass
diff --git a/rpm/mongodb-org-unstable.spec b/rpm/mongodb-org-unstable.spec
index b157385384a..22c7e3972f3 100644
--- a/rpm/mongodb-org-unstable.spec
+++ b/rpm/mongodb-org-unstable.spec
@@ -239,6 +239,7 @@ fi
 %files tools
 %defattr(-,root,root,-)
 #%doc README
+%doc THIRD-PARTY-NOTICES.gotools
 
 %{_bindir}/bsondump
 %{_bindir}/install_compass
diff --git a/rpm/mongodb-org.spec b/rpm/mongodb-org.spec
index e93a4ea6b87..c8e9cf0a907 100644
--- a/rpm/mongodb-org.spec
+++ b/rpm/mongodb-org.spec
@@ -251,6 +251,7 @@ fi
 %files tools
 %defattr(-,root,root,-)
 #%doc README
+%doc THIRD-PARTY-NOTICES.gotools
 
 %{_bindir}/bsondump
 %{_bindir}/install_compass
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index fbde47669e0..fc881a3ab8e 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -717,7 +717,11 @@ def installExternalBinary( e, name_str ):
 # "--use-new-tools" adds dependencies for rewritten (Go) tools
 # It is required for "dist" but optional for "install"
 if has_option("use-new-tools"):
+
+    env.Append(MODULE_BANNERS=[env.File('#/src/mongo-tools/distsrc/THIRD-PARTY-NOTICES.gotools')])
+
     toolsRoot = "src/mongo-tools"
+
     for t in rewrittenTools:
         installExternalBinary(env, "%s/%s" % (toolsRoot, t))
     if has_option("build-mongoreplay") and get_option("build-mongoreplay") == "true":