New proto compiler (#644)

Also change Dockerfiles to build proto3 from HEAD.

PAIR=@cschuet

CMakeLists.txt

@@ -30,7 +30,7 @@ find_package(Boost REQUIRED COMPONENTS iostreams)
 find_package(Ceres REQUIRED COMPONENTS SparseLinearAlgebraLibrary)
 find_package(Eigen3 REQUIRED)
 find_package(LuaGoogle REQUIRED)
-find_package(Protobuf REQUIRED)
+find_package(Protobuf REQUIRED 3.0.0)
 
 include(FindPkgConfig)
 PKG_SEARCH_MODULE(CAIRO REQUIRED cairo>=1.12.16)

Dockerfile.jessie

@@ -21,5 +21,7 @@ COPY scripts/install_debs.sh cartographer/scripts/
 RUN cartographer/scripts/install_debs.sh && rm -rf /var/lib/apt/lists/*
 COPY scripts/install_ceres.sh cartographer/scripts/
 RUN cartographer/scripts/install_ceres.sh && rm -rf ceres-solver
+COPY scripts/install_proto3.sh cartographer/scripts/
+RUN cartographer/scripts/install_proto3.sh && rm -rf protobuf
 COPY . cartographer
 RUN cartographer/scripts/install_cartographer.sh && rm -rf cartographer

Dockerfile.stretch

@@ -21,5 +21,7 @@ COPY scripts/install_debs.sh cartographer/scripts/
 RUN cartographer/scripts/install_debs.sh && rm -rf /var/lib/apt/lists/*
 COPY scripts/install_ceres.sh cartographer/scripts/
 RUN cartographer/scripts/install_ceres.sh && rm -rf ceres-solver
+COPY scripts/install_proto3.sh cartographer/scripts/
+RUN cartographer/scripts/install_proto3.sh && rm -rf protobuf
 COPY . cartographer
 RUN cartographer/scripts/install_cartographer.sh && rm -rf cartographer

Dockerfile.trusty

@@ -17,5 +17,7 @@ COPY scripts/install_debs.sh cartographer/scripts/
 RUN cartographer/scripts/install_debs.sh && rm -rf /var/lib/apt/lists/*
 COPY scripts/install_ceres.sh cartographer/scripts/
 RUN cartographer/scripts/install_ceres.sh && rm -rf ceres-solver
+COPY scripts/install_proto3.sh cartographer/scripts/
+RUN cartographer/scripts/install_proto3.sh && rm -rf protobuf
 COPY . cartographer
 RUN cartographer/scripts/install_cartographer.sh && rm -rf cartographer

Dockerfile.xenial

@@ -21,5 +21,7 @@ COPY scripts/install_debs.sh cartographer/scripts/
 RUN cartographer/scripts/install_debs.sh && rm -rf /var/lib/apt/lists/*
 COPY scripts/install_ceres.sh cartographer/scripts/
 RUN cartographer/scripts/install_ceres.sh && rm -rf ceres-solver
+COPY scripts/install_proto3.sh cartographer/scripts/
+RUN cartographer/scripts/install_proto3.sh && rm -rf protobuf
 COPY . cartographer
 RUN cartographer/scripts/install_cartographer.sh && rm -rf cartographer

docs/source/index.rst

@@ -66,17 +66,18 @@ On Ubuntu 14.04 (Trusty):
 
 .. literalinclude:: ../../scripts/install_debs.sh
   :language: bash
-  :linenos:
   :lines: 20-
 
 .. literalinclude:: ../../scripts/install_ceres.sh
   :language: bash
-  :linenos:
+  :lines: 20-
+
+.. literalinclude:: ../../scripts/install_proto3.sh
+  :language: bash
   :lines: 20-
 
 .. literalinclude:: ../../scripts/install_cartographer.sh
   :language: bash
-  :linenos:
   :lines: 20-
 
 .. _system-requirements:

scripts/install_debs.sh

@@ -30,8 +30,6 @@ sudo apt-get install -y \
     libgflags-dev \
     libgoogle-glog-dev \
     liblua5.2-dev \
-    libprotobuf-dev \
     libsuitesparse-dev \
     ninja-build \
-    protobuf-compiler \
     python-sphinx

scripts/install_proto3.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+# Copyright 2016 The Cartographer Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o verbose
+
+# Build and install proto3.
+git clone https://github.com/google/protobuf.git
+cd protobuf
+mkdir build
+cd build
+cmake -G Ninja \
+  -DCMAKE_BUILD_TYPE=Release \
+  -Dprotobuf_BUILD_TESTS=OFF \
+  ../cmake
+ninja
+sudo ninja install