diff --git a/.travis.yml b/.travis.yml index 11cff198..31a722e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,11 @@ language: cpp env: - - QT4=1 - - QT4=0 + - QT4=1 BUILDTYPE=Debug + - QT4=0 BUILDTYPE=Debug + - QT4=0 BUILDTYPE=Release os: - linux - osx -compiler: - - gcc - - clang script: ./travis-compile.sh install: ./travis-dependencies.sh cache: apt diff --git a/CMakeLists.txt b/CMakeLists.txt index 3937321e..7bc9e4b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -194,6 +194,7 @@ if(UNIX) set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}/${PROJECT_VERSION_SAFE}") set(CPACK_STRIP_FILES "bin/${PROJECT_NAME}") set(CPACK_SOURCE_STRIP_FILES "") + set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}_git-${PROJECT_VERSION_SAFE}") endif() elseif(WIN32) set(CPACK_GENERATOR NSIS ${CPACK_GENERATOR}) diff --git a/travis-compile.sh b/travis-compile.sh index 65f48b2c..23345d84 100755 --- a/travis-compile.sh +++ b/travis-compile.sh @@ -11,5 +11,11 @@ fi if [[ $TRAVIS_OS_NAME == "linux" && $QT4 == 0 ]]; then prefix="-DCMAKE_PREFIX_PATH=/opt/qt52/lib/cmake/" fi -cmake .. -DWITH_SERVER=1 -DCMAKE_BUILD_TYPE=Debug -DWITH_QT4=$QT4 $prefix -make -j2 +cmake .. -DWITH_SERVER=1 -DCMAKE_BUILD_TYPE=$BUILDTYPE -DWITH_QT4=$QT4 $prefix + +if [[ $BUILDTYPE == "Debug" ]]; then + make -j2 +else + make package -j2 +fi + diff --git a/travis-dependencies.sh b/travis-dependencies.sh index 63fdc24c..37e529ec 100755 --- a/travis-dependencies.sh +++ b/travis-dependencies.sh @@ -1,11 +1,11 @@ #!/bin/bash if [[ $TRAVIS_OS_NAME == "osx" ]] ; then - brew update + brew update > /dev/null if (( QT4 )); then - brew install qt protobuf libgcrypt + brew install qt protobuf libgcrypt > /dev/null else - brew install qt5 protobuf libgcrypt + brew install qt5 protobuf libgcrypt > /dev/null fi else if (( QT4 )); then