From b33ed2393afc5db3a6d78faffa631eb1128f3125 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Tue, 5 Apr 2016 00:01:30 -0400 Subject: [PATCH] travis-ci create Linux AppImage -closes #2913 --- .travis.yml | 4 ++ deploy/create_linux_appimage.sh | 54 +++++++++++++++++++++++++ deploy/linux_create_debian_packet.sh | 13 ------ testlog.txt | 15 ------- testlog2.txt | 59 ---------------------------- 5 files changed, 58 insertions(+), 87 deletions(-) create mode 100755 deploy/create_linux_appimage.sh delete mode 100644 deploy/linux_create_debian_packet.sh delete mode 100644 testlog.txt delete mode 100644 testlog2.txt diff --git a/.travis.yml b/.travis.yml index 4e661e025..385f7f6ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -188,6 +188,10 @@ script: fi after_success: + - if [[ "${TRAVIS_OS_NAME}" = "linux" && "${CONFIG}" = "installer" ]]; then + ${TRAVIS_BUILD_DIR}/deploy/create_linux_appimage.sh + ; + fi - if [ "${TRAVIS_TAG}" ]; then export GOOGLE_PLAY_TRACK=production; else diff --git a/deploy/create_linux_appimage.sh b/deploy/create_linux_appimage.sh new file mode 100755 index 000000000..10edd6a45 --- /dev/null +++ b/deploy/create_linux_appimage.sh @@ -0,0 +1,54 @@ +#!/bin/bash -x + +set +e + +# Generate AppImage using the binaries currently provided by the project. +# These require at least GLIBC 2.14, which older distributions might not have. +# On the other hand, 2.14 is not that recent so maybe we can just live with it. + +APP=qgroundcontrol + +mkdir -p /tmp/$APP/$APP.AppDir +cd /tmp/$APP/ +tar xf ${SHADOW_BUILD_DIR}/release/package/qgroundcontrol.tar.bz2 + +wget -c http://ftp.us.debian.org/debian/pool/main/u/udev/udev_175-7.2_amd64.deb +wget -c http://ftp.us.debian.org/debian/pool/main/e/espeak/espeak_1.46.02-2_amd64.deb +wget -c http://ftp.us.debian.org/debian/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5_amd64.deb + +cd $APP.AppDir/ + +mv ../qgroundcontrol/* . +mv qgroundcontrol-start.sh AppRun +find ../ -name *.deb -exec dpkg -x {} . \; + +# Get icon +cp ${TRAVIS_BUILD_DIR}/resources/icons/qgroundcontrol.png . + +cat > ./qgroundcontrol.desktop <<\EOF +[Desktop Entry] +Type=Application +Name=QGroundControl +GenericName=Ground Control Station +Comment=UAS ground control station +Icon=qgroundcontrol +Exec=AppRun +Terminal=false +Categories=Utility; +Keywords=computer; +EOF + +VERSION=$(strings qgroundcontrol | grep v[0-9*]\.[0-9*]\.[0-9*]-[0-9*] | head -n 1) + +# Go out of AppImage +cd .. + +wget -c "https://github.com/probonopd/AppImageKit/releases/download/5/AppImageAssistant" # (64-bit) +chmod a+x ./AppImageAssistant +mkdir -p ../out +rm ../out/$APP".AppImage" || true +./AppImageAssistant ./$APP.AppDir/ ../out/$APP".AppImage" + +# s3 deploys everything in release/package +cp ../out/$APP".AppImage" ${SHADOW_BUILD_DIR}/release/package/$APP".AppImage" + diff --git a/deploy/linux_create_debian_packet.sh b/deploy/linux_create_debian_packet.sh deleted file mode 100644 index 8bd436bbd..000000000 --- a/deploy/linux_create_debian_packet.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# Clean build directories -rm -rf linux -mkdir -p linux -# Change to build directory and compile application -cd .. -make -j4 -# Copy and build the application bundle -cd deploy -cp -r qgroundcontrol linux/. -cp -r ../audio linux/. -# FIXME Create debian packet -echo -e '\n QGroundControl Debian packet is now ready for publishing\n' diff --git a/testlog.txt b/testlog.txt deleted file mode 100644 index 2c2f943fe..000000000 --- a/testlog.txt +++ /dev/null @@ -1,15 +0,0 @@ -x y z -0 1 2 -1 2 3 -2 3 4 -3 4 5 -4 5 6 -5 10 15 -6 11 16 -7 12 19 -8 14 21 -9 15 21 -10 17 25 -200 200 200 -250 250 280 -300 320 340 \ No newline at end of file diff --git a/testlog2.txt b/testlog2.txt deleted file mode 100644 index 05faada91..000000000 --- a/testlog2.txt +++ /dev/null @@ -1,59 +0,0 @@ -unix_timestamp Accel._X Accel._Y Accel._Z Battery Bottom_Rotor CPU_Load Ground_Dist. Gyro_Phi Gyro_Psi Gyro_Theta Left_Servo Mag._X Mag._Y Mag._Z Pressure Right_Servo Temperature Top_Rotor pitch_IMU roll_IMU yaw_IMU -1270125571544 5 -197 982 0 29685 29866 29888 0 0 0 96186 354 -0.112812 0.13585 -1.94192 -1270125571564 6 -198 983 0 29781 29995 29871 0 0 0 96183 354 -0.112085 0.137193 -1.94139 -1270125571584 10 -197 982 0 29739 30018 29867 0 0 0 96171 354 -0.111693 0.136574 -1.94353 -1270125571604 7 -198 982 0 29802 29911 29803 0 0 0 96177 354 -0.112179 0.135778 -1.94617 -1270125571645 4 -197 984 0 29782 29844 29844 0 0 0 96180 354 -0.113056 0.135965 -1.94715 -1270125571665 4 -200 985 0 29685 29867 29884 0 0 0 96183 354 -0.113231 0.135327 -1.94586 -1270125571685 7 -198 983 0 29757 30018 29829 0 0 0 96177 354 -0.112604 0.136857 -1.94508 -1270125571706 6 -198 982 0 29759 29992 29867 0 0 0 96183 354 -0.1126 0.136602 -1.94915 -1270125571746 7 -196 985 0 29803 29910 29800 0 0 0 96183 354 -0.112392 0.136709 -1.95079 -1270125571766 4 -198 981 0 29750 29828 29888 0 0 0 96186 354 -0.113342 0.135532 -1.95064 -1270125571787 5 -197 984 0 29759 29931 29881 0 0 0 96174 354 -0.112628 0.135657 -1.9488 -1270125571807 10 -197 982 0 29739 29958 29819 0 0 0 96174 354 -0.112506 0.135777 -1.95001 -1270125571847 4 -198 981 0 29786 29829 29864 0 0 0 96232 356 -0.112359 0.135253 -1.94825 -1270125571867 5 -201 978 0 29719 29856 29890 0 0 0 96218 356 -0.11218 0.134669 -1.94657 -1270125571888 7 -198 986 0 29782 29813 29845 0 0 0 96223 356 -0.111451 0.135688 -1.9455 -1270125571908 10 -200 984 0 29693 30048 29885 0 0 0 96215 356 -0.110745 0.1365 -1.94668 -1270125571948 5 -197 982 0 29757 29899 29844 0 0 0 96229 356 -0.110004 0.135859 -1.94573 -1270125571969 6 -197 983 0 29727 29829 29814 0 0 0 96249 356 -0.110316 0.135751 -1.94565 -1270125571989 6 -197 978 0 29790 29828 29815 0 0 0 96220 356 -0.111159 0.136244 -1.94416 -1270125572009 5 -194 983 0 29718 29856 29890 0 0 0 96229 356 -0.111216 0.135992 -1.94196 -1270125572050 3 -196 985 0 29739 29978 29827 0 0 0 96223 356 -0.110727 0.136577 -1.94402 -1270125572070 8 -198 982 0 29782 29829 29815 0 0 0 96235 356 -0.111423 0.136697 -1.94566 -1270125572090 8 -195 982 0 29687 29865 29894 0 0 0 96218 356 -0.112088 0.136097 -1.9442 -1270125572130 8 -198 986 0 29793 29859 29844 0 0 0 96244 356 -0.110282 0.137491 -1.94235 -1270125572171 6 -198 982 0 29790 29856 29879 0 0 0 96244 356 -0.112179 0.136971 -1.94365 -1270125572191 3 -198 980 0 29759 30018 29829 0 0 0 96218 356 -0.111623 0.136194 -1.94286 -1270125572211 7 -198 984 0 29758 29829 29846 0 0 0 96229 356 -0.112275 0.136007 -1.94387 -1270125572252 8 -197 980 0 29743 30018 29824 0 0 0 96215 356 -0.111515 0.135539 -1.94281 -1270125572272 11 -195 984 0 29741 29867 29844 0 0 0 96249 356 -0.111995 0.135753 -1.94527 -1270125572292 4 -200 984 0 29771 29980 29865 0 0 0 96215 356 -0.111913 0.135829 -1.94455 -1270125572312 6 -198 983 0 29792 29837 29845 0 0 0 96229 356 -0.111884 0.134861 -1.94478 -1270125572353 5 -196 983 0 29685 29867 29884 0 0 0 96238 356 -0.111332 0.135644 -1.94784 -1270125572373 5 -198 982 0 29693 29852 29904 0 0 0 96238 356 -0.110772 0.136927 -1.94698 -1270125572393 6 -195 982 0 29738 29791 29818 0 0 0 96229 356 -0.109851 0.138106 -1.94592 -1270125572414 8 -198 986 0 29782 29844 29829 0 0 0 96223 356 -0.111077 0.137396 -1.9428 -1270125572454 11 -198 983 0 29743 29986 29833 0 0 0 96220 356 -0.110257 0.136744 -1.94155 -1270125572474 6 -198 983 0 29749 29866 29813 0 0 0 96223 356 -0.110497 0.136917 -1.94351 -1270125572495 6 -197 984 0 29719 29828 29890 0 0 0 96223 356 -0.111349 0.136959 -1.94295 -1270125572515 7 -197 983 0 29760 29791 29818 0 0 0 96232 356 -0.111323 0.137251 -1.93972 -1270125572555 10 -198 984 0 29800 30016 29857 0 0 0 96241 356 -0.110873 0.137041 -1.94196 -1270125572575 5 -200 982 0 29760 29962 29866 0 0 0 96232 356 -0.110648 0.136038 -1.9445 -1270125572596 4 -197 983 0 29740 30024 29867 0 0 0 96238 356 -0.110486 0.136046 -1.94576 -1270125572616 8 -196 985 0 29802 29783 29808 0 0 0 96235 356 -0.111227 0.135128 -1.94567 -1270125572656 5 -198 986 0 29771 29972 29867 0 0 0 96229 356 -0.111182 0.133833 -1.94823 -1270125572697 8 -196 980 0 29739 29978 29803 0 0 0 96238 356 -0.111457 0.133602 -1.94682 -1270125572717 4 -196 983 0 29749 30026 29867 0 0 0 96235 356 -0.116038 0.131922 -1.93861 -1270125592944 5 -195 985 0 29757 29994 29871 0 0 0 96220 356 -0.115848 0.1323 -1.93916 -1270125593025 5 -200 986 0 29780 29844 29845 0 0 0 96235 356 -0.115273 0.132222 -1.93576 -1270125593045 5 -197 982 0 29757 29995 29871 0 0 0 96229 356 -0.114713 0.132137 -1.93723 -1270125593086 4 -197 984 0 29802 29847 29819 0 0 0 96241 356 -0.114815 0.131529 -1.93626 -1270125593106 6 -202 984 0 29802 29783 29803 0 0 0 96247 356 -0.115379 0.130754 -1.93546 -1270125593126 8 -196 982 0 29803 29918 29793 0 0 0 96229 356 -0.116136 0.130336 -1.93339 -1270125593146 6 -196 987 0 29802 29825 29802 0 0 0 96244 356 -0.117635 0.128822 -1.93292 -1270125593187 7 -197 978 0 29802 29825 29864 0 0 0 96238 356 -0.117592 0.128252 -1.93468 -1270125593207 7 -197 980 0 29803 29918 29771 0 0 0 96235 356 -0.116961 0.127734 -1.93337 -1270125593227 6 -200 982 0 29733 29994 29867 0 0 0 96241 356 -0.11821 0.127208 -1.93399 -1270125593247 7 -194 984 0 29739 29982 29888 0 0 0 96235 356 -0.116428 0.128791 -1.9378 -1270125593288 10 -197 985 0 29771 30000 29865 0 0 0 96238 356 -0.116243 0.128666 -1.93672 \ No newline at end of file -- 2.22.0