Commit d09b75a3 authored by Zach's avatar Zach
Browse files

Merge pull request #1608 from ctrlaltca/travis_package

Travis changes for package creation
parents 30531683 35815a89
language: cpp language: cpp
env: env:
- QT4=1 - QT4=1 BUILDTYPE=Debug
- QT4=0 - QT4=0 BUILDTYPE=Debug
- QT4=0 BUILDTYPE=Release
os: os:
- linux - linux
- osx - osx
compiler:
- gcc
- clang
script: ./travis-compile.sh script: ./travis-compile.sh
install: ./travis-dependencies.sh install: ./travis-dependencies.sh
cache: apt cache: apt
......
...@@ -194,6 +194,7 @@ if(UNIX) ...@@ -194,6 +194,7 @@ if(UNIX)
set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}/${PROJECT_VERSION_SAFE}") set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}/${PROJECT_VERSION_SAFE}")
set(CPACK_STRIP_FILES "bin/${PROJECT_NAME}") set(CPACK_STRIP_FILES "bin/${PROJECT_NAME}")
set(CPACK_SOURCE_STRIP_FILES "") set(CPACK_SOURCE_STRIP_FILES "")
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}_git-${PROJECT_VERSION_SAFE}")
endif() endif()
elseif(WIN32) elseif(WIN32)
set(CPACK_GENERATOR NSIS ${CPACK_GENERATOR}) set(CPACK_GENERATOR NSIS ${CPACK_GENERATOR})
......
...@@ -11,5 +11,11 @@ fi ...@@ -11,5 +11,11 @@ fi
if [[ $TRAVIS_OS_NAME == "linux" && $QT4 == 0 ]]; then if [[ $TRAVIS_OS_NAME == "linux" && $QT4 == 0 ]]; then
prefix="-DCMAKE_PREFIX_PATH=/opt/qt52/lib/cmake/" prefix="-DCMAKE_PREFIX_PATH=/opt/qt52/lib/cmake/"
fi fi
cmake .. -DWITH_SERVER=1 -DCMAKE_BUILD_TYPE=Debug -DWITH_QT4=$QT4 $prefix cmake .. -DWITH_SERVER=1 -DCMAKE_BUILD_TYPE=$BUILDTYPE -DWITH_QT4=$QT4 $prefix
make -j2
if [[ $BUILDTYPE == "Debug" ]]; then
make -j2
else
make package -j2
fi
#!/bin/bash #!/bin/bash
if [[ $TRAVIS_OS_NAME == "osx" ]] ; then if [[ $TRAVIS_OS_NAME == "osx" ]] ; then
brew update brew update > /dev/null
if (( QT4 )); then if (( QT4 )); then
brew install qt protobuf libgcrypt brew install qt protobuf libgcrypt > /dev/null
else else
brew install qt5 protobuf libgcrypt brew install qt5 protobuf libgcrypt > /dev/null
fi fi
else else
if (( QT4 )); then if (( QT4 )); then
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment