diff --git a/ci/travis-config.sh b/ci/travis-config.sh new file mode 100644 index 000000000..85e6a9790 --- /dev/null +++ b/ci/travis-config.sh @@ -0,0 +1,12 @@ +# Build configuration on Travis. +# +# Defines a CMAKE_ARGS variable for use with cmake +# +# This file is sourced by travis.sh, and exports the variables +# to the environment. +CMAKE_ARGS="\ + -DWEBVIEW_FORCE_WEBKIT=1 \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DWITH_PYTHONQT=OFF" + +export CMAKE_ARGS diff --git a/ci/travis-continuous.sh b/ci/travis-continuous.sh index 02994be74..42cfb4bd3 100755 --- a/ci/travis-continuous.sh +++ b/ci/travis-continuous.sh @@ -12,4 +12,4 @@ test -f $SRCDIR/CMakeLists.txt || exit 1 cd $BUILDDIR || exit 1 -cmake -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON $SRCDIR && make -j2 && make install DESTDIR=/build/INSTALL_ROOT +cmake $CMAKE_ARGS $SRCDIR && make -j2 && make install DESTDIR=/build/INSTALL_ROOT diff --git a/ci/travis-coverity.sh b/ci/travis-coverity.sh index 07da4ce1a..c9495cf56 100755 --- a/ci/travis-coverity.sh +++ b/ci/travis-coverity.sh @@ -21,7 +21,7 @@ tar xvf coverity_tool.tar.gz -C "$BUILDDIR/coveritytool" --strip-components 2 export PATH="$BUILDDIR/coveritytool/bin:$PATH" -cmake -DCMAKE_BUILD_TYPE=Debug -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON $SRCDIR || exit 1 +cmake -DCMAKE_BUILD_TYPE=Debug $CMAKE_ARGS $SRCDIR || exit 1 cov-build --dir cov-int make -j2 tar caf calamares-ci.tar.xz cov-int diff --git a/ci/travis.sh b/ci/travis.sh index c8ac49f5d..364923b9e 100755 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -12,6 +12,8 @@ test -d "$D" || exit 1 test -x "$D/travis-continuous.sh" || exit 1 test -x "$D/travis-coverity.sh" || exit 1 +test -f "$D/travis-common.sh" && . "$D/travis-config.sh" + if test "$TRAVIS_EVENT_TYPE" = "cron" ; then exec "$D/travis-coverity.sh" else