Commit 388b5fdd authored by Daniel Agar's avatar Daniel Agar

travis-ci linux and android use Qt 5.5.1 hosted on s3

parent 4ed33d47
......@@ -50,13 +50,14 @@ before_install:
install:
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
&& sudo apt-add-repository -y ppa:beineri/opt-qt542
&& 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
&& sudo apt-get -qq install g++-4.8 espeak libespeak-dev libopenscenegraph-dev libsdl1.2-dev libudev-dev
&& wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-linux.tar.bz2
&& tar jxf Qt5.5.1-linux.tar.bz2 -C /tmp
&& export PATH=/tmp/Qt/5.5/gcc_64/bin:$PATH
&& export CXX="g++-4.8"
&& export CC="gcc-4.8"
&& export DISPLAY=:99.0
&& export PATH=/opt/qt54/bin:$PATH
&& sh -e /etc/init.d/xvfb start
;
elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
......@@ -73,9 +74,9 @@ install:
&& export PATH=`pwd`/android-ndk-r10e:$PATH
&& export ANDROID_NDK_ROOT=`pwd`/android-ndk-r10e
&& export ANDROID_SDK_ROOT=/usr/local/android-sdk
&& wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.0-android.tar.bz2
&& tar jxf Qt5.5.0-android.tar.bz2
&& export PATH=`pwd`/Qt5.5.0/5.5/android_armv7/bin:$PATH
&& wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-linux.tar.bz2
&& tar jxf Qt5.5.1-linux.tar.bz2 -C /tmp
&& export PATH=/tmp/Qt/5.5/android_armv7/bin:$PATH
;
fi
......
Markdown is supported
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