From f052c09053d34953c9df6d3a8b126c84b8e8eb1e Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 10 Sep 2015 15:01:57 +0200 Subject: [PATCH] travis: move build script in travis-build-script.sh --- .travis.yml | 35 ++------------------------------ travis-build-script.sh | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 33 deletions(-) create mode 100644 travis-build-script.sh diff --git a/.travis.yml b/.travis.yml index 07ade01..0e1500a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,36 +15,5 @@ env: - TRAVIS_BUILD_TYPE=Release TRAVIS_SHARED_LIBS=OFF TRAVIS_STRICT_C90=OFF TRAVIS_MAKE_CHECK=OFF TRAVIS_COVERALLS=OFF script: - - cmake --version - - if [ "${TRAVIS_COVERALLS}" = "ON" ] && [ "${TRAVIS_OS_NAME}" = "linux" ] && [ "${CC}" = "gcc" ]; - then - export PYTHONUSERBASE=`pwd`/pip; - pip install --user cpp-coveralls; - else - export TRAVIS_COVERALLS=OFF; - fi - - echo TRAVIS_COVERALLS=$TRAVIS_COVERALLS - - mkdir build && cd build - - cmake .. -G "Unix Makefiles" - -DCMAKE_DEBUG_POSTFIX=_d - -DCMAKE_BUILD_TYPE=$TRAVIS_BUILD_TYPE - -DGMIO_BUILD_SHARED_LIBS=$TRAVIS_SHARED_LIBS - -DGMIO_BUILD_STRICT_C90=$TRAVIS_STRICT_C90 - -DGMIO_BUILD_TESTS_FAKE_SUPPORT=ON - -DGMIO_BUILD_TESTS_COVERAGE=$TRAVIS_COVERALLS - -DCMAKE_INSTALL_PREFIX=../install - - make -j4 - - make install - - if [ "${TRAVIS_MAKE_CHECK}" = "ON" ]; then - make check; - fi - - if [ "${TRAVIS_COVERALLS}" = "ON" ]; then - $PYTHONUSERBASE/bin/coveralls \ - --exclude benchmarks \ - --exclude build/CMakeFiles \ - --exclude install \ - --exclude tests \ - --gcov-options '\-lp' \ - --root .. --build-root . ; - fi - + - chmod +x travis-build-script.sh + - ./travis-build-script.sh diff --git a/travis-build-script.sh b/travis-build-script.sh new file mode 100644 index 0000000..65d4dfa --- /dev/null +++ b/travis-build-script.sh @@ -0,0 +1,46 @@ +#!/bin/bash + +cmake --version + +# Install cpp-coveralls only if OS==linux and CC==gcc +if [ "${TRAVIS_COVERALLS}" = "ON" ] \ + && [ "${TRAVIS_OS_NAME}" = "linux" ] \ + && [ "${CC}" = "gcc" ]; +then + export PYTHONUSERBASE=`pwd`/pip; + pip install --user cpp-coveralls; +else + export TRAVIS_COVERALLS=OFF; +fi +echo TRAVIS_COVERALLS=$TRAVIS_COVERALLS + +# CMake +mkdir build && cd build +cmake .. -G "Unix Makefiles" \ + -DCMAKE_DEBUG_POSTFIX=_d \ + -DCMAKE_BUILD_TYPE=$TRAVIS_BUILD_TYPE \ + -DCMAKE_INSTALL_PREFIX=../install \ + -DGMIO_BUILD_SHARED_LIBS=$TRAVIS_SHARED_LIBS \ + -DGMIO_BUILD_STRICT_C90=$TRAVIS_STRICT_C90 \ + -DGMIO_BUILD_TESTS_FAKE_SUPPORT=ON \ + -DGMIO_BUILD_TESTS_COVERAGE=$TRAVIS_COVERALLS + +# Make +make -j4 +make install + +# Run unit tests +if [ "${TRAVIS_MAKE_CHECK}" = "ON" ]; then + make check; +fi + +# Coveralls +if [ "${TRAVIS_COVERALLS}" = "ON" ]; then + $PYTHONUSERBASE/bin/coveralls \ + --exclude benchmarks \ + --exclude build/CMakeFiles \ + --exclude install \ + --exclude tests \ + --gcov-options '\-lp' \ + --root .. --build-root . ; +fi