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
808624d8
Commit
808624d8
authored
Jul 28, 2016
by
Don Gagne
Committed by
GitHub
Jul 28, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3880 from DonLakeFlyer/Stable_V3.0
Stable v3.0 installer fixes
parents
da7367f7
06f34209
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
QGCInstaller.pri
QGCInstaller.pri
+2
-2
qgroundcontrol_installer.nsi
deploy/qgroundcontrol_installer.nsi
+0
-1
No files found.
QGCInstaller.pri
View file @
808624d8
...
@@ -27,9 +27,9 @@ installer {
...
@@ -27,9 +27,9 @@ installer {
# 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 += && mkdir -p $${DESTDIR}/package
QMAKE_POST_LINK += && mkdir -p $${DESTDIR}/package
QMAKE_POST_LINK += && cd $${DESTDIR} && $$dirname(QMAKE_QMAKE)/macdeployqt
qgroundc
ontrol.app -appstore-compliant -verbose=2 -qmldir=$${BASEDIR}/src
QMAKE_POST_LINK += && cd $${DESTDIR} && $$dirname(QMAKE_QMAKE)/macdeployqt
QGroundC
ontrol.app -appstore-compliant -verbose=2 -qmldir=$${BASEDIR}/src
QMAKE_POST_LINK += && cd $${OUT_PWD}
QMAKE_POST_LINK += && cd $${OUT_PWD}
QMAKE_POST_LINK += && hdiutil create -verbose -stretch 1g -layout SPUD -srcfolder $${DESTDIR}/
qgroundc
ontrol.app -volname QGroundControl $${DESTDIR}/package/QGroundControl.dmg
QMAKE_POST_LINK += && hdiutil create -verbose -stretch 1g -layout SPUD -srcfolder $${DESTDIR}/
QGroundC
ontrol.app -volname QGroundControl $${DESTDIR}/package/QGroundControl.dmg
}
}
WindowsBuild {
WindowsBuild {
# The pdb moving command are commented out for now since we are including the .pdb in the installer. This makes it much
# The pdb moving command are commented out for now since we are including the .pdb in the installer. This makes it much
...
...
deploy/qgroundcontrol_installer.nsi
View file @
808624d8
...
@@ -44,7 +44,6 @@ InstallDir $PROGRAMFILES\qgroundcontrol
...
@@ -44,7 +44,6 @@ InstallDir $PROGRAMFILES\qgroundcontrol
!define MUI_HEADERIMAGE
!define MUI_HEADERIMAGE
!define MUI_HEADERIMAGE_BITMAP "installheader.bmp";
!define MUI_HEADERIMAGE_BITMAP "installheader.bmp";
!insertmacro MUI_PAGE_LICENSE "license.txt"
!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_PAGE_INSTFILES
...
...
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