Skip to content

Commit

Permalink
workspace: Remove all dependencies on protobuf (RobotLocomotion#12689)
Browse files Browse the repository at this point in the history
In common/proto, remove deprecated MakeFileInputStreamOrThrow.

In vector_gen, remove support for the protobuf input format.

In install, remove CMake find module for Protobuf.

In workspace, remove libprotobuf.

In setup, remove Ubuntu deps on libprotobuf-dev and python3-protobuf.

While we're anyway modifying the setup scripts, also remove macOS's binary
setup cleanup step of un-installing dreal.
  • Loading branch information
jwnimmer-tri authored Feb 6, 2020
1 parent 554f310 commit 5cc7d27
Show file tree
Hide file tree
Showing 22 changed files with 20 additions and 527 deletions.
28 changes: 0 additions & 28 deletions common/proto/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,10 @@ drake_cc_package_library(
name = "proto",
deps = [
":call_python",
":protobuf",
":rpc_pipe_temp_directory",
],
)

drake_cc_library(
name = "protobuf",
srcs = ["protobuf.cc"],
hdrs = ["protobuf.h"],
deprecation = "To be removed from Drake on or after 2020-02-01, with no replacement.", # noqa
tags = [
# Avoid 'build //...' yelling at us.
"manual",
],
deps = [
"//common:essential",
"@libprotobuf",
],
)

drake_cc_library(
name = "call_python",
srcs = ["call_python.cc"],
Expand Down Expand Up @@ -108,18 +92,6 @@ drake_py_unittest(
tags = ["no_valgrind_tools"],
)

drake_cc_googletest(
name = "protobuf_test",
copts = ["-Wno-deprecated-declarations"],
data = [
"test/test_string.txt",
],
deps = [
":protobuf",
"//common",
],
)

drake_cc_googletest(
name = "rpc_pipe_temp_directory_test",
deps = [
Expand Down
20 changes: 0 additions & 20 deletions common/proto/protobuf.cc

This file was deleted.

18 changes: 0 additions & 18 deletions common/proto/protobuf.h

This file was deleted.

32 changes: 0 additions & 32 deletions common/proto/test/protobuf_test.cc

This file was deleted.

1 change: 0 additions & 1 deletion common/proto/test/test_string.txt

This file was deleted.

1 change: 0 additions & 1 deletion setup/mac/binary_distribution/Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ brew 'lz4'
brew 'nlopt'
brew 'numpy'
brew 'openblas'
brew 'protobuf'
brew 'pkg-config'
brew 'python'
brew 'scipy'
Expand Down
3 changes: 0 additions & 3 deletions setup/mac/binary_distribution/install_prereqs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ if ! command -v /usr/local/bin/brew &>/dev/null; then
fi

/usr/local/bin/brew update
# TODO(jamiesnape): Remove two lines uninstalling dreal on or after 2020-02-01.
brew uninstall --force dreal
brew untap dreal/dreal &>/dev/null || true
/usr/local/bin/brew bundle --file="${BASH_SOURCE%/*}/Brewfile" --no-lock

if ! command -v /usr/local/bin/pip3 &>/dev/null; then
Expand Down
1 change: 0 additions & 1 deletion setup/ubuntu/binary_distribution/packages-bionic.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ libnetcdf13
libnlopt0
libogg0
libpng16-16
libprotobuf-dev
libqt5multimedia5
libqt5x11extras5
libtbb2
Expand Down
1 change: 0 additions & 1 deletion setup/ubuntu/source_distribution/packages-bionic.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ python3-lxml-dbg
python3-matplotlib-dbg
python3-numpy-dbg
python3-pandas
python3-protobuf
python3-pydot
python3-scipy-dbg
python3-sphinx
Expand Down
1 change: 0 additions & 1 deletion tools/install/libdrake/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ cc_library(
"//common:drake_marker_shared_library",
"@ignition_math",
"@lcm",
"@libprotobuf",
"@spdlog",
"@tinyxml2",
"@yaml_cpp",
Expand Down
5 changes: 0 additions & 5 deletions tools/install/libdrake/drake.cps
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@
"Hints": ["@prefix@/lib/cmake/optitrack"],
"X-CMake-Find-Args": ["CONFIG"]
},
"Protobuf": {
"Version": "3.0",
"X-CMake-Find-Args": ["MODULE"]
},
"robotlocomotion-lcmtypes": {
"Hints": ["@prefix@/lib/cmake/robotlocomotion-lcmtypes"],
"X-CMake-Find-Args": ["CONFIG"]
Expand Down Expand Up @@ -69,7 +65,6 @@
"ignition-math6:ignition-math6",
"lcm:lcm",
"optitrack:optitrack-lcmtypes-cpp",
"protobuf:libprotobuf",
"robotlocomotion-lcmtypes:robotlocomotion-lcmtypes-cpp",
"spdlog:spdlog",
"tinyxml2:tinyxml2",
Expand Down
10 changes: 0 additions & 10 deletions tools/vector_gen/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,10 @@ load(
)
load("//tools/lint:lint.bzl", "add_lint_tests")

# N.B. This library is DRAKE_DEPRECATED 2020-02-01 -- we've committed the
# generated sources into git so that we can remove our protoc dependency.
drake_py_library(
name = "named_vector",
srcs = ["named_vector_pb2.py"],
tags = ["nolint"],
visibility = ["//visibility:private"],
)

drake_py_binary(
name = "lcm_vector_gen",
srcs = ["lcm_vector_gen.py"],
deps = [
":named_vector",
"//tools/lint:clang_format",
"//tools/lint:find_data",
],
Expand Down
53 changes: 0 additions & 53 deletions tools/vector_gen/attic/BUILD.bazel

This file was deleted.

5 changes: 0 additions & 5 deletions tools/vector_gen/attic/README.md

This file was deleted.

35 changes: 0 additions & 35 deletions tools/vector_gen/attic/test/lcm_vector_gen_test.sh

This file was deleted.

27 changes: 0 additions & 27 deletions tools/vector_gen/attic/test/sample.named_vector

This file was deleted.

Loading

0 comments on commit 5cc7d27

Please sign in to comment.