Skip to content

Commit

Permalink
SERVER-44763 Remove gotools from build and packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Morrow authored and evergreen committed Jan 15, 2020
1 parent c9dbf65 commit 3c0c136
Show file tree
Hide file tree
Showing 41 changed files with 25 additions and 11,088 deletions.
9 changes: 0 additions & 9 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@ COMPONENTS

UTILITIES

mongodump - Create a binary dump of the contents of a database.
mongorestore - Restore data from the output created by mongodump.
mongoexport - Export the contents of a collection to JSON or CSV.
mongoimport - Import data from JSON, CSV or TSV.
mongofiles - Put, get and delete files from GridFS.
mongostat - Show the status of a running mongod/mongos.
bsondump - Convert BSON files into human-readable formats.
mongoreplay - Traffic capture and replay tool.
mongotop - Track time spent reading and writing data.
install_compass - Installs MongoDB Compass for your platform.

BUILDING
Expand Down
36 changes: 0 additions & 36 deletions README.third_party.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,42 +101,6 @@ released binary artifacts.
| testscenarios |
| testtools |

## Libraries Imported by Tools

The following Go libraries are vendored into the MongoDB tools. Their
license notices are included in the `THIRD-PARTY-NOTICES.gotools` file.

| Name |
| :------------------------------------------------------------------ |
| Go (language runtime and JSON/CSV codecs) |
| [assertions](https://github.com/smartystreets/assertions) |
| [crypto](https://golang.org/x/crypto) |
| [escaper](https://github.com/10gen/escaper) |
| [gls](https://github.com/jtolds/gls) |
| [go-cache](https://github.com/patrickmn/go-cache) |
| [go-flags](https://github.com/jessevdk/go-flags) |
| [go-runewidth](https://github.com/mattn/go-runewidth) |
| [goconvey](https://github.com/smartystreets/goconvey) |
| [gopacket](https://github.com/google/gopacket) |
| [gopass](https://github.com/howeyc/gopass) |
| [gopherjs](https://github.com/gopherjs/gopherjs) |
| [llmgo](https://github.com/10gen/llmgo) |
| [mgo](https://github.com/10gen/mgo) |
| [mongo-go-driver](https://github.com/mongodb/mongo-go-driver) |
| [mongo-lint](https://github.com/3rf/mongo-lint) |
| [mongo-tools-common](https://github.com/mongodb/mongo-tools-common) |
| [openssl](https://github.com/10gen/openssl) |
| [oglematchers](https://github.com/jacobsa/oglematchers) |
| [scram](https://github.com/xdg/scram) |
| [snappy](https://github.com/golang/snappy) |
| [spacelog](https://github.com/spacemonkeygo/spacelog) |
| [stack](https://github.com/go-stack/stack) |
| [stringprep](https://github.com/xdg/stringprep) |
| [sync](https://golang.org/x/sync) |
| [termbox-go](https://github.com/nsf/termbox-go) |
| [text](https://golang.org/x/text) |
| [tomb](https://gopkg.in/tomb.v2) |

## Dynamically Linked Libraries

Sometimes MongoDB needs to load libraries provided and managed by the
Expand Down
10 changes: 0 additions & 10 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -377,16 +377,6 @@ add_option('use-system-all',
nargs=0,
)

add_option('use-new-tools',
help='put new tools in the tarball',
nargs=0,
)

add_option('build-mongoreplay',
help='when building with --use-new-tools, build mongoreplay ( requires pcap dev )',
nargs=1,
)

add_option('use-cpu-profiler',
help='Link against the google-perftools profiler library',
nargs=0,
Expand Down
7 changes: 2 additions & 5 deletions buildscripts/packager.py
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,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", "THIRD-PARTY-NOTICES.gotools", "MPL-2":
for releasefile in "bin", "LICENSE-Community.txt", "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)
Expand Down Expand Up @@ -524,10 +524,7 @@ def make_package(distro, build_os, arch, spec, srcdir):
# packaging infrastructure will move the files to wherever they
# need to go.
unpack_binaries_into(build_os, arch, spec, sdir)
# Remove the mongoreplay binary due to libpcap dynamic
# linkage.
if os.path.exists(sdir + "bin/mongoreplay"):
os.unlink(sdir + "bin/mongoreplay")

return distro.make_pkg(build_os, arch, spec, srcdir)


Expand Down
7 changes: 2 additions & 5 deletions buildscripts/packager_enterprise.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,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", "THIRD-PARTY-NOTICES.gotools", "MPL-2":
for releasefile in "bin", "snmp", "LICENSE-Enterprise.txt", "README", "THIRD-PARTY-NOTICES", "MPL-2":
os.rename("%s/%s" % (release_dir, releasefile), releasefile)
os.rmdir(release_dir)
except Exception:
Expand Down Expand Up @@ -253,10 +253,7 @@ def make_package(distro, build_os, arch, spec, srcdir):
# packaging infrastructure will move the files to wherever they
# need to go.
unpack_binaries_into(build_os, arch, spec, sdir)
# Remove the mongoreplay binary due to libpcap dynamic
# linkage.
if os.path.exists(sdir + "bin/mongoreplay"):
os.unlink(sdir + "bin/mongoreplay")

return distro.make_pkg(build_os, arch, spec, srcdir)


Expand Down
200 changes: 0 additions & 200 deletions debian/bsondump.1

This file was deleted.

5 changes: 0 additions & 5 deletions debian/lintian-overrides
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,4 @@
mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongo /usr/lib64/xulrunner-1.9.1
mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongocryptd /usr/lib64/xulrunner-1.9.1
mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongod /usr/lib64/xulrunner-1.9.1
mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongodump /usr/lib64/xulrunner-1.9.1
mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongoexport /usr/lib64/xulrunner-1.9.1
mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongofiles /usr/lib64/xulrunner-1.9.1
mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongoimport /usr/lib64/xulrunner-1.9.1
mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongorestore /usr/lib64/xulrunner-1.9.1
mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongos /usr/lib64/xulrunner-1.9.1
1 change: 0 additions & 1 deletion debian/mongodb-enterprise-server.docs
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ snmp/MONGODBINC-MIB.txt
LICENSE-Enterprise.txt
README
THIRD-PARTY-NOTICES
THIRD-PARTY-NOTICES.gotools
MPL-2
1 change: 0 additions & 1 deletion debian/mongodb-enterprise-unstable-server.docs
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ snmp/MONGODBINC-MIB.txt
LICENSE-Enterprise.txt
README
THIRD-PARTY-NOTICES
THIRD-PARTY-NOTICES.gotools
MPL-2
7 changes: 1 addition & 6 deletions debian/mongodb-enterprise-unstable.rules
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# -*- makefile -*-
TOOLS=bsondump mongodecrypt mongodump mongoexport mongofiles mongoimport mongoldap mongorestore mongostat mongotop mongokerberos
TOOLS=mongodecrypt mongoldap mongokerberos

# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
Expand Down Expand Up @@ -58,11 +58,6 @@ clean:
rm -f mongo
rm -f mongod
rm -f mongocryptd
rm -f mongoimportjson
rm -f mongoexport
rm -f mongorestore
rm -f mongodump
rm -f mongofiles
rm -f install_compass
rm -f .sconsign.dblite
rm -f libmongoclient.a
Expand Down
7 changes: 1 addition & 6 deletions debian/mongodb-enterprise.rules
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# -*- makefile -*-
TOOLS=bsondump mongodecrypt mongodump mongoexport mongofiles mongoimport mongoldap mongorestore mongostat mongotop mongokerberos
TOOLS=mongodecrypt mongoldap mongokerberos

# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
Expand Down Expand Up @@ -56,12 +56,7 @@ clean:
rm -f config.log
rm -f mongo
rm -f mongod
rm -f mongoimportjson
rm -f mongocryptd
rm -f mongoexport
rm -f mongorestore
rm -f mongodump
rm -f mongofiles
rm -f install_compass
rm -f .sconsign.dblite
rm -f libmongoclient.a
Expand Down
1 change: 0 additions & 1 deletion debian/mongodb-org-server.docs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
LICENSE-Community.txt
README
THIRD-PARTY-NOTICES
THIRD-PARTY-NOTICES.gotools
MPL-2
1 change: 0 additions & 1 deletion debian/mongodb-org-unstable-server.docs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
LICENSE-Community.txt
README
THIRD-PARTY-NOTICES
THIRD-PARTY-NOTICES.gotools
MPL-2
Loading

0 comments on commit 3c0c136

Please sign in to comment.