Merge pull request #1608 from ctrlaltca/travis_package

Travis changes for package creation

.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

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})

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
+

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