rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

LP-406 win installer: change section order

Browse Source
This commit is contained in:
Philippe Renon 2016-09-21 23:11:29 +02:00
parent 018e2dfb14
commit c693e40783
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
package/winx86/gcs.nsi
View File

@ -156,7 +156,7 @@
; Installer sections ; Installer sections
; Copy GCS core files ; Copy GCS core files
Section "Core files" InSecCore Section "${GCS_BIG_NAME}" InSecCore
SectionIn RO SectionIn RO
SetOutPath "$INSTDIR\bin" SetOutPath "$INSTDIR\bin"
File /r "${GCS_BUILD_TREE}\bin\*" File /r "${GCS_BUILD_TREE}\bin\*"
@ -195,36 +195,6 @@ Section "-Utilities" InSecUtilities
File "/oname=OPLogConvert-${PACKAGE_LBL}.m" "${UAVO_SYNTH_TREE}\matlab\OPLogConvert.m" File "/oname=OPLogConvert-${PACKAGE_LBL}.m" "${UAVO_SYNTH_TREE}\matlab\OPLogConvert.m"
SectionEnd SectionEnd
; Copy driver files
Section "-Drivers" InSecDrivers
SetOutPath "$INSTDIR\drivers"
File /r "${PROJECT_ROOT}\flight\Project\WindowsUSB\*"
SectionEnd
; Preinstall OpenPilot CDC driver
Section /o "CDC driver" InSecInstallDrivers
InitPluginsDir
SetOutPath "$PLUGINSDIR"
${If} ${RunningX64}
File "/oname=dpinst.exe" "${NSIS_DATA_TREE}\redist\dpinst_x64.exe"
${Else}
File "/oname=dpinst.exe" "${NSIS_DATA_TREE}\redist\dpinst_x86.exe"
${EndIf}
ExecWait '"$PLUGINSDIR\dpinst.exe" /lm /path "$INSTDIR\drivers"'
SectionEnd
; Copy Opengl32.dll if needed (disabled by default)
Section /o "Mesa OpenGL driver" InSecInstallOpenGL
SetOutPath "$INSTDIR\bin"
File /r "${GCS_BUILD_TREE}\bin\opengl32\opengl32.dll"
SectionEnd
; AeroSimRC plugin files
Section "AeroSimRC plugin" InSecAeroSimRC
SetOutPath "$INSTDIR\misc\AeroSIM-RC"
File /r "${AEROSIMRC_TREE}\*"
SectionEnd
Section "Shortcuts" InSecShortcuts Section "Shortcuts" InSecShortcuts
; Create desktop and start menu shortcuts ; Create desktop and start menu shortcuts
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
@ -252,6 +222,36 @@ Section "Shortcuts" InSecShortcuts
CreateShortCut "$SMPROGRAMS\${ORG_BIG_NAME}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 CreateShortCut "$SMPROGRAMS\${ORG_BIG_NAME}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
SectionEnd SectionEnd
; AeroSimRC plugin files
Section "AeroSimRC plugin" InSecAeroSimRC
SetOutPath "$INSTDIR\misc\AeroSIM-RC"
File /r "${AEROSIMRC_TREE}\*"
SectionEnd
; Copy driver files (hidden, driver is always copied to install directory)
Section "-Drivers" InSecDrivers
SetOutPath "$INSTDIR\drivers"
File /r "${PROJECT_ROOT}\flight\Project\WindowsUSB\*"
SectionEnd
; Preinstall OpenPilot CDC driver (disabled by default)
Section /o "CDC driver" InSecInstallDrivers
InitPluginsDir
SetOutPath "$PLUGINSDIR"
${If} ${RunningX64}
File "/oname=dpinst.exe" "${NSIS_DATA_TREE}\redist\dpinst_x64.exe"
${Else}
File "/oname=dpinst.exe" "${NSIS_DATA_TREE}\redist\dpinst_x86.exe"
${EndIf}
ExecWait '"$PLUGINSDIR\dpinst.exe" /lm /path "$INSTDIR\drivers"'
SectionEnd
; Copy Opengl32.dll if needed (disabled by default)
Section /o "Mesa OpenGL driver" InSecInstallOpenGL
SetOutPath "$INSTDIR\bin"
File /r "${GCS_BUILD_TREE}\bin\opengl32\opengl32.dll"
SectionEnd
Section ; create uninstall info Section ; create uninstall info
; Write the installation path into the registry ; Write the installation path into the registry
WriteRegStr HKCU "Software\${ORG_BIG_NAME}" "Install Location" $INSTDIR WriteRegStr HKCU "Software\${ORG_BIG_NAME}" "Install Location" $INSTDIR