From 2d687443ff0968463f867ee4643c98835c9cc0cb Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sun, 6 Sep 2015 16:16:12 -0400 Subject: [PATCH] qmake Linux installer create qgroundcontrol.tar.bz2 --- .travis.yml | 4 ++-- QGCInstaller.pri | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e9520a405..aa656406a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 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:beineri/opt-qt541 && sudo apt-get -qq update @@ -38,7 +38,7 @@ install: && export DISPLAY=:99.0 && sh -e /etc/init.d/xvfb start ; - else + elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew tap PX4/homebrew-px4 && brew update && brew install qt54 diff --git a/QGCInstaller.pri b/QGCInstaller.pri index e529a62f1..581507faa 100644 --- a/QGCInstaller.pri +++ b/QGCInstaller.pri @@ -50,4 +50,7 @@ installer { #QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY qgroundcontrol.pdb $${DESTDIR_WIN} #QMAKE_POST_LINK += $$escape_expand(\\n) del qgroundcontrol.pdb } + LinuxBuild { + QMAKE_POST_LINK += && tar -cjf qgroundcontrol.tar.bz2 release --transform 's/release/qgroundcontrol/' + } } -- 2.22.0