update travis script

.travis.yml

@@ -1,39 +1,64 @@
 language: cpp
 
 os:
-- osx
+    - osx
-- linux
+    - linux
 
-before_install:
+before_install: |- 
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
+                if  [ "$TRAVIS_OS_NAME" == "osx" ]
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install qt5 ninja; fi
+                then
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:beineri/opt-qt521; fi
+                    brew update
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:kubuntu-ppa/backports ; fi
+                    brew install qt5 ninja
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -qq update; fi
+                fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -q qt52base qt52tools qt52quick1 qt52quickcontrols ninja-build cmake; fi
+                if [ "$TRAVIS_OS_NAME" == "linux" ]
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then source /opt/qt52/bin/qt52-env.sh ;fi
+                then
-  - mkdir -p ~/git && cd ~/git
+                    sudo add-apt-repository -y ppa:beineri/opt-qt532
-  - git clone -q git://anongit.kde.org/extra-cmake-modules.git
+                    sudo add-apt-repository -y ppa:kubuntu-ppa/backports
-  - git clone -q https://github.com/Snorenotify/SnoreGrowl.git
+                    sudo apt-get -qq update
-  - mkdir -p ~/build
+                    sudo apt-get install -q qt53base qt53tools qt53quick1 qt53quickcontrols qt53websockets qt53multimedia
-  - mkdir -p ~/build/extra-cmake-modules && cd ~/build/extra-cmake-modules
+                    sudo apt-get install -q ninja-build cmake
-  - cmake -G"Ninja" ~/git/extra-cmake-modules -DCMAKE_INSTALL_PREFIX=~/installs/
+                    source /opt/qt53/bin/qt53-env.sh
-  - ninja install
+                fi
-  - mkdir -p ~/build/snoregrowl && cd ~/build/snoregrowl
+                if [ ! -d ~/my_work ]
-  - cmake -G"Ninja" ~/git/SnoreGrowl -DCMAKE_INSTALL_PREFIX=~/installs/
+                then
-  - ninja install
+                    mkdir -p ~/my_work
+                    mkdir -p ~/my_work/git
+                    cd ~/my_work/git
+                    git clone -q git://anongit.kde.org/extra-cmake-modules.git
+                    git clone -q https://github.com/Snorenotify/SnoreGrowl.git
+                    mkdir -p ~/my_work/build
+                    cd ~/my_work/build
+                    mkdir -p ~/my_work/build/extra-cmake-modules
+                    cd ~/my_work/build/extra-cmake-modules
+                    cmake -G"Ninja" ~/my_work/git/extra-cmake-modules -DCMAKE_INSTALL_PREFIX=~/my_work/installs/
+                    ninja install
+                    mkdir -p ~/my_work/build/snoregrowl && cd ~/my_work/build/snoregrowl
+                    cmake -G"Ninja" ~/my_work/git/SnoreGrowl -DCMAKE_INSTALL_PREFIX=~/my_work/installs/
+                    ninja install
+                fi
   
 compiler:
   - clang
-  #- gcc
+  - gcc
+  
+script: |-
+        cd $TRAVIS_BUILD_DIR
+        mkdir build
+        cd build
+        if [ "$TRAVIS_OS_NAME" == "osx" ]
+        then
+            cmake -G"Ninja" .. -DCMAKE_INSTALL_PREFIX=~/my_work/installs/ -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5
+        fi
+        if [ "$TRAVIS_OS_NAME" == "linux" ]
+        then
+            cmake -G"Ninja" .. -DCMAKE_INSTALL_PREFIX=~/my_work/installs/
+        fi
+        ninja install
+
+cache:
+    directories:
+        $HOME/my_work
 
-script:
-  - cd $TRAVIS_BUILD_DIR
-  - mkdir build
-  - cd build
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then cmake -G"Ninja" .. -DCMAKE_INSTALL_PREFIX=~/installs/ -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 ;fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then cmake -G"Ninja" .. -DCMAKE_INSTALL_PREFIX=~/installs/ ;fi
-  - ninja install
     
 notifications:
     irc: "chat.freenode.net#snorenotify"