From dacfd6ce50f00371991650b356139fa089c3cf5a Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Mon, 31 Aug 2015 13:14:29 -0400
Subject: [PATCH] travis-ci enable OSX builds

---
 .travis.yml        | 56 +++++++++++++++++++++++++++++++---------------
 test/qtlogging.ini | 16 +++++++++++++
 2 files changed, 54 insertions(+), 18 deletions(-)
 create mode 100644 test/qtlogging.ini

diff --git a/.travis.yml b/.travis.yml
index 2967e41ba..a8635c726 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,44 +1,64 @@
+sudo: true
+
 language: cpp
 
 git:
-  depth: 100
+  depth: 500
 
-os:
-  - linux
-#  - osx
+matrix:
+    include:
+        - os: linux
+          env: CONFIG=release
+        - os: linux
+          env: CONFIG=debug
+        - os: osx
+          osx_image: beta-xcode6.3
+          env: CONFIG=release
+        - os: osx
+          osx_image: beta-xcode6.3
+          env: CONFIG=debug
 
 cache:
-  apt: true
-
-env:
-  - CONFIG=release
-  - CONFIG=debug
+  - apt
 
 before_install:
-  - cd ${TRAVIS_BUILD_DIR} && git fetch --unshallow
+  - cd ${TRAVIS_BUILD_DIR} && git fetch --unshallow && git fetch --tags
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then mkdir -p $HOME/Library/Preferences/QtProject/ && echo "[Rules]\n *Log.debug=false" >> $HOME/Library/Preferences/QtProject/qtlogging.ini; fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/; fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/; fi
 
 install:
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
-         sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
+         mkdir -p $HOME/.config/QtProject $HOME/.config/QGroundControl.org $HOME/QGroundControl
+      && sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
       && sudo apt-add-repository -y ppa:beineri/opt-qt541
       && sudo apt-get -qq update
       && sudo apt-get -qq install g++-4.8 libc6-i386 qt54tools qt54base qt54declarative qt54serialport qt54svg qt54webkit qt54quickcontrols qt54xmlpatterns qt54x11extras qt54websockets qt54sensors qt54script qt54quick1 qt54multimedia qt54location qt54imageformats qt54graphicaleffects qt54connectivity espeak libespeak-dev libopenscenegraph-dev libsdl1.2-dev libudev-dev
+      && export PATH=/opt/qt54/bin:$PATH
       && export CXX="g++-4.8"
       && export CC="gcc-4.8"
+      && export DISPLAY=:99.0
+      && sh -e /etc/init.d/xvfb start
       ;
     else
-         brew update
-      && brew install qt5
-      && chmod -R 755 /usr/local/opt/qt5/*
+         brew tap PX4/homebrew-px4
+      && brew update
+      && brew install qt54
+      && brew linkapps qt54
+      && export PATH=/usr/local/opt/qt54/bin:$PATH
       ;
     fi
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
 
-before_script: /opt/qt54/bin/qmake CONFIG+=${CONFIG} -r qgroundcontrol.pro
+
+before_script: qmake CONFIG+=${CONFIG} -r qgroundcontrol.pro
 script:
+  - echo 'Building QGroundControl' && echo -en 'travis_fold:start:script.1\\r'
   - make -j4
-#  - if [ "${CONFIG}" = "debug" ]; then ./debug/qgroundcontrol --unittest; fi
+  - echo -en 'travis_fold:end:script.1\\r'
+  - echo 'Running unittests' && echo -en 'travis_fold:start:script.2\\r'
+#  - if [[ "${TRAVIS_OS_NAME}" = "linux" && "${CONFIG}" = "debug" ]]; then ls -ls ~; ls -ls ~/.config; ./debug/qgroundcontrol --unittest; fi
+  - if [[ "${TRAVIS_OS_NAME}" = "osx" && "${CONFIG}" = "debug" ]]; then ./debug/qgroundcontrol.app/Contents/MacOS/qgroundcontrol --unittest; fi
+  - echo -en 'travis_fold:end:script.2\\r'
 
 #deploy:
 #  provider: releases
diff --git a/test/qtlogging.ini b/test/qtlogging.ini
new file mode 100644
index 000000000..249b67c71
--- /dev/null
+++ b/test/qtlogging.ini
@@ -0,0 +1,16 @@
+[Rules]
+*Log.debug=false
+LinkManagerLog.debug=false
+MAVLinkProtocolLog.debug=false
+MockLinkLog.debug=false
+FirmwareUpgradeLog.debug=false
+FileManagerLog.debug=false
+UASLog.debug=false
+PX4AirframeLoaderLog.debug=false
+SerialLinkLog.debug=false
+RadioConfigTestLog.debug=false
+PX4ParameterLoaderLog.debug=false
+RadioComponentControllerLog.debug=false
+VehicleLog.debug=false
+ParameterLoaderLog.debug=false
+FactPanelControllerLog.debug=false
-- 
2.22.0