Peter M. Groen / CLI11

Commit f91e995b633dd5deca6ae6e231bda448aad909aa

Authored by Henry Fredrick Schreiner
1 parent 72397aaf

Cleaner build, builds doxygen and stashes it

Inline Side-by-side
Showing 3 changed files with 36 additions and 11 deletions
.ci/build_cmake.sh 0 → 100644
  View file @f91e995
  1 +if [ "$TRAVIS_OS_NAME" = "linux" ] ; then CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz" ; fi
  2 +if [ "$TRAVIS_OS_NAME" = "osx" ] ; then CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.2-Darwin-x86_64.tar.gz" ; fi
  3 +cd "${DEPS_DIR}"
  4 +
  5 +if [[ ! -f "${DEPS_DIR}/cmake/bin/cmake" ]] ; then
  6 + echo "Downloading CMake"
  7 + mkdir -p cmake
  8 + travis_retry wget --no-check-certificate --quiet -O - "${CMAKE_URL}" | tar --strip-components=1 -xz -C cmake
  9 +fi
  10 +
  11 +export PATH="${DEPS_DIR}/cmake/bin:${PATH}"
  12 +cd "${TRAVIS_BUILD_DIR}"
... ...
.ci/build_doxygen.sh 0 → 100644
  View file @f91e995
  1 +DOXYGEN_URL="ftp://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.13.src.tar.gz"
  2 +cd "${DEPS_DIR}"
  3 +
  4 +if [[ ! -f "${DEPS_DIR}/doxygen/bin/doxygen" ]] ; then
  5 + echo "Downloading Doxygen"
  6 + mkdir -p doxygen
  7 + travis_retry wget --no-check-certificate --quiet -O - "${DOXYGEN_URL}" | tar --strip-components=1 -xz -C doxygen
  8 + cd doxygen
  9 + mkdir -p build
  10 + cd build
  11 + cmake ..
  12 + make -j2
  13 +fi
  14 +
  15 +export PATH="${DEPS_DIR}/doxygen/build/bin:${PATH}"
  16 +
  17 +cd "${TRAVIS_BUILD_DIR}"
... ...
.travis.yml
  View file @f91e995
... ... @@ -9,6 +9,7 @@ env:
9 9 cache:
10 10 directories:
11 11 - ${TRAVIS_BUILD_DIR}/deps/cmake
  12 + - ${TRAVIS_BUILD_DIR}/deps/doxygen
12 13 matrix:
13 14 include:
14 15 - os: osx
... ... @@ -40,24 +41,18 @@ matrix:
40 41 packages:
41 42 - g++-4.7
42 43 env: COMPILER=4.7
  44 +
43 45 install:
44 46 - python -c 'import sys; print(sys.version_info[:])'
45 47 - if [ "$CXX" = "g++" ]; then export CXX="g++-$COMPILER" CC="gcc-$COMPILER"; fi
46 48 - if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX="clang++-$COMPILER" CC="clang-$COMPILER"; fi
47 49 - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
48   -- if [ "$TRAVIS_OS_NAME" = "linux" ] ; then CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz" ; fi
49   -- if [ "$TRAVIS_OS_NAME" = "osx" ] ; then CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.2-Darwin-x86_64.tar.gz" ; fi
50   -- cd "${DEPS_DIR}"
51   -- |
52   - if [[ ! -f "${DEPS_DIR}/cmake/bin/cmake" ]] ; then
53   - echo "Downloading CMake"
54   - mkdir -p cmake
55   - travis_retry wget --no-check-certificate --quiet -O - "${CMAKE_URL}" | tar --strip-components=1 -xz -C cmake
56   - fi
57   -- export PATH="${DEPS_DIR}/cmake/bin:${PATH}"
  50 +- cd $TRAVIS_BUILD_DIR && . .ci/build_cmake.sh
  51 +- cd $TRAVIS_BUILD_DIR && . .ci/build_doxygen.sh
58 52 - cd "${DEPS_DIR}"
59 53 - if [ "$(python -c 'import sys; print(sys.version_info[0])')" = "2" ] ; then pip
60 54 install --user pathlib; fi
  55 +
61 56 script:
62 57 - cd "${TRAVIS_BUILD_DIR}"
63 58 - .ci/travis.sh
... ... @@ -65,7 +60,8 @@ script:
65 60 after_success:
66 61 - echo "${TRAVIS_BRANCH}"
67 62 - echo "${TRAVIS_PULL_REQUEST}"
68   -- if [[ "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_PULL_REQUEST}" == "false" && "$DEPLOY_MAT" == "yes" ]] ; then echo "Updating docs" && cd $TRAVIS_BUILD_DIR && .ci/build_docs.sh ; fi
  63 +- if [[ "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_PULL_REQUEST}" == "false" && "$DEPLOY_MAT" == "yes" ]] ;\
  64 + then echo "Updating docs" && cd $TRAVIS_BUILD_DIR && .ci/build_docs.sh ; fi
69 65  
70 66 deploy:
71 67 provider: releases
... ...