Merge remote-tracking branch 'origin/os/win-installer-update' into next

HISTORY.txt

@@ -1,5 +1,13 @@
 Short summary of changes.  For a complete list see the git log.
 
+2012-07-10
+On Windows the installation mode was changed from per-user to per-machine
+(for all users) installation.  It is recommended to completely uninstall
+previous version before installing new one to remove per-user installed
+files.  Per-machine installation requires elevated (administrator) previleges
+during install.  But since the same rights are now required to install
+optional CDC driver (virtual communication port), it was deemed acceptable.
+
 2012-06-04
 AeroSimRC support merged into next
 

package/winx86/openpilotgcs.nsi

@@ -1,7 +1,7 @@
 #
 # Project: OpenPilot
 # NSIS configuration file for OpenPilot GCS
-# The OpenPilot Team, http://www.openpilot.org, Copyright (C) 2010-2011.
+# The OpenPilot Team, http://www.openpilot.org, Copyright (C) 2010-2012.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,14 +21,15 @@
 # This script requires Unicode NSIS 2.46 or higher:
 # http://www.scratchpaper.com/
 
-# Features:
-#  - Installs to the user local appdata path, no admin rights required.
-#
 # TODO:
-#  - optionally install for all users (to Program Files with admin rights on Vista/7).
 #  - install only built/used modules, not a whole directory.
 #  - remove only installed files, not a whole directory.
 
+;--------------------------------
+; Includes
+
+!include "x64.nsh"
+
 ;--------------------------------
 ; Paths
 
@@ -36,12 +37,13 @@
   !define PROJECT_ROOT   "..\.."
   !define NSIS_DATA_TREE "."
   !define GCS_BUILD_TREE "..\..\build\ground\openpilotgcs"
+  !define UAVO_SYNTH_TREE "..\..\build\uavobject-synthetics"
 
   ; Default installation folder
-  InstallDir "$LOCALAPPDATA\OpenPilot"
+  InstallDir "$PROGRAMFILES\OpenPilot"
 
   ; Get installation folder from registry if available
-  InstallDirRegKey HKCU "Software\OpenPilot" "Install Location"
+  InstallDirRegKey HKLM "Software\OpenPilot" "Install Location"
 
 ;--------------------------------
 ; Version information
@@ -82,7 +84,7 @@
   XPStyle on
 
   ; Request application privileges for Windows Vista/7
-  RequestExecutionLevel user
+  RequestExecutionLevel admin
 
   ; Compression level
   SetCompressor /solid lzma
@@ -90,7 +92,7 @@
 ;--------------------------------
 ; Branding
 
-  BrandingText "© 2010-2011 The OpenPilot Team, http://www.openpilot.org"
+  BrandingText "© 2010-2012 The OpenPilot Team, http://www.openpilot.org"
 
   !define MUI_ICON "${NSIS_DATA_TREE}\resources\openpilot.ico"
   !define MUI_HEADERIMAGE
@@ -113,6 +115,7 @@
 ;--------------------------------
 ; Settings for MUI_PAGE_FINISH
   !define MUI_FINISHPAGE_RUN
+  !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\HISTORY.txt"
   !define MUI_FINISHPAGE_RUN_FUNCTION "RunApplication"
 
 ;--------------------------------
@@ -148,6 +151,7 @@
 ;--------------------------------
 ; Installer sections
 
+; Copy GCS core files
 Section "Core files" InSecCore
   SectionIn RO
   SetOutPath "$INSTDIR\bin"
@@ -156,6 +160,7 @@ Section "Core files" InSecCore
   File "${PROJECT_ROOT}\HISTORY.txt"
 SectionEnd
 
+; Copy GCS plugins
 Section "Plugins" InSecPlugins
   SectionIn RO
   SetOutPath "$INSTDIR\lib\openpilotgcs\plugins"
@@ -163,6 +168,7 @@ Section "Plugins" InSecPlugins
   File /r "${GCS_BUILD_TREE}\lib\openpilotgcs\plugins\*.pluginspec"
 SectionEnd
 
+; Copy GCS resources
 Section "Resources" InSecResources
   SetOutPath "$INSTDIR\share\openpilotgcs\diagrams"
   File /r "${GCS_BUILD_TREE}\share\openpilotgcs\diagrams\*"
@@ -176,22 +182,51 @@ Section "Resources" InSecResources
   File /r "${GCS_BUILD_TREE}\share\openpilotgcs\pfd\*"
 SectionEnd
 
+; Copy Notify plugin sound files
 Section "Sound files" InSecSounds
   SetOutPath "$INSTDIR\share\openpilotgcs\sounds"
   File /r "${GCS_BUILD_TREE}\share\openpilotgcs\sounds\*"
 SectionEnd
 
