Browse Source

Merge pull request #3880 from DonLakeFlyer/Stable_V3.0

Stable v3.0 installer fixes
QGC4.4
Don Gagne 9 years ago committed by GitHub
parent
commit
808624d846
  1. 4
      QGCInstaller.pri
  2. 1
      deploy/qgroundcontrol_installer.nsi

4
QGCInstaller.pri

@ -27,9 +27,9 @@ installer { @@ -27,9 +27,9 @@ installer {
# qgroundcontrol.app file. If you specify a path to the .app file the symbolic
# links to plugins will not be created correctly.
QMAKE_POST_LINK += && mkdir -p $${DESTDIR}/package
QMAKE_POST_LINK += && cd $${DESTDIR} && $$dirname(QMAKE_QMAKE)/macdeployqt qgroundcontrol.app -appstore-compliant -verbose=2 -qmldir=$${BASEDIR}/src
QMAKE_POST_LINK += && cd $${DESTDIR} && $$dirname(QMAKE_QMAKE)/macdeployqt QGroundControl.app -appstore-compliant -verbose=2 -qmldir=$${BASEDIR}/src
QMAKE_POST_LINK += && cd $${OUT_PWD}
QMAKE_POST_LINK += && hdiutil create -verbose -stretch 1g -layout SPUD -srcfolder $${DESTDIR}/qgroundcontrol.app -volname QGroundControl $${DESTDIR}/package/QGroundControl.dmg
QMAKE_POST_LINK += && hdiutil create -verbose -stretch 1g -layout SPUD -srcfolder $${DESTDIR}/QGroundControl.app -volname QGroundControl $${DESTDIR}/package/QGroundControl.dmg
}
WindowsBuild {
# The pdb moving command are commented out for now since we are including the .pdb in the installer. This makes it much

1
deploy/qgroundcontrol_installer.nsi

@ -44,7 +44,6 @@ InstallDir $PROGRAMFILES\qgroundcontrol @@ -44,7 +44,6 @@ InstallDir $PROGRAMFILES\qgroundcontrol
!define MUI_HEADERIMAGE
!define MUI_HEADERIMAGE_BITMAP "installheader.bmp";
!insertmacro MUI_PAGE_LICENSE "license.txt"
!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES

Loading…
Cancel
Save