12345qiupeng
/
cartographer_ros
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add proto3 install scripts to Dockerfiles and update docs. (#589)

master
Christoph Schütte 2017-11-13 10:48:00 +01:00 committed by Wally B. Feed
parent 53b9306d6e
commit 5210e92533
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile.indigo
View File

@ -35,6 +35,9 @@ COPY cartographer_rviz/package.xml catkin_ws/src/cartographer_ros/cartographer_r
COPY scripts/install_debs.sh cartographer_ros/scripts/ COPY scripts/install_debs.sh cartographer_ros/scripts/
RUN cartographer_ros/scripts/install_debs.sh && rm -rf /var/lib/apt/lists/* RUN cartographer_ros/scripts/install_debs.sh && rm -rf /var/lib/apt/lists/*
# Install proto3.
RUN /catkin_ws/src/cartographer/scripts/install_proto3.sh
# Build, install, and test all packages individually to allow caching. The # Build, install, and test all packages individually to allow caching. The
# ordering of these steps must match the topological package ordering as # ordering of these steps must match the topological package ordering as
# determined by Catkin. # determined by Catkin.

3
Dockerfile.kinetic
View File

@ -38,6 +38,9 @@ COPY cartographer_rviz/package.xml catkin_ws/src/cartographer_ros/cartographer_r
COPY scripts/install_debs.sh cartographer_ros/scripts/ COPY scripts/install_debs.sh cartographer_ros/scripts/
RUN cartographer_ros/scripts/install_debs.sh && rm -rf /var/lib/apt/lists/* RUN cartographer_ros/scripts/install_debs.sh && rm -rf /var/lib/apt/lists/*
# Install proto3.
RUN /catkin_ws/src/cartographer/scripts/install_proto3.sh
# Build, install, and test all packages individually to allow caching. The # Build, install, and test all packages individually to allow caching. The
# ordering of these steps must match the topological package ordering as # ordering of these steps must match the topological package ordering as
# determined by Catkin. # determined by Catkin.

3
Dockerfile.lunar
View File

@ -38,6 +38,9 @@ COPY cartographer_rviz/package.xml catkin_ws/src/cartographer_ros/cartographer_r
COPY scripts/install_debs.sh cartographer_ros/scripts/ COPY scripts/install_debs.sh cartographer_ros/scripts/
RUN cartographer_ros/scripts/install_debs.sh && rm -rf /var/lib/apt/lists/* RUN cartographer_ros/scripts/install_debs.sh && rm -rf /var/lib/apt/lists/*
# Install proto3.
RUN /catkin_ws/src/cartographer/scripts/install_proto3.sh
# Build, install, and test all packages individually to allow caching. The # Build, install, and test all packages individually to allow caching. The
# ordering of these steps must match the topological package ordering as # ordering of these steps must match the topological package ordering as
# determined by Catkin. # determined by Catkin.

3
docs/source/index.rst
View File

@ -68,6 +68,9 @@ We recommend using `wstool <http://wiki.ros.org/wstool>`_ and `rosdep
wstool merge -t src https://raw.githubusercontent.com/googlecartographer/cartographer_ros/master/cartographer_ros.rosinstall wstool merge -t src https://raw.githubusercontent.com/googlecartographer/cartographer_ros/master/cartographer_ros.rosinstall
wstool update -t src wstool update -t src
# Install proto3.
src/cartographer/scripts/install_proto3.sh
# Install deb dependencies. # Install deb dependencies.
# The command 'sudo rosdep init' will print an error if you have already # The command 'sudo rosdep init' will print an error if you have already
# executed it since installing ROS. This error can be ignored. # executed it since installing ROS. This error can be ignored.