+; Copy localization files
+; Disabled until GCS source is stable and properly localized
 Section "Localization" InSecLocalization
   SetOutPath "$INSTDIR\share\openpilotgcs\translations"
 ; File /r "${GCS_BUILD_TREE}\share\openpilotgcs\translations\openpilotgcs_*.qm"
   File /r "${GCS_BUILD_TREE}\share\openpilotgcs\translations\qt_*.qm"
 SectionEnd
 
+; Copy firmware files
 Section "Firmware" InSecFirmware
 ; SetOutPath "$INSTDIR\firmware\${FIRMWARE_DIR}"
 ; File /r "${PACKAGE_DIR}\${FIRMWARE_DIR}\*"
   SetOutPath "$INSTDIR\firmware"
-  File /r "${PACKAGE_DIR}\${FIRMWARE_DIR}\fw_coptercontrol-${PACKAGE_LBL}.opfw"
+  File "${PACKAGE_DIR}\${FIRMWARE_DIR}\fw_coptercontrol-${PACKAGE_LBL}.opfw"
+  File "${PACKAGE_DIR}\${FIRMWARE_DIR}\fw_pipxtreme-${PACKAGE_LBL}.opfw"
+SectionEnd
+
+; Copy utility files
+Section "-Utilities" InSecUtilities
+  SetOutPath "$INSTDIR\utilities"
+  File "/oname=OPLogConvert-${PACKAGE_LBL}.m" "${UAVO_SYNTH_TREE}\matlab\OPLogConvert.m"
+SectionEnd
+
+; Copy driver files
+Section "-Drivers" InSecDrivers
+  SetOutPath "$INSTDIR\drivers"
+  File "${PROJECT_ROOT}\flight\Project\Windows USB\OpenPilot-CDC.inf"
+SectionEnd
+
+; Preinstall OpenPilot CDC driver
+Section "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
 
 Section "Shortcuts" InSecShortcuts
@@ -239,6 +274,9 @@ SectionEnd
     !insertmacro MUI_DESCRIPTION_TEXT ${InSecSounds} $(DESC_InSecSounds)
     !insertmacro MUI_DESCRIPTION_TEXT ${InSecLocalization} $(DESC_InSecLocalization)
     !insertmacro MUI_DESCRIPTION_TEXT ${InSecFirmware} $(DESC_InSecFirmware)
+    !insertmacro MUI_DESCRIPTION_TEXT ${InSecUtilities} $(DESC_InSecUtilities)
+    !insertmacro MUI_DESCRIPTION_TEXT ${InSecDrivers} $(DESC_InSecDrivers)
+    !insertmacro MUI_DESCRIPTION_TEXT ${InSecInstallDrivers} $(DESC_InSecInstallDrivers)
     !insertmacro MUI_DESCRIPTION_TEXT ${InSecShortcuts} $(DESC_InSecShortcuts)
   !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
@@ -247,6 +285,7 @@ SectionEnd
 
 Function .onInit
 
+  SetShellVarContext all
   !insertmacro MUI_LANGDLL_DISPLAY
 
 FunctionEnd
@@ -260,6 +299,8 @@ Section "un.OpenPilot GCS" UnSecProgram
   RMDir /r /rebootok "$INSTDIR\lib"
   RMDir /r /rebootok "$INSTDIR\share"
   RMDir /r /rebootok "$INSTDIR\firmware"
+  RMDir /r /rebootok "$INSTDIR\utilities"
+  RMDir /r /rebootok "$INSTDIR\drivers"
   Delete /rebootok "$INSTDIR\HISTORY.txt"
   Delete /rebootok "$INSTDIR\Uninstall.exe"
 
@@ -306,6 +347,7 @@ SectionEnd
 
 Function un.onInit
 
+  SetShellVarContext all
   !insertmacro MUI_UNGETLANGUAGE
 
 FunctionEnd

package/winx86/translations/strings_de.nsh

@@ -31,6 +31,9 @@
   LangString DESC_InSecSounds ${LANG_GERMAN} "GCS Sounddateien (benötigt für akustische Ereignisbenachrichtigungen)."
   LangString DESC_InSecLocalization ${LANG_GERMAN} "GCS Lokalisierung (für unterstützte Sprachen)."
   LangString DESC_InSecFirmware ${LANG_GERMAN} "OpenPilot firmware binaries."
+  LangString DESC_InSecUtilities ${LANG_GERMAN} "OpenPilot utilities (Matlab log parser)."
+  LangString DESC_InSecDrivers ${LANG_GERMAN} "OpenPilot hardware driver files (optional OpenPilot CDC driver)."
+  LangString DESC_InSecInstallDrivers ${LANG_GERMAN} "Install OpenPilot CDC driver (optional)."
   LangString DESC_InSecShortcuts ${LANG_GERMAN} "Installiere Verknüpfungen unter Startmenü->Anwendungen."
 
 ;--------------------------------

package/winx86/translations/strings_en.nsh

