Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
d3df08b7
Commit
d3df08b7
authored
Jun 12, 2016
by
Daniel Agar
Committed by
GitHub
Jun 12, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
appimage add libdirectfb-1.2-9 (#3531)
-general cleanup
parent
13bf81aa
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
62 additions
and
28 deletions
+62
-28
.travis.yml
.travis.yml
+2
-1
QGCSetup.pri
QGCSetup.pri
+2
-0
Vagrantfile
Vagrantfile
+1
-1
create_linux_appimage.sh
deploy/create_linux_appimage.sh
+51
-23
qgroundcontrol-start.sh
deploy/qgroundcontrol-start.sh
+4
-0
qgroundcontrol.desktop
deploy/qgroundcontrol.desktop
+2
-3
No files found.
.travis.yml
View file @
d3df08b7
...
...
@@ -199,7 +199,7 @@ script:
after_success
:
-
if [[ "${TRAVIS_OS_NAME}" = "linux" && "${CONFIG}" = "installer" ]]; then
${TRAVIS_BUILD_DIR}/deploy/create_linux_appimage.sh
${TRAVIS_BUILD_DIR}/deploy/create_linux_appimage.sh
${TRAVIS_BUILD_DIR} ${SHADOW_BUILD_DIR}/release ${SHADOW_BUILD_DIR}/release/package
;
fi
-
if [ "${TRAVIS_TAG}" ]; then
...
...
@@ -238,6 +238,7 @@ deploy:
file_glob
:
true
file
:
-
${SHADOW_BUILD_DIR}/release/package/qgroundcontrol.*
-
${SHADOW_BUILD_DIR}/release/package/QGroundControl.*
skip_cleanup
:
true
on
:
tags
:
true
...
...
QGCSetup.pri
View file @
d3df08b7
...
...
@@ -154,6 +154,8 @@ LinuxBuild {
# QGroundControl start script
QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/deploy/qgroundcontrol-start.sh $$DESTDIR
QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/deploy/qgroundcontrol.desktop $$DESTDIR
QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/resources/icons/qgroundcontrol.png $$DESTDIR
}
}
Vagrantfile
View file @
d3df08b7
...
...
@@ -17,7 +17,7 @@ Vagrant.configure(2) do |config|
# the "dev configuration puts the build products and a suitable
# environment into the /vagrant directory. This allows you to run
# qgroundcontrol on the host machine with:
# "cd shadow-build/release; .
./../deploy
/qgroundcontrol-start.sh"
# "cd shadow-build/release; ./qgroundcontrol-start.sh"
$config_shell
=
<<-
'SHELL'
sudo apt-get update -y
...
...
deploy/create_linux_appimage.sh
View file @
d3df08b7
...
...
@@ -2,28 +2,58 @@
set
+e
if
[[
$#
-eq
0
]]
;
then
echo
'create_linux_appimage.sh QGC_SRC_DIR QGC_RELEASE_DIR'
exit
1
fi
QGC_SRC
=
$1
if
[
!
-f
${
QGC_SRC
}
/qgroundcontrol.pro
]
;
then
echo
'please specify path to qgroundcontrol source as the 1st argument'
exit
1
fi
QGC_RELEASE_DIR
=
$2
if
[
!
-f
${
QGC_RELEASE_DIR
}
/qgroundcontrol
]
;
then
echo
'please specify path to qgroundcontrol release as the 2nd argument'
exit
1
fi
OUTPUT_DIR
=
${
3
-
`
pwd
`
}
echo
"Output directory:"
${
OUTPUT_DIR
}
# 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
APP
=
QGroundControl
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
TMPDIR
=
`
mktemp
-d
`
APPDIR
=
${
TMPDIR
}
/
$APP
".AppDir"
mkdir
-p
${
APPDIR
}
cd
$APP
.AppDir/
cd
${
TMPDIR
}
wget
-c
--quiet
http://ftp.us.debian.org/debian/pool/main/u/udev/udev_175-7.2_amd64.deb
wget
-c
--quiet
http://ftp.us.debian.org/debian/pool/main/e/espeak/espeak_1.46.02-2_amd64.deb
wget
-c
--quiet
http://ftp.us.debian.org/debian/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5_amd64.deb
mv
../qgroundcontrol/
*
.
mv
qgroundcontrol-start.sh AppRun
cd
${
APPDIR
}
find ../
-name
*
.deb
-exec
dpkg
-x
{}
.
\;
# Get icon
cp
${
TRAVIS_BUILD_DIR
}
/resources/icons/qgroundcontrol.png
.
# copy libdirectfb-1.2.so.9
cd
${
TMPDIR
}
wget
-c
--quiet
http://ftp.us.debian.org/debian/pool/main/d/directfb/libdirectfb-1.2-9_1.2.10.0-5.1_amd64.deb
mkdir
libdirectfb
dpkg
-x
libdirectfb-1.2-9_1.2.10.0-5.1_amd64.deb libdirectfb
cp
-L
libdirectfb/usr/lib/x86_64-linux-gnu/libdirectfb-1.2.so.9
${
APPDIR
}
/usr/lib/x86_64-linux-gnu/
# copy QGroundControl release into appimage
cp
-r
${
QGC_RELEASE_DIR
}
/
*
${
APPDIR
}
/
rm
-rf
${
APPDIR
}
/package
mv
${
APPDIR
}
/qgroundcontrol-start.sh
${
APPDIR
}
/AppRun
# copy icon
cp
${
QGC_SRC
}
/resources/icons/qgroundcontrol.png
${
APPDIR
}
/
cat
>
./qgroundcontrol.desktop
<<
\
EOF
[Desktop Entry]
...
...
@@ -31,24 +61,22 @@ Type=Application
Name=QGroundControl
GenericName=Ground Control Station
Comment=UAS ground control station
Icon=qgroundcontrol
.png
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
)
VERSION
=
$(
strings
${
APPDIR
}
/qgroundcontrol |
grep
'^v[0-9*]\.[0-9*].[0-9*]'
|
head
-n
1
)
echo
QGC Version:
${
VERSION
}
# Go out of AppImage
cd
..
wget
-c
"https://github.com/probonopd/AppImageKit/releases/download/5/AppImageAssistant"
# (64-bit)
cd
${
TMPDIR
}
wget
-c
--quiet
"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"
./AppImageAssistant ./
$APP
.AppDir/
${
TMPDIR
}
/
$APP
".AppImage"
cp
${
TMPDIR
}
/
$APP
".AppImage"
${
OUTPUT_DIR
}
/
$APP
".AppImage"
deploy/qgroundcontrol-start.sh
View file @
d3df08b7
...
...
@@ -3,4 +3,8 @@ HERE="$(dirname "$(readlink -f "${0}")")"
export
LD_LIBRARY_PATH
=
"
${
HERE
}
/usr/lib/x86_64-linux-gnu"
:
"
${
HERE
}
/Qt/libs"
:
$LD_LIBRARY_PATH
export
QML2_IMPORT_PATH
=
"
${
HERE
}
/Qt/qml"
export
QT_PLUGIN_PATH
=
"
${
HERE
}
/Qt/plugins"
# hack until icon issue with AppImage is resolved
mkdir
-p
~/.icons
&&
cp
${
HERE
}
/qgroundcontrol.png ~/.icons
"
${
HERE
}
/qgroundcontrol"
"
$@
"
qgroundcontrol.desktop
→
deploy/
qgroundcontrol.desktop
View file @
d3df08b7
[Desktop Entry]
Type=Application
Name=
qgroundc
ontrol
Name=
QGroundC
ontrol
GenericName=Ground Control Station
Comment=UAS ground control station
Icon=qgroundcontrol
Exec=qgroundcontrol
Exec=qgroundcontrol
-start.sh
Terminal=false
Categories=Utility;
Keywords=computer;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment