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

Merged in rbekken/librepilot/Remove_OP_From_GCS_DIR (pull request #21)

Browse Source 
LP-1 - Rebranding
This commit is contained in:
James Duley 2015-08-09 21:22:01 +01:00
commit e36a53485f
24 changed files with 47 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
.gitignore vendored
View File

@ -3,10 +3,10 @@
/tools /tools
/build /build
/3rdparty /3rdparty
# Ignore user config # Ignore user config
config config
# Exclude temporary and system files # Exclude temporary and system files
Thumbs.db Thumbs.db
@ -16,7 +16,7 @@ GRTAGS
GSYMS GSYMS
GTAGS GTAGS
core core
*~ *~
# flight # flight
/flight/*.pnproj /flight/*.pnproj
@ -29,29 +29,24 @@ core
/flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.pbxuser /flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.pbxuser
# ground # ground
openpilotgcs-build-desktop gcs-build-desktop
ground/openpilotgcs/.cproject ground/gcs/.cproject
ground/openpilotgcs/.project ground/gcs/.project
ground/openpilotgcs/.settings ground/gcs/.settings
# Ignore some of the .pro.user files # Ignore .pro.user files
*.pro.user *.pro.user
/ground/openpilotgcs/openpilotgcs.pro.user
/ground/uavobjgenerator/uavobjgenerator.pro.user
/ground/uavobjects/uavobjects.pro.user
/ground/ground.pro.user
/ground/openpilotgcs/src/libs/sdlgamepad.pro.user
# Misc artifacts # Misc artifacts
/ground/openpilotgcs/share/openpilotgcs/sounds/normalize.exe *.exe
/ground/openpilotgcs/share/openpilotgcs/sounds/default/normalize.exe /ground/gcs/share/translations/extract-mimetypes.xq
/ground/openpilotgcs/share/openpilotgcs/translations/extract-mimetypes.xq /ground/gcs/src/experimental/tools/DocumentationHelper/ui_mainwindow.h
/ground/openpilotgcs/src/experimental/tools/DocumentationHelper/ui_mainwindow.h /ground/gcs/src/libs/qextserialport/.hg
/ground/openpilotgcs/src/libs/qextserialport/.hg /ground/gcs/src/libs/qextserialport/.hgtags
/ground/openpilotgcs/src/libs/qextserialport/.hgtags /ground/gcs/src/libs/qwt/qwt.prf
/ground/openpilotgcs/src/libs/qwt/qwt.prf /ground/gcs/src/libs/qwt/designer
/ground/openpilotgcs/src/libs/qwt/designer /ground/gcs/src/plugins/ipconnection/ui_ipconnectionoptionspage.h
/ground/openpilotgcs/src/plugins/ipconnection/ui_ipconnectionoptionspage.h
# Ignore intermediate files generated by command-line android builds # Ignore intermediate files generated by command-line android builds
# Couldn't figure out how to force these files into the ./build directory # Couldn't figure out how to force these files into the ./build directory

2
Makefile
View File

@ -203,7 +203,7 @@ export OPMODULEDIR := $(ROOT_DIR)/flight/modules
export OPUAVOBJ := $(ROOT_DIR)/flight/uavobjects export OPUAVOBJ := $(ROOT_DIR)/flight/uavobjects
export OPUAVTALK := $(ROOT_DIR)/flight/uavtalk export OPUAVTALK := $(ROOT_DIR)/flight/uavtalk
export OPUAVSYNTHDIR := $(BUILD_DIR)/uavobject-synthetics/flight export OPUAVSYNTHDIR := $(BUILD_DIR)/uavobject-synthetics/flight
export OPGCSSYNTHDIR := $(BUILD_DIR)/openpilotgcs-synthetics export OPGCSSYNTHDIR := $(BUILD_DIR)/gcs-synthetics
DIRS += $(OPGCSSYNTHDIR) DIRS += $(OPGCSSYNTHDIR)

4
ground/gcs/src/app/Info.plist
View File

@ -3,7 +3,7 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>OpenPilot GCS; Copyright OpenPilot</string> <string>LibrePilot GCS; Copyright LibrePilot</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>@ICON@</string> <string>@ICON@</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
@ -13,7 +13,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>@EXECUTABLE@</string> <string>@EXECUTABLE@</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.openpilot.openpilotgcs</string> <string>org.librepilot.gcs</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.3.1</string> <string>1.3.1</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>

2
ground/gcs/src/app/main.cpp
View File

@ -421,7 +421,7 @@ void loadTranslators(QString language, QTranslator &translator, QTranslator &qtT
{ {
const QString &creatorTrPath = Utils::GetDataPath() + QLatin1String("translations"); const QString &creatorTrPath = Utils::GetDataPath() + QLatin1String("translations");
if (translator.load(QLatin1String("openpilotgcs_") + language, creatorTrPath)) { if (translator.load(QLatin1String("gcs_") + language, creatorTrPath)) {
const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath); const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
const QString &qtTrFile = QLatin1String("qt_") + language; const QString &qtTrFile = QLatin1String("qt_") + language;
// Binary installer puts Qt tr files into creatorTrPath // Binary installer puts Qt tr files into creatorTrPath

2
ground/gcs/src/library.pri
View File

@ -21,7 +21,7 @@ macx {
QMAKE_RPATHDIR += $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_QT_LIBRARY_PATH, $$GCS_LIBRARY_PATH)) QMAKE_RPATHDIR += $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_QT_LIBRARY_PATH, $$GCS_LIBRARY_PATH))
include(rpath.pri) include(rpath.pri)
target.path = /$$GCS_LIBRARY_BASENAME/openpilotgcs target.path = /$$GCS_LIBRARY_BASENAME/gcs
} }
INSTALLS += target INSTALLS += target
} }

2
ground/gcs/src/libs/version_info/version_info.cpp
View File

@ -24,4 +24,4 @@
*/ */
#include "version_info.h" #include "version_info.h"
#include "../../../../build/openpilotgcs-synthetics/version_info.cpp" #include "../../../../build/gcs-synthetics/version_info.cpp"

2
ground/gcs/src/libs/version_info/version_info.cpp.template
View File

@ -5,7 +5,7 @@
* @addtogroup VersionInfo * @addtogroup VersionInfo
* @{ * @{
* @brief The template file used to generate the real source file called * @brief The template file used to generate the real source file called
* build/openpilotgcs-synthetics/version_info.cpp * build/gcs-synthetics/version_info.cpp
*****************************************************************************/ *****************************************************************************/
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

2
ground/gcs/src/libs/version_info/version_info.pro
View File

@ -17,7 +17,7 @@ SOURCES = version_info.cpp
# Since debug_and_release option is set, we need this # Since debug_and_release option is set, we need this
!debug_and_release|build_pass { !debug_and_release|build_pass {
# Define other variables # Define other variables
VERSION_INFO_DIR = $$GCS_BUILD_TREE/../openpilotgcs-synthetics VERSION_INFO_DIR = $$GCS_BUILD_TREE/../gcs-synthetics
VERSION_INFO_SCRIPT = $$ROOT_DIR/make/scripts/version-info.py VERSION_INFO_SCRIPT = $$ROOT_DIR/make/scripts/version-info.py
VERSION_INFO_COMMAND = $$PYTHON \"$$VERSION_INFO_SCRIPT\" VERSION_INFO_COMMAND = $$PYTHON \"$$VERSION_INFO_SCRIPT\"
VERSION_INFO_TEMPLATE = $$GCS_SOURCE_TREE/src/libs/version_info/version_info.cpp.template VERSION_INFO_TEMPLATE = $$GCS_SOURCE_TREE/src/libs/version_info/version_info.cpp.template

8
ground/gcs/src/plugin.pri
View File

@ -1,8 +1,6 @@
include(../gcs.pri) include(../gcs.pri)
isEmpty(PROVIDER) { isEmpty(PROVIDER):PROVIDER = "$$ORG_BIG_NAME"
PROVIDER = OpenPilot
}
DESTDIR = $$GCS_PLUGIN_PATH/$$PROVIDER DESTDIR = $$GCS_PLUGIN_PATH/$$PROVIDER
LIBS += -L$$DESTDIR LIBS += -L$$DESTDIR
@ -42,8 +40,8 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hGCS_symbols
CONFIG += plugin plugin_with_soname CONFIG += plugin plugin_with_soname
!macx { !macx {
target.path = /$$GCS_LIBRARY_BASENAME/openpilotgcs/plugins/$$PROVIDER target.path = /$$GCS_LIBRARY_BASENAME/gcs/plugins/$$PROVIDER
pluginspec.files += $${TARGET}.pluginspec pluginspec.files += $${TARGET}.pluginspec
pluginspec.path = /$$GCS_LIBRARY_BASENAME/openpilotgcs/plugins/$$PROVIDER pluginspec.path = /$$GCS_LIBRARY_BASENAME/gcs/plugins/$$PROVIDER
INSTALLS += target pluginspec INSTALLS += target pluginspec
} }

2
ground/gcs/src/plugins/coreplugin/authorsdialog.pri
View File

@ -15,7 +15,7 @@ include(../../python.pri)
AUTHORS_COMMAND = $$PYTHON \"$$AUTHORS_SCRIPT\" AUTHORS_COMMAND = $$PYTHON \"$$AUTHORS_SCRIPT\"
AUTHORS_SOURCE = $$ROOT_DIR/CREDITS.txt AUTHORS_SOURCE = $$ROOT_DIR/CREDITS.txt
AUTHORS_TEMPLATE = $$GCS_SOURCE_TREE/src/plugins/coreplugin/qml/AuthorsModel.qml.template AUTHORS_TEMPLATE = $$GCS_SOURCE_TREE/src/plugins/coreplugin/qml/AuthorsModel.qml.template
AUTHORS_DIR = $$GCS_BUILD_TREE/../openpilotgcs-synthetics AUTHORS_DIR = $$GCS_BUILD_TREE/../gcs-synthetics
AUTHORS_FILE = $$AUTHORS_DIR/AuthorsModel.qml AUTHORS_FILE = $$AUTHORS_DIR/AuthorsModel.qml
# Create custom authors target which generates a real file # Create custom authors target which generates a real file

2
ground/gcs/src/plugins/coreplugin/core.qrc
View File

@ -63,7 +63,7 @@
<file>images/cpu.png</file> <file>images/cpu.png</file>
<file>qml/images/tab.png</file> <file>qml/images/tab.png</file>
<file>qml/AboutDialog.qml</file> <file>qml/AboutDialog.qml</file>
<file alias="qml/AuthorsModel.qml">../../../../../build/openpilotgcs-synthetics/AuthorsModel.qml</file> <file alias="qml/AuthorsModel.qml">../../../../../build/gcs-synthetics/AuthorsModel.qml</file>
<file>images/opie_90x120.gif</file> <file>images/opie_90x120.gif</file>
</qresource> </qresource>
</RCC> </RCC>

2
ground/gcs/src/plugins/coreplugin/generalsettings.cpp
View File

@ -95,7 +95,7 @@ void GeneralSettings::fillLanguageBox() const
} }
const QString creatorTrPath = Core::ICore::instance()->resourcePath() + QLatin1String("/translations"); const QString creatorTrPath = Core::ICore::instance()->resourcePath() + QLatin1String("/translations");
const QStringList languageFiles = QDir(creatorTrPath).entryList(QStringList(QLatin1String("openpilotgcs*.qm"))); const QStringList languageFiles = QDir(creatorTrPath).entryList(QStringList(QLatin1String("gcs*.qm")));
foreach(QString languageFile, languageFiles) { foreach(QString languageFile, languageFiles) {
int start = languageFile.indexOf(QLatin1Char('_')) + 1; int start = languageFile.indexOf(QLatin1Char('_')) + 1;

4
ground/gcs/src/plugins/uploader/uploader.pro
View File

@ -60,8 +60,8 @@ FORMS += \
RESOURCES += uploader.qrc RESOURCES += uploader.qrc
exists( ../../../../../build/openpilotgcs-synthetics/opfw_resource.qrc ) { exists( ../../../../../build/gcs-synthetics/opfw_resource.qrc ) {
RESOURCES += ../../../../../build/openpilotgcs-synthetics/opfw_resource.qrc RESOURCES += ../../../../../build/gcs-synthetics/opfw_resource.qrc
} else { } else {
message("opfw_resource.qrc is not available, automatic firmware upgrades are disabled") message("opfw_resource.qrc is not available, automatic firmware upgrades are disabled")
} }

0
ground/gcs/src/share/translations/openpilotgcs_de.ts → ground/gcs/src/share/translations/gcs_de.ts
View File

0
ground/gcs/src/share/translations/openpilotgcs_es.ts → ground/gcs/src/share/translations/gcs_es.ts
View File

0
ground/gcs/src/share/translations/openpilotgcs_fr.ts → ground/gcs/src/share/translations/gcs_fr.ts
View File

0
ground/gcs/src/share/translations/openpilotgcs_ru.ts → ground/gcs/src/share/translations/gcs_ru.ts
View File

0
ground/gcs/src/share/translations/openpilotgcs_zh_CN.ts → ground/gcs/src/share/translations/gcs_zh_CN.ts
View File

6
ground/gcs/src/share/translations/translations.pro
View File

@ -16,7 +16,7 @@ LUPDATE = $$[QT_INSTALL_BINS]/lupdate -locations relative -no-ui-lines -no-sort
LRELEASE = $$[QT_INSTALL_BINS]/lrelease LRELEASE = $$[QT_INSTALL_BINS]/lrelease
LCONVERT = $$[QT_INSTALL_BINS]/lconvert LCONVERT = $$[QT_INSTALL_BINS]/lconvert
TRANSLATIONS = $$prependAll(LANGUAGES, $$PWD/openpilotgcs_,.ts) TRANSLATIONS = $$prependAll(LANGUAGES, $$PWD/gcs_,.ts)
MIME_TR_H = $$PWD/mime_tr.h MIME_TR_H = $$PWD/mime_tr.h
@ -48,8 +48,8 @@ QMAKE_LINK = @: IGNORE THIS LINE
OBJECTS_DIR = OBJECTS_DIR =
win32:CONFIG -= embed_manifest_exe win32:CONFIG -= embed_manifest_exe
qmfiles.files = $$prependAll(LANGUAGES, $$OUT_PWD/openpilotgcs_,.qm) qmfiles.files = $$prependAll(LANGUAGES, $$OUT_PWD/gcs_,.qm)
qmfiles.path = /share/openpilotgcs/translations qmfiles.path = /share/gcs/translations
qmfiles.CONFIG += no_check_exist qmfiles.CONFIG += no_check_exist
INSTALLS += qmfiles INSTALLS += qmfiles

6
ground/ground.pro
View File

@ -36,6 +36,6 @@ SUBDIRS = \
# uavobjgenerator # uavobjgenerator
sub_uavobjgenerator.subdir = uavobjgenerator sub_uavobjgenerator.subdir = uavobjgenerator
# openpilotgcs # GCS
sub_openpilotgcs.subdir = gcs sub_gcs.subdir = gcs
sub_openpilotgcs.depends = sub_uavobjgenerator sub_gcs.depends = sub_uavobjgenerator

6
package/Windows.mk
View File

@ -10,9 +10,9 @@ VERSION_CMD := $(VERSION_INFO)
NSIS_OPTS := /V3 NSIS_OPTS := /V3
NSIS_WINX86 := $(ROOT_DIR)/package/winx86 NSIS_WINX86 := $(ROOT_DIR)/package/winx86
NSIS_SCRIPT := $(NSIS_WINX86)/openpilotgcs.nsi NSIS_SCRIPT := $(NSIS_WINX86)/gcs.nsi
NSIS_TEMPLATE := $(NSIS_WINX86)/openpilotgcs.tpl NSIS_TEMPLATE := $(NSIS_WINX86)/gcs.tpl
NSIS_HEADER := $(OPGCSSYNTHDIR)/openpilotgcs.nsh NSIS_HEADER := $(OPGCSSYNTHDIR)/gcs.nsh
.PHONY: package .PHONY: package
package: gcs uavobjects_matlab | $(PACKAGE_DIR) package: gcs uavobjects_matlab | $(PACKAGE_DIR)

4
package/linux/rpmspec.in
View File

@ -105,8 +105,8 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/librepilot.desktop %{_datadir}/applications/librepilot.desktop
%{_datadir}/librepilot-gcs/* %{_datadir}/librepilot-gcs/*
%{_datadir}/pixmaps/librepilot.png %{_datadir}/pixmaps/librepilot.png
%{_libdir}/librepilot-gcs/plugins/OpenPilot/*.pluginspec %{_libdir}/librepilot-gcs/plugins/LibrePilot/*.pluginspec
%{_libdir}/librepilot-gcs/plugins/OpenPilot/*.so %{_libdir}/librepilot-gcs/plugins/LibrePilot/*.so
# #
%{_libdir}/librepilot-gcs/libAggregation.so.1* %{_libdir}/librepilot-gcs/libAggregation.so.1*
%{_libdir}/librepilot-gcs/libExtensionSystem.so.1* %{_libdir}/librepilot-gcs/libExtensionSystem.so.1*

2
package/winx86/openpilotgcs.nsi → package/winx86/gcs.nsi
View File

@ -29,7 +29,7 @@
; Includes ; Includes
!include "x64.nsh" !include "x64.nsh"
!include "..\..\build\openpilotgcs-synthetics\openpilotgcs.nsh" !include "..\..\build\gcs-synthetics\gcs.nsh"
;-------------------------------- ;--------------------------------
; Paths ; Paths

0
package/winx86/openpilotgcs.tpl → package/winx86/gcs.tpl
View File