diff options
| author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2016-11-06 09:29:37 +0100 |
|---|---|---|
| committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2016-11-06 10:20:56 +0100 |
| commit | 33e9fc2ba59e9060f60a4703bd5a222eb39401af (patch) | |
| tree | a0b52683e2f110ba63e2f4fdd476abf108e32858 /.travis.yml | |
| parent | de7fcd801d68a62f959bcf9d40647c355a7cc733 (diff) | |
[travis] Remove autotools options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/.travis.yml b/.travis.yml index 4f21fd0ecb..d0a1f4df1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,6 @@ compiler: - clang env: -# - BUILD=Kodi TOOLS=Autotools - BUILD=Kodi TOOLS=CMake # - ADDONS=adsp # - ADDONS=audiodecoder @@ -87,27 +86,14 @@ before_script: # - if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD" == "Kodi" ]]; then ulimit -c unlimited -S; - if [[ "$TOOLS" == "Autotools" ]]; then - cd $TRAVIS_BUILD_DIR && - ./bootstrap; - elif [[ "$TOOLS" == "CMake" ]]; then - mkdir $TRAVIS_BUILD_DIR/build && - cd $TRAVIS_BUILD_DIR/build; - fi + mkdir $TRAVIS_BUILD_DIR/build && + cd $TRAVIS_BUILD_DIR/build; fi - if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD" == "Kodi" && "$CXX" == "g++" ]]; then - if [[ "$TOOLS" == "Autotools" ]]; then - ./configure --enable-debug; - elif [[ "$TOOLS" == "CMake" ]]; then - cmake -DCMAKE_BUILD_TYPE=Debug ../project/cmake; - fi + cmake -DCMAKE_BUILD_TYPE=Debug ../project/cmake; fi - if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD" == "Kodi" && "$CXX" == "clang++" ]]; then - if [[ "$TOOLS" == "Autotools" ]]; then - CXXFLAGS="-Qunused-arguments" ./configure; - elif [[ "$TOOLS" == "CMake" ]]; then - cmake -DCMAKE_CXX_FLAGS="-Qunused-arguments" ../project/cmake; - fi + cmake -DCMAKE_CXX_FLAGS="-Qunused-arguments" ../project/cmake; fi - if [[ "$BUILD" != "Kodi" ]] && [[ "$ADDONS" == "adsp" || "$ADDONS" == "audiodecoder" || "$ADDONS" == "audioencoder" || "$ADDONS" == "pvr" || "$ADDONS" == "screensaver" || "$ADDONS" == "visualization" ]]; then @@ -115,28 +101,22 @@ before_script: mkdir -p build && cd build/ && cmake ../bootstrap -DCMAKE_BUILD_TYPE=Debug && - make -j3; + make -j4; fi # Actually build # script: - if [[ "$BUILD" == "Kodi" ]]; then - if [[ "$TOOLS" == "Autotools" ]]; then - make -j3 && - make testsuite && - ./kodi-test; - elif [[ "$TOOLS" == "CMake" ]]; then - make -j3 && - make check; - fi + make -j4 && + make check; fi - if [[ "$BUILD" != "Kodi" ]] && [[ "$ADDONS" == "adsp" || "$ADDONS" == "audiodecoder" || "$ADDONS" == "audioencoder" || "$ADDONS" == "pvr" || "$ADDONS" == "screensaver" || "$ADDONS" == "visualization" ]]; then cd $TRAVIS_BUILD_DIR/ && mkdir -p build && cmake -DADDONS_TO_BUILD="$ADDONS".* -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../addons $TRAVIS_BUILD_DIR/project/cmake/addons && - make -j3; + make -j4; fi after_failure: @@ -146,6 +126,6 @@ after_failure: fi # Disable annoying emails -# + notifications: email: false |