Commit 2d687443 authored by Daniel Agar's avatar Daniel Agar

qmake Linux installer create qgroundcontrol.tar.bz2

parent 47d93de0
...@@ -27,7 +27,7 @@ before_install: ...@@ -27,7 +27,7 @@ before_install:
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then mkdir -p ~/Library/Preferences/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/; fi - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then mkdir -p ~/Library/Preferences/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/; fi
install: install:
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then - if [[ "${TRAVIS_OS_NAME}" = "linux" || "${TRAVIS_OS_NAME}" = "android" ]]; then
sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
&& sudo apt-add-repository -y ppa:beineri/opt-qt541 && sudo apt-add-repository -y ppa:beineri/opt-qt541
&& sudo apt-get -qq update && sudo apt-get -qq update
...@@ -38,7 +38,7 @@ install: ...@@ -38,7 +38,7 @@ install:
&& export DISPLAY=:99.0 && export DISPLAY=:99.0
&& sh -e /etc/init.d/xvfb start && sh -e /etc/init.d/xvfb start
; ;
else elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
brew tap PX4/homebrew-px4 brew tap PX4/homebrew-px4
&& brew update && brew update
&& brew install qt54 && brew install qt54
......
...@@ -50,4 +50,7 @@ installer { ...@@ -50,4 +50,7 @@ installer {
#QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY qgroundcontrol.pdb $${DESTDIR_WIN} #QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY qgroundcontrol.pdb $${DESTDIR_WIN}
#QMAKE_POST_LINK += $$escape_expand(\\n) del qgroundcontrol.pdb #QMAKE_POST_LINK += $$escape_expand(\\n) del qgroundcontrol.pdb
} }
LinuxBuild {
QMAKE_POST_LINK += && tar -cjf qgroundcontrol.tar.bz2 release --transform 's/release/qgroundcontrol/'
}
} }
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