@@ -31,6 +31,9 @@
   LangString DESC_InSecSounds ${LANG_ENGLISH} "GCS sound files (used for audible event notifications)."
   LangString DESC_InSecLocalization ${LANG_ENGLISH} "GCS localization (for supported languages)."
   LangString DESC_InSecFirmware ${LANG_ENGLISH} "OpenPilot firmware binaries."
+  LangString DESC_InSecUtilities ${LANG_ENGLISH} "OpenPilot utilities (Matlab log parser)."
+  LangString DESC_InSecDrivers ${LANG_ENGLISH} "OpenPilot hardware driver files (optional OpenPilot CDC driver)."
+  LangString DESC_InSecInstallDrivers ${LANG_ENGLISH} "Install OpenPilot CDC driver (optional)."
   LangString DESC_InSecShortcuts ${LANG_ENGLISH} "Install application start menu shortcuts."
 
 ;--------------------------------

package/winx86/translations/strings_es.nsh

@@ -31,6 +31,9 @@
   LangString DESC_InSecSounds ${LANG_SPANISH} "Archivos de sonido del GCS (usados para los eventos y notificaciones audibles)."
   LangString DESC_InSecLocalization ${LANG_SPANISH} "Localización GCS (idiomas soportados)."
   LangString DESC_InSecFirmware ${LANG_SPANISH} "OpenPilot firmware binaries."
+  LangString DESC_InSecUtilities ${LANG_SPANISH} "OpenPilot utilities (Matlab log parser)."
+  LangString DESC_InSecDrivers ${LANG_SPANISH} "OpenPilot hardware driver files (optional OpenPilot CDC driver)."
+  LangString DESC_InSecInstallDrivers ${LANG_SPANISH} "Install OpenPilot CDC driver (optional)."
   LangString DESC_InSecShortcuts ${LANG_SPANISH} "Instalar accesos directos de la aplicación (menú inicio y escritorio)."
 
 ;--------------------------------

package/winx86/translations/strings_fr.nsh

@@ -31,6 +31,9 @@
   LangString DESC_InSecSounds ${LANG_FRENCH} "Fichiers son GCS (pour les notifications sonores)."
   LangString DESC_InSecLocalization ${LANG_FRENCH} "Fichiers de localisation (langues supportées)."
   LangString DESC_InSecFirmware ${LANG_FRENCH} "OpenPilot firmware binaries."
+  LangString DESC_InSecUtilities ${LANG_FRENCH} "OpenPilot utilities (Matlab log parser)."
+  LangString DESC_InSecDrivers ${LANG_FRENCH} "OpenPilot hardware driver files (optional OpenPilot CDC driver)."
+  LangString DESC_InSecInstallDrivers ${LANG_FRENCH} "Install OpenPilot CDC driver (optional)."
   LangString DESC_InSecShortcuts ${LANG_FRENCH} "Installer les raccourcis dans le menu démarrer."
 
 ;--------------------------------

package/winx86/translations/strings_ru.nsh

@@ -31,6 +31,9 @@
   LangString DESC_InSecSounds ${LANG_RUSSIAN} "Звуковые файлы (используются для звуковых уведомлений о событиях)."
   LangString DESC_InSecLocalization ${LANG_RUSSIAN} "Файлы языковой поддержки (для поддерживаемых языков)."
   LangString DESC_InSecFirmware ${LANG_RUSSIAN} "Файлы прошивок OpenPilot."
+  LangString DESC_InSecUtilities ${LANG_RUSSIAN} "Утилиты (конвертор логов для Matlab)."
+  LangString DESC_InSecDrivers ${LANG_RUSSIAN} "Файлы драйверов (опциональный драйвер CDC порта)."
+  LangString DESC_InSecInstallDrivers ${LANG_RUSSIAN} "Установка опционального OpenPilot CDC драйвера."
   LangString DESC_InSecShortcuts ${LANG_RUSSIAN} "Установка ярлыков для приложения."
 
 ;--------------------------------

package/winx86/translations/strings_zh_CN.nsh

@@ -31,6 +31,9 @@
   LangString DESC_InSecSounds ${LANG_TRADCHINESE} "地面站音频文件（用于对于特定事件的提醒）."
   LangString DESC_InSecLocalization ${LANG_TRADCHINESE} "地面站本土化（适用于它所支持的语言）."
   LangString DESC_InSecFirmware ${LANG_TRADCHINESE} "OpenPilot firmware binaries."
+  LangString DESC_InSecUtilities ${LANG_TRADCHINESE} "OpenPilot utilities (Matlab log parser)."
+  LangString DESC_InSecDrivers ${LANG_TRADCHINESE} "OpenPilot hardware driver files (optional OpenPilot CDC driver)."
+  LangString DESC_InSecInstallDrivers ${LANG_TRADCHINESE} "Install OpenPilot CDC driver (optional)."
   LangString DESC_InSecShortcuts ${LANG_TRADCHINESE} "安装开始菜单的快捷方式."
 
 ;--------------------------------