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
1d738853
Commit
1d738853
authored
Nov 12, 2015
by
Daniel Agar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix android packaging
parent
e6a73c8c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
QGCInstaller.pri
QGCInstaller.pri
+5
-5
No files found.
QGCInstaller.pri
View file @
1d738853
...
@@ -36,7 +36,7 @@ installer {
...
@@ -36,7 +36,7 @@ installer {
# We cd to release directory so we can run macdeployqt without a path to the
# We cd to release directory so we can run macdeployqt without a path to the
# qgroundcontrol.app file. If you specify a path to the .app file the symbolic
# qgroundcontrol.app file. If you specify a path to the .app file the symbolic
# links to plugins will not be created correctly.
# links to plugins will not be created correctly.
QMAKE_POST_LINK += &&
cd $${DESTDIR} && mkdir
package
QMAKE_POST_LINK += &&
mkdir -p $${DESTDIR}/
package
QMAKE_POST_LINK += && $$dirname(QMAKE_QMAKE)/macdeployqt qgroundcontrol.app -verbose=2 -qmldir=$${BASEDIR}/src
QMAKE_POST_LINK += && $$dirname(QMAKE_QMAKE)/macdeployqt qgroundcontrol.app -verbose=2 -qmldir=$${BASEDIR}/src
QMAKE_POST_LINK += && cd $${OUT_PWD}
QMAKE_POST_LINK += && cd $${OUT_PWD}
QMAKE_POST_LINK += && hdiutil create -layout SPUD -srcfolder $${DESTDIR}/qgroundcontrol.app -volname QGroundControl $${DESTDIR}/package/qgroundcontrol.dmg
QMAKE_POST_LINK += && hdiutil create -layout SPUD -srcfolder $${DESTDIR}/qgroundcontrol.app -volname QGroundControl $${DESTDIR}/package/qgroundcontrol.dmg
...
@@ -58,9 +58,9 @@ installer {
...
@@ -58,9 +58,9 @@ installer {
}
}
AndroidBuild {
AndroidBuild {
#-- TODO: This uses hardcoded paths. It should use $${DESTDIR}
#-- TODO: This uses hardcoded paths. It should use $${DESTDIR}
QMAKE_POST_LINK += && mkdir -p
release
/package
QMAKE_POST_LINK += && mkdir -p
$${DESTDIR}
/package
QMAKE_POST_LINK += && make install INSTALL_ROOT=
release
/android-build/
QMAKE_POST_LINK += && make install INSTALL_ROOT=
$${DESTDIR}
/android-build/
QMAKE_POST_LINK += && androiddeployqt --input android-libqgroundcontrol.so-deployment-settings.json --output
release/android-build --deployment bundled --gradle --sign
android/android_release.keystore dagar --storepass $$(ANDROID_STOREPASS)
QMAKE_POST_LINK += && androiddeployqt --input android-libqgroundcontrol.so-deployment-settings.json --output
$${DESTDIR}/android-build --deployment bundled --gradle --sign $${BASEDIR}/
android/android_release.keystore dagar --storepass $$(ANDROID_STOREPASS)
QMAKE_POST_LINK += && cp
release/android-build/build/outputs/apk/android-build-release-signed.apk release
/package/qgroundcontrol.apk
QMAKE_POST_LINK += && cp
$${DESTDIR}/android-build/build/outputs/apk/android-build-release-signed.apk $${DESTDIR}
/package/qgroundcontrol.apk
}
}
}
}
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