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

Fix documentation and Docker cache. (#157)

master
Damon Kohler 2016-12-09 13:08:43 +01:00 committed by GitHub
parent 0ac570b69f
commit 78747eda62
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -22,11 +22,8 @@ cache:
- /home/travis/docker/ - /home/travis/docker/
env: env:
global: - UBUNTU_RELEASE=trusty DOCKER_CACHE_FILE=/home/travis/docker/trusty-cache.tar.gz
- DOCKER_CACHE_FILE=/home/travis/docker/cache.tar.gz - UBUNTU_RELEASE=xenial DOCKER_CACHE_FILE=/home/travis/docker/xenial-cache.tar.gz
matrix:
- UBUNTU_RELEASE=trusty
- UBUNTU_RELEASE=xenial
before_install: scripts/load_docker_cache.sh before_install: scripts/load_docker_cache.sh

2
cartographer-config.cmake.in
View File

@ -15,7 +15,7 @@
# Usage from an external project: # Usage from an external project:
# In your CMakeLists.txt, add these lines: # In your CMakeLists.txt, add these lines:
# #
# find_package(Cartographer REQUIRED ) # find_package(cartographer REQUIRED )
# include_directories(${CARTOGRAPHER_INCLUDE_DIRS}) # include_directories(${CARTOGRAPHER_INCLUDE_DIRS})
# target_link_libraries(MY_TARGET_NAME ${CARTOGRAPHER_LIBRARIES}) # target_link_libraries(MY_TARGET_NAME ${CARTOGRAPHER_LIBRARIES})
# #

4
docs/source/index.rst
View File

@ -76,8 +76,8 @@ on systems that meet the following requirements:
* 64-bit, modern CPU (e.g. 3rd generation i7) * 64-bit, modern CPU (e.g. 3rd generation i7)
* 16 GB RAM * 16 GB RAM
* Ubuntu 14.04 (Trusty) * Ubuntu 14.04 (Trusty) and 16.04 (Xenial)
* gcc version 4.8.4 * gcc version 4.8.4 and 5.4.0
Known Issues Known Issues
------------ ------------

2
scripts/save_docker_cache.sh
View File

@ -24,6 +24,6 @@ set -o pipefail
if [[ ${TRAVIS_BRANCH} == "master" ]] && if [[ ${TRAVIS_BRANCH} == "master" ]] &&
[[ ${TRAVIS_PULL_REQUEST} == "false" ]]; then [[ ${TRAVIS_PULL_REQUEST} == "false" ]]; then
mkdir -p $(dirname ${DOCKER_CACHE_FILE}); mkdir -p $(dirname ${DOCKER_CACHE_FILE});
docker save $(docker history -q cartographer | docker save $(docker history -q cartographer:${UBUNTU_RELEASE} |
grep -v '<missing>') | gzip > ${DOCKER_CACHE_FILE}; grep -v '<missing>') | gzip > ${DOCKER_CACHE_FILE};
fi fi