1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00

Merged in filnet/librepilot/filnet/LP-29_osgearth_integration (pull request #162)

LP-29_osgearth_integration
This commit is contained in:
Philippe Renon 2016-01-24 13:53:56 +01:00
commit 8f633f3d10
8 changed files with 71 additions and 49 deletions

7
.gitignore vendored
View File

@ -36,9 +36,10 @@ ground/gcs/.settings
# Ignore .pro.user files
*.pro.user
# Misc artifacts
*.exe
*.log
*.opl
/ground/gcs/share/translations/extract-mimetypes.xq
/ground/gcs/src/experimental/tools/DocumentationHelper/ui_mainwindow.h
/ground/gcs/src/libs/qextserialport/.hg
@ -58,8 +59,8 @@ ground/gcs/.settings
/androidgcs/gen/
# Ignore Eclipse Projects and Metadata
/.cproject
/.project
.cproject
.project
/.metadata
/.settings
/.pydevproject

View File

@ -1,7 +1,8 @@
#
# Project: OpenPilot
# NSIS configuration file for OpenPilot GCS
# Project: LibrePilot
# NSIS configuration file for LibrePilot GCS
# The OpenPilot Team, http://www.openpilot.org, Copyright (C) 2010-2015.
# The LibrePilot Team, http://www.librepilot.org, Copyright (C) 2015-2016.
#
# 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
@ -56,7 +57,7 @@
VIAddVersionKey "ProductName" "${GCS_BIG_NAME}"
VIAddVersionKey "ProductVersion" "${VERSION_FOUR_NUM}"
VIAddVersionKey "CompanyName" "The LibrePilot Team, http://www.librepilot.org"
VIAddVersionKey "LegalCopyright" "© 2015 The LibrePilot Team"
VIAddVersionKey "LegalCopyright" "© 2015-2016 The LibrePilot Team"
VIAddVersionKey "FileDescription" "${GCS_BIG_NAME} Installer"
;--------------------------------
@ -77,7 +78,7 @@
;--------------------------------
; Branding
BrandingText "© 2015 The LibrePilot Team, http://www.librepilot.org"
BrandingText "© 2015-2016 The LibrePilot Team, http://www.librepilot.org"
!define MUI_ICON "${NSIS_DATA_TREE}\resources\installer_icon.ico"
!define MUI_HEADERIMAGE
@ -175,6 +176,13 @@ Section "-Plugins" InSecPlugins
File /r "${GCS_BUILD_TREE}\lib\${GCS_SMALL_NAME}\plugins\*.pluginspec"
SectionEnd
; Copy GCS third party libs
Section "-Libs" InSecLibs
SectionIn RO
SetOutPath "$INSTDIR\lib\${GCS_SMALL_NAME}\osg"
File /r "${GCS_BUILD_TREE}\lib\${GCS_SMALL_NAME}\osg\*.dll"
SectionEnd
; Copy GCS resources
Section "-Resources" InSecResources
SetOutPath "$INSTDIR\share"
@ -269,6 +277,7 @@ SectionEnd
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${InSecCore} $(DESC_InSecCore)
!insertmacro MUI_DESCRIPTION_TEXT ${InSecPlugins} $(DESC_InSecPlugins)
!insertmacro MUI_DESCRIPTION_TEXT ${InSecLibs} $(DESC_InSecLibs)
!insertmacro MUI_DESCRIPTION_TEXT ${InSecResources} $(DESC_InSecResources)
!insertmacro MUI_DESCRIPTION_TEXT ${InSecUtilities} $(DESC_InSecUtilities)
!insertmacro MUI_DESCRIPTION_TEXT ${InSecDrivers} $(DESC_InSecDrivers)
@ -318,7 +327,7 @@ Section "un.${GCS_BIG_NAME}" UnSecProgram
SectionEnd
Section "un.Maps cache" UnSecCache
; Remove maps cache
; Remove local app data (maps cache, ...)
SetShellVarContext current
RMDir /r /rebootok "$LOCALAPPDATA\${ORG_BIG_NAME}\${GCS_BIG_NAME}"
; Only remove if no other versions have data here

View File

@ -1,7 +1,8 @@
#
# Project: OpenPilot
# NSIS header file for OpenPilot GCS
# Project: LibrePilot
# NSIS header file for LibrePilot GCS
# The OpenPilot Team, http://www.openpilot.org, Copyright (C) 2010-2011.
# The LibrePilot Team, http://www.librepilot.org, Copyright (C) 2015-2016.
#
# 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
@ -27,11 +28,12 @@
LangString DESC_InSecCore ${LANG_GERMAN} "GCS Kernkomponenten (Programm und Bibliotheken)."
LangString DESC_InSecPlugins ${LANG_GERMAN} "GCS Plugins (Der Großteil der GCS Funktionalität)."
LangString DESC_InSecLibs ${LANG_GERMAN} "GCS third party libraries."
LangString DESC_InSecResources ${LANG_GERMAN} "GCS Resourcen (Diagramme, Ziffernblätter, Kartensymbole, 3d-Modelle, PFD)."
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 Dienstprogramme (Matlab Log Parser)."
LangString DESC_InSecFirmware ${LANG_GERMAN} "LibrePilot firmware binaries."
LangString DESC_InSecUtilities ${LANG_GERMAN} "LibrePilot Dienstprogramme (Matlab Log Parser)."
LangString DESC_InSecDrivers ${LANG_GERMAN} "OpenPilot Hardware Treiberdateien (optionaler OpenPilot CDC Treiber)."
LangString DESC_InSecInstallDrivers ${LANG_GERMAN} "OpenPilot CDC Treiber (optional)."
LangString DESC_InSecInstallOpenGL ${LANG_GERMAN} "Optional OpenGL32.dll for old video cards."
@ -41,6 +43,6 @@
;--------------------------------
; Uninstaller section descriptions
LangString DESC_UnSecProgram ${LANG_GERMAN} "OpenPilot GCS Programm inklusive aller Komponenten."
LangString DESC_UnSecCache ${LANG_GERMAN} "OpenPilot GCS zwischengespeichertes Kartenmaterial."
LangString DESC_UnSecConfig ${LANG_GERMAN} "OpenPilot GCS gespeicherte Konfigurationsdaten."
LangString DESC_UnSecProgram ${LANG_GERMAN} "LibrePilot GCS Programm inklusive aller Komponenten."
LangString DESC_UnSecCache ${LANG_GERMAN} "LibrePilot GCS zwischengespeichertes Kartenmaterial."
LangString DESC_UnSecConfig ${LANG_GERMAN} "LibrePilot GCS gespeicherte Konfigurationsdaten."

View File

@ -1,7 +1,8 @@
#
# Project: OpenPilot
# NSIS header file for OpenPilot GCS
# Project: LibrePilot
# NSIS header file for LibrePilot GCS
# The OpenPilot Team, http://www.openpilot.org, Copyright (C) 2010-2011.
# The LibrePilot Team, http://www.librepilot.org, Copyright (C) 2015-2016.
#
# 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
@ -27,11 +28,12 @@
LangString DESC_InSecCore ${LANG_ENGLISH} "Core GCS components (executable and libraries)."
LangString DESC_InSecPlugins ${LANG_ENGLISH} "GCS plugins (provide most of GCS functionality)."
LangString DESC_InSecLibs ${LANG_ENGLISH} "GCS third party libraries."
LangString DESC_InSecResources ${LANG_ENGLISH} "GCS resources (diagrams, dials, mapicons, 3d-models, PFD)."
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_InSecFirmware ${LANG_ENGLISH} "LibrePilot firmware binaries."
LangString DESC_InSecUtilities ${LANG_ENGLISH} "LibrePilot utilities (Matlab log parser)."
LangString DESC_InSecDrivers ${LANG_ENGLISH} "OpenPilot hardware driver files (optional OpenPilot CDC driver)."
LangString DESC_InSecInstallDrivers ${LANG_ENGLISH} "Optional OpenPilot CDC driver (virtual USB COM port)."
LangString DESC_InSecInstallOpenGL ${LANG_ENGLISH} "Optional OpenGL32.dll for old video cards."
@ -41,6 +43,6 @@
;--------------------------------
; Uninstaller section descriptions
LangString DESC_UnSecProgram ${LANG_ENGLISH} "OpenPilot GCS application and all components."
LangString DESC_UnSecCache ${LANG_ENGLISH} "OpenPilot GCS cached maps data."
LangString DESC_UnSecConfig ${LANG_ENGLISH} "OpenPilot GCS layout files."
LangString DESC_UnSecProgram ${LANG_ENGLISH} "LibrePilot GCS application and all components."
LangString DESC_UnSecCache ${LANG_ENGLISH} "LibrePilot GCS cached maps data."
LangString DESC_UnSecConfig ${LANG_ENGLISH} "LibrePilot GCS layout files."

View File

@ -1,7 +1,8 @@
#
# Project: OpenPilot
# NSIS header file for OpenPilot GCS
# Project: LibrePilot
# NSIS header file for LibrePilot GCS
# The OpenPilot Team, http://www.openpilot.org, Copyright (C) 2010-2011.
# The LibrePilot Team, http://www.librepilot.org, Copyright (C) 2015-2016.
#
# 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
@ -27,11 +28,12 @@
LangString DESC_InSecCore ${LANG_SPANISH} "Componentes principales del GCS (librerías y ejecutables)."
LangString DESC_InSecPlugins ${LANG_SPANISH} "Plugins del GCS (funcionalidades del GCS)."
LangString DESC_InSecLibs ${LANG_SPANISH} "GCS third party libraries."
LangString DESC_InSecResources ${LANG_SPANISH} "Recursos del GCS (diagramas, marcadores, iconos del mapa, modelos, PFD)."
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_InSecFirmware ${LANG_SPANISH} "LibrePilot firmware binaries."
LangString DESC_InSecUtilities ${LANG_SPANISH} "LibrePilot utilities (Matlab log parser)."
LangString DESC_InSecDrivers ${LANG_SPANISH} "OpenPilot hardware driver files (optional OpenPilot CDC driver)."
LangString DESC_InSecInstallDrivers ${LANG_SPANISH} "Optional OpenPilot CDC driver (virtual USB COM port)."
LangString DESC_InSecInstallOpenGL ${LANG_SPANISH} "Optional OpenGL32.dll for old video cards."
@ -41,6 +43,6 @@
;--------------------------------
; Uninstaller section descriptions
LangString DESC_UnSecProgram ${LANG_SPANISH} "Aplicación OpenPilot GCS y todos sus componentes."
LangString DESC_UnSecCache ${LANG_SPANISH} "Datos de mapas en caché del OpenPilot GCS."
LangString DESC_UnSecConfig ${LANG_SPANISH} "Archivos de configuración del OpenPilot GCS."
LangString DESC_UnSecProgram ${LANG_SPANISH} "Aplicación LibrePilot GCS y todos sus componentes."
LangString DESC_UnSecCache ${LANG_SPANISH} "Datos de mapas en caché del LibrePilot GCS."
LangString DESC_UnSecConfig ${LANG_SPANISH} "Archivos de configuración del LibrePilot GCS."

View File

@ -1,7 +1,8 @@
#
# Project: OpenPilot
# NSIS header file for OpenPilot GCS
# Project: LibrePilot
# NSIS header file for LibrePilot GCS
# The OpenPilot Team, http://www.openpilot.org, Copyright (C) 2010-2011.
# The LibrePilot Team, http://www.librepilot.org, Copyright (C) 2015-2016.
#
# 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
@ -27,11 +28,12 @@
LangString DESC_InSecCore ${LANG_FRENCH} "Composants GCS principaux (executable et librairies)."
LangString DESC_InSecPlugins ${LANG_FRENCH} "Plugins GCS (fournissent la plupart des fonctions)."
LangString DESC_InSecLibs ${LANG_FRENCH} "Librairies tierces GCS (fournissent des fonctions supplémentaires)."
LangString DESC_InSecResources ${LANG_FRENCH} "Ressources GCS (diagrammes, cadrans, modèles 3d, PFD)."
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_InSecFirmware ${LANG_FRENCH} "LibrePilot firmware binaries."
LangString DESC_InSecUtilities ${LANG_FRENCH} "LibrePilot utilities (Matlab log parser)."
LangString DESC_InSecDrivers ${LANG_FRENCH} "OpenPilot hardware driver files (optional OpenPilot CDC driver)."
LangString DESC_InSecInstallDrivers ${LANG_FRENCH} "Optional OpenPilot CDC driver (virtual USB COM port)."
LangString DESC_InSecInstallOpenGL ${LANG_FRENCH} "Optional OpenGL32.dll for old video cards."
@ -41,6 +43,6 @@
;--------------------------------
; Uninstaller section descriptions
LangString DESC_UnSecProgram ${LANG_FRENCH} "Application OpenPilot GCS et ses composants."
LangString DESC_UnSecCache ${LANG_FRENCH} "Données en cache OpenPilot GCS."
LangString DESC_UnSecConfig ${LANG_FRENCH} "Fichiers de configuration OpenPilot GCS."
LangString DESC_UnSecProgram ${LANG_FRENCH} "Application LibrePilot GCS et ses composants."
LangString DESC_UnSecCache ${LANG_FRENCH} "Données en cache LibrePilot GCS."
LangString DESC_UnSecConfig ${LANG_FRENCH} "Fichiers de configuration LibrePilot GCS."

View File

@ -1,7 +1,8 @@
#
# Project: OpenPilot
# NSIS header file for OpenPilot GCS
# Project: LibrePilot
# NSIS header file for LibrePilot GCS
# The OpenPilot Team, http://www.openpilot.org, Copyright (C) 2010-2011.
# The LibrePilot Team, http://www.librepilot.org, Copyright (C) 2015-2016.
#
# 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
@ -27,10 +28,11 @@
LangString DESC_InSecCore ${LANG_RUSSIAN} "Основные компоненты GCS (исполняемый файл и библиотеки)."
LangString DESC_InSecPlugins ${LANG_RUSSIAN} "Плагины GCS (обеспечивают большую часть функций GCS)."
LangString DESC_InSecLibs ${LANG_RUSSIAN} "GCS third party libraries."
LangString DESC_InSecResources ${LANG_RUSSIAN} "Ресурсы GCS (диаграммы, приборы, пиктограммы, 3d-модели, PFD)."
LangString DESC_InSecSounds ${LANG_RUSSIAN} "Звуковые файлы (используются для звуковых уведомлений о событиях)."
LangString DESC_InSecLocalization ${LANG_RUSSIAN} "Файлы языковой поддержки (для поддерживаемых языков)."
LangString DESC_InSecFirmware ${LANG_RUSSIAN} "Файлы прошивок OpenPilot."
LangString DESC_InSecFirmware ${LANG_RUSSIAN} "Файлы прошивок LibrePilot."
LangString DESC_InSecUtilities ${LANG_RUSSIAN} "Утилиты (конвертор логов для Matlab)."
LangString DESC_InSecDrivers ${LANG_RUSSIAN} "Файлы драйверов (опциональный драйвер CDC порта)."
LangString DESC_InSecInstallDrivers ${LANG_RUSSIAN} "Опциональный OpenPilot CDC драйвер (виртуальный USB COM порт)."
@ -41,6 +43,6 @@
;--------------------------------
; Uninstaller section descriptions
LangString DESC_UnSecProgram ${LANG_RUSSIAN} "Основное приложение OpenPilot GCS и все его компоненты."
LangString DESC_UnSecCache ${LANG_RUSSIAN} "Кешированные карты OpenPilot GCS."
LangString DESC_UnSecConfig ${LANG_RUSSIAN} "Пользовательская конфигурация OpenPilot GCS."
LangString DESC_UnSecProgram ${LANG_RUSSIAN} "Основное приложение LibrePilot GCS и все его компоненты."
LangString DESC_UnSecCache ${LANG_RUSSIAN} "Кешированные карты LibrePilot GCS."
LangString DESC_UnSecConfig ${LANG_RUSSIAN} "Пользовательская конфигурация LibrePilot GCS."

View File

@ -1,7 +1,8 @@
#
# Project: OpenPilot
# NSIS header file for OpenPilot GCS
# Project: LibrePilot
# NSIS header file for LibrePilot GCS
# The OpenPilot Team, http://www.openpilot.org, Copyright (C) 2010-2011.
# The LibrePilot Team, http://www.librepilot.org, Copyright (C) 2015-2016.
#
# 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
@ -27,11 +28,12 @@
LangString DESC_InSecCore ${LANG_TRADCHINESE} "地面站核心组件 (可执行文件和库文件)."
LangString DESC_InSecPlugins ${LANG_TRADCHINESE} "地面站插件(提供地面站大部分功能)."
LangString DESC_InSecLibs ${LANG_TRADCHINESE} "GCS third party libraries."
LangString DESC_InSecResources ${LANG_TRADCHINESE} "地面站资源库图表地图模型PFD主要飞行数据图."
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_InSecFirmware ${LANG_TRADCHINESE} "LibrePilot firmware binaries."
LangString DESC_InSecUtilities ${LANG_TRADCHINESE} "LibrePilot utilities (Matlab log parser)."
LangString DESC_InSecDrivers ${LANG_TRADCHINESE} "OpenPilot hardware driver files (optional OpenPilot CDC driver)."
LangString DESC_InSecInstallDrivers ${LANG_TRADCHINESE} "Optional OpenPilot CDC driver (virtual USB COM port)."
LangString DESC_InSecInstallOpenGL ${LANG_TRADCHINESE} "Optional OpenGL32.dll for old video cards."
@ -41,6 +43,6 @@
;--------------------------------
; Uninstaller section descriptions
LangString DESC_UnSecProgram ${LANG_TRADCHINESE} "OpenPilot GCS地面站程序及其所有的文件."
LangString DESC_UnSecCache ${LANG_TRADCHINESE} "OpenPilot GCS地面站缓存的地图数据."
LangString DESC_UnSecConfig ${LANG_TRADCHINESE} "OpenPilot GCS地面站配置文件."
LangString DESC_UnSecProgram ${LANG_TRADCHINESE} "LibrePilot GCS地面站程序及其所有的文件."
LangString DESC_UnSecCache ${LANG_TRADCHINESE} "LibrePilot GCS地面站缓存的地图数据."
LangString DESC_UnSecConfig ${LANG_TRADCHINESE} "LibrePilot GCS地面站配置文件."