From 4b478efa61251d350ded6458d4eb5f0fbedd19b9 Mon Sep 17 00:00:00 2001 From: Gavin Bisesi Date: Mon, 10 Nov 2014 15:12:45 -0500 Subject: [PATCH 01/10] Build both Qt4 and Qt5 --- .travis.yml | 5 ++++- travis-dependencies.sh | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 74f6feff..7e2bd5fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,13 @@ language: cpp +env: + - QT="-DWITH_QT4=0" + - QT="-DWITH_QT4=1" os: - linux - osx compiler: - gcc - clang -script: mkdir build && cd build && cmake .. -DWITH_SERVER=1 && make +script: mkdir build && cd build && cmake .. $QT -DWITH_SERVER=1 && make install: ./travis-dependencies.sh cache: apt diff --git a/travis-dependencies.sh b/travis-dependencies.sh index 10af11cd..2bfabf6b 100755 --- a/travis-dependencies.sh +++ b/travis-dependencies.sh @@ -2,8 +2,8 @@ if [[ $TRAVIS_OS_NAME == "osx" ]] ; then brew update - brew install qt protobuf libgcrypt + brew install qt qt5 protobuf libgcrypt else sudo apt-get update -qq - sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev + sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev qt5-default qttools5-dev-tools fi From a91106f90ec36deb3bd1e27cf833849a5024fa91 Mon Sep 17 00:00:00 2001 From: Gavin Bisesi Date: Mon, 10 Nov 2014 15:36:31 -0500 Subject: [PATCH 02/10] Add ppa for qt5 on travis ubuntu --- travis-dependencies.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/travis-dependencies.sh b/travis-dependencies.sh index 2bfabf6b..e4280fd5 100755 --- a/travis-dependencies.sh +++ b/travis-dependencies.sh @@ -4,6 +4,8 @@ if [[ $TRAVIS_OS_NAME == "osx" ]] ; then brew update brew install qt qt5 protobuf libgcrypt else + sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa sudo apt-get update -qq - sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev qt5-default qttools5-dev-tools + sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev\ + qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools fi From e918900d4e66020dd9e5fe87b53c5b3755dc73e2 Mon Sep 17 00:00:00 2001 From: Gavin Bisesi Date: Fri, 14 Nov 2014 10:38:54 -0500 Subject: [PATCH 03/10] Refine travis config to only install qt4 or qt5 per build instead of both --- .travis.yml | 6 +++--- travis-dependencies.sh | 19 ++++++++++++++----- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e2bd5fc..89b71d6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,13 @@ language: cpp env: - - QT="-DWITH_QT4=0" - - QT="-DWITH_QT4=1" + - QT4=1 + - QT4=0 os: - linux - osx compiler: - gcc - clang -script: mkdir build && cd build && cmake .. $QT -DWITH_SERVER=1 && make +script: mkdir build && cd build && cmake .. -DWITH_QT4=$QT4 -DWITH_SERVER=1 && make install: ./travis-dependencies.sh cache: apt diff --git a/travis-dependencies.sh b/travis-dependencies.sh index e4280fd5..39c0e4e4 100755 --- a/travis-dependencies.sh +++ b/travis-dependencies.sh @@ -2,10 +2,19 @@ if [[ $TRAVIS_OS_NAME == "osx" ]] ; then brew update - brew install qt qt5 protobuf libgcrypt + if (( QT4 )); then + brew install qt protobuf libgcrypt + else + brew install qt qt5 protobuf libgcrypt + fi else - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa - sudo apt-get update -qq - sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev\ - qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools + if (( QT4 )); then + sudo apt-get update -qq + sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev + else + sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa + sudo apt-get update -qq + sudo apt-get install -y libprotobuf-dev protobuf-compiler qtbase5-dev\ + qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools + fi fi From 5f944f1d6ea57a324fd67a9e554d4e0dd8c6b340 Mon Sep 17 00:00:00 2001 From: Gavin Bisesi Date: Fri, 14 Nov 2014 16:32:56 -0500 Subject: [PATCH 04/10] Actually use Qt5 for qt5-osx build --- .travis.yml | 2 +- travis-compile.sh | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100755 travis-compile.sh diff --git a/.travis.yml b/.travis.yml index 89b71d6a..28eee8f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,6 @@ os: compiler: - gcc - clang -script: mkdir build && cd build && cmake .. -DWITH_QT4=$QT4 -DWITH_SERVER=1 && make +script: ./travis-compile.sh install: ./travis-dependencies.sh cache: apt diff --git a/travis-compile.sh b/travis-compile.sh new file mode 100755 index 00000000..8da51620 --- /dev/null +++ b/travis-compile.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +set -e + +mkdir build +cd build +prefix="" +if [[ $TRAVIS_OS_NAME == "osx" && $QT4 == 0 ]]; then + prefix="-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.3.0/" +fi +cmake .. -DWITH_SERVER=1 -DWITH_QT4=$QT4 $prefix +make From fbbe40fbf3d2754dd3e6133d06784fb4002399cb Mon Sep 17 00:00:00 2001 From: Gavin Bisesi Date: Fri, 14 Nov 2014 17:11:50 -0500 Subject: [PATCH 05/10] Use correct qt version path for cmake on osx --- travis-compile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-compile.sh b/travis-compile.sh index 8da51620..e5058543 100755 --- a/travis-compile.sh +++ b/travis-compile.sh @@ -6,7 +6,7 @@ mkdir build cd build prefix="" if [[ $TRAVIS_OS_NAME == "osx" && $QT4 == 0 ]]; then - prefix="-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.3.0/" + prefix="-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.3.2/" fi cmake .. -DWITH_SERVER=1 -DWITH_QT4=$QT4 $prefix make From 1640e778483d9ab09127b8e542b4e67a2d8dbda9 Mon Sep 17 00:00:00 2001 From: Gavin Bisesi Date: Mon, 17 Nov 2014 11:29:20 -0500 Subject: [PATCH 06/10] Notify gitter about build changes --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 28eee8f1..dfceb213 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,3 +11,10 @@ compiler: script: ./travis-compile.sh install: ./travis-dependencies.sh cache: apt +notifications: + webhooks: + urls: + - https://webhooks.gitter.im/e/d94969c3b01b22cbdcb7 + on_success: change + on_failure: change + on_start: false From d2e706164d03706b2f1f69510bc7c3841b4e1cd5 Mon Sep 17 00:00:00 2001 From: Gavin Bisesi Date: Tue, 18 Nov 2014 06:08:56 -0500 Subject: [PATCH 07/10] Install qt5tools-dev for ubuntu build --- travis-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-dependencies.sh b/travis-dependencies.sh index 39c0e4e4..fc5b15ff 100755 --- a/travis-dependencies.sh +++ b/travis-dependencies.sh @@ -15,6 +15,6 @@ else sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa sudo apt-get update -qq sudo apt-get install -y libprotobuf-dev protobuf-compiler qtbase5-dev\ - qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools + qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools qttools5-dev fi fi From 1ba6b468de7ae274fda421eb9e9321624d7f4504 Mon Sep 17 00:00:00 2001 From: Gavin Bisesi Date: Tue, 18 Nov 2014 07:48:55 -0500 Subject: [PATCH 08/10] Install updated cmake from ubuntu sdk ppa --- travis-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-dependencies.sh b/travis-dependencies.sh index fc5b15ff..4acb972d 100755 --- a/travis-dependencies.sh +++ b/travis-dependencies.sh @@ -14,7 +14,7 @@ else else sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa sudo apt-get update -qq - sudo apt-get install -y libprotobuf-dev protobuf-compiler qtbase5-dev\ + sudo apt-get install -y libprotobuf-dev protobuf-compiler qtbase5-dev cmake\ qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools qttools5-dev fi fi From ee2ba4abd3d5f8ea0a07b0a46a5b2086ef51fa64 Mon Sep 17 00:00:00 2001 From: Gavin Bisesi Date: Tue, 18 Nov 2014 12:18:30 -0500 Subject: [PATCH 09/10] Include qtmultimedia and qtsvg for travis qt5 build --- travis-dependencies.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/travis-dependencies.sh b/travis-dependencies.sh index 4acb972d..6d9c9afc 100755 --- a/travis-dependencies.sh +++ b/travis-dependencies.sh @@ -15,6 +15,7 @@ else sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa sudo apt-get update -qq sudo apt-get install -y libprotobuf-dev protobuf-compiler qtbase5-dev cmake\ - qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools qttools5-dev + qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools\ + qttools5-dev qtmultimedia5-dev libqt5svg5-dev fi fi From b4dc9b79d4398e9f3b520a171bc02945c01f69de Mon Sep 17 00:00:00 2001 From: Gavin Bisesi Date: Tue, 18 Nov 2014 12:41:08 -0500 Subject: [PATCH 10/10] Don't install qt4 when building qt5 on osx --- travis-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-dependencies.sh b/travis-dependencies.sh index 6d9c9afc..5878b513 100755 --- a/travis-dependencies.sh +++ b/travis-dependencies.sh @@ -5,7 +5,7 @@ if [[ $TRAVIS_OS_NAME == "osx" ]] ; then if (( QT4 )); then brew install qt protobuf libgcrypt else - brew install qt qt5 protobuf libgcrypt + brew install qt5 protobuf libgcrypt fi else if (( QT4 )); then