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

Merge branch 'pull_requests_paulj' into next

Browse Source
This commit is contained in:
LibrePilot Packager 2015-07-15 08:08:29 +01:00
commit 402d9a0c64
31 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -23,7 +23,7 @@
# Lower level makefiles assume that these variables are defined. To ensure # Lower level makefiles assume that these variables are defined. To ensure
# that a special magic variable is exported here. It must be checked for # that a special magic variable is exported here. It must be checked for
# existance by each sub-make. # existance by each sub-make.
export OPENPILOT_IS_COOL := Fuck Yeah! export TOP_LEVEL_MAKEFILE := TRUE
# It is possible to set OPENPILOT_DL_DIR and/or OPENPILOT_TOOLS_DIR environment # It is possible to set OPENPILOT_DL_DIR and/or OPENPILOT_TOOLS_DIR environment
# variables to override local tools download and installation directorys. So the # variables to override local tools download and installation directorys. So the

2
flight/targets/boards/discoveryf4bare/bootloader/Makefile
View File

@ -16,7 +16,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/targets/boards/discoveryf4bare/firmware/Makefile
View File

@ -17,7 +17,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##### #####
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/targets/boards/gpsplatinum/bootloader/Makefile
View File

@ -16,7 +16,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/targets/boards/gpsplatinum/firmware/Makefile
View File

@ -17,7 +17,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/targets/boards/oplinkmini/bootloader/Makefile
View File

@ -16,7 +16,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/targets/boards/oplinkmini/firmware/Makefile
View File

@ -16,7 +16,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/targets/boards/osd/bootloader/Makefile
View File

@ -16,7 +16,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/targets/boards/osd/firmware/Makefile
View File

@ -16,7 +16,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/targets/boards/revolution/bootloader/Makefile
View File

@ -16,7 +16,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/targets/boards/revolution/firmware/Makefile
View File

@ -17,7 +17,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##### #####
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/targets/boards/revonano/bootloader/Makefile
View File

@ -16,7 +16,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/targets/boards/revonano/firmware/Makefile
View File

@ -16,7 +16,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##### #####
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/targets/boards/revoproto/bootloader/Makefile
View File

@ -16,7 +16,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/targets/boards/revoproto/firmware/Makefile
View File

@ -17,7 +17,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##### #####
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/targets/common/bootloader_updater/Makefile
View File

@ -16,7 +16,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/targets/common/entire_flash/Makefile
View File

@ -16,7 +16,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/tests/lednotification/Makefile
View File

@ -24,7 +24,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/tests/logfs/Makefile
View File

@ -24,7 +24,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
flight/tests/math/Makefile
View File

@ -24,7 +24,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

16
ground/openpilotgcs/src/app/main.cpp
View File

@ -2,7 +2,8 @@
****************************************************************************** ******************************************************************************
* *
* @file main.cpp * @file main.cpp
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The LibrePilot Team http://www.librepilot.org Copyright (C) 2015.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* Parts by Nokia Corporation (qt-info@nokia.com) Copyright (C) 2009. * Parts by Nokia Corporation (qt-info@nokia.com) Copyright (C) 2009.
* @brief * @brief
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
@ -27,6 +28,9 @@
*/ */
/* /*
The GCS application name is defined in the top level makefile - GCS_BIG_NAME / GCS_SMALL_NAME, and
set for the build in ../../openpilotgcs.pri and ./app.pro
The GCS locale is set to the system locale by default unless the "hidden" setting General/Locale has a value. The GCS locale is set to the system locale by default unless the "hidden" setting General/Locale has a value.
The user can not change General/Locale from the Options dialog. The user can not change General/Locale from the Options dialog.
@ -42,10 +46,10 @@
You can combine it with the -config-file=<file> command line argument to quickly switch between multiple settings files. You can combine it with the -config-file=<file> command line argument to quickly switch between multiple settings files.
[code] [code]
openpilotgcs -reset -config-file ./MyOpenPilotGCS.xml gcs -reset -config-file ./MyGCS.xml
[/code] [/code]
Relative paths are relative to <install dir>/share/openpilotgcs/configurations/ Relative paths are relative to <install dir>/share/$(GCS_SMALL_NAME)/configurations/
The specified file will be used to load the factory defaults from but only when the user settings are empty. The specified file will be used to load the factory defaults from but only when the user settings are empty.
If the user settings are not empty the file will not be used. If the user settings are not empty the file will not be used.
@ -55,7 +59,7 @@
Quickly switch configurations Quickly switch configurations
[code] [code]
openpilotgcs -reset -config-file <relative or absolute path> gcs -reset -config-file <relative or absolute path>
[/code] [/code]
Configuring GCS from installer Configuring GCS from installer
@ -65,14 +69,14 @@
If the user chooses to start GCS at the end of the installer: If the user chooses to start GCS at the end of the installer:
[code] [code]
openpilotgcs -D General/OverrideLanguage=de gcs -D General/OverrideLanguage=de
[/code] [/code]
If the user chooses not to start GCS at the end of the installer, you still need to configure GCS. If the user chooses not to start GCS at the end of the installer, you still need to configure GCS.
In that case you can use -exit-after-config In that case you can use -exit-after-config
[code] [code]
openpilotgcs -D General/OverrideLanguage=de -exit-after-config gcs -D General/OverrideLanguage=de -exit-after-config
[/code] [/code]
*/ */

2
make/apps-defs.mk
View File

@ -16,7 +16,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
make/boot-defs.mk
View File

@ -16,7 +16,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
make/common-defs.mk
View File

@ -16,7 +16,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
make/firmware-defs.mk
View File

@ -16,7 +16,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

2
make/tools.mk
View File

@ -45,7 +45,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error $(notdir $(lastword $(MAKEFILE_LIST))) should be included by the top level Makefile) $(error $(notdir $(lastword $(MAKEFILE_LIST))) should be included by the top level Makefile)
endif endif

2
package/Darwin.mk
View File

@ -2,7 +2,7 @@
# MacOSX-specific packaging script # MacOSX-specific packaging script
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

7
package/Linux.mk
View File

@ -2,7 +2,7 @@
# Linux-specific packaging script # Linux-specific packaging script
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif
@ -102,8 +102,9 @@ install:
$(V1) $(INSTALL) $(BUILD_DIR)/$(GCS_SMALL_NAME)_$(GCS_BUILD_CONF)/bin/$(GCS_SMALL_NAME) $(DESTDIR)$(bindir) $(V1) $(INSTALL) $(BUILD_DIR)/$(GCS_SMALL_NAME)_$(GCS_BUILD_CONF)/bin/$(GCS_SMALL_NAME) $(DESTDIR)$(bindir)
$(V1) $(INSTALL) $(BUILD_DIR)/$(GCS_SMALL_NAME)_$(GCS_BUILD_CONF)/lib/$(GCS_SMALL_NAME) $(DESTDIR)$(libdir) $(V1) $(INSTALL) $(BUILD_DIR)/$(GCS_SMALL_NAME)_$(GCS_BUILD_CONF)/lib/$(GCS_SMALL_NAME) $(DESTDIR)$(libdir)
$(V1) $(INSTALL) $(BUILD_DIR)/$(GCS_SMALL_NAME)_$(GCS_BUILD_CONF)/share/$(GCS_SMALL_NAME) $(DESTDIR)$(datadir) $(V1) $(INSTALL) $(BUILD_DIR)/$(GCS_SMALL_NAME)_$(GCS_BUILD_CONF)/share/$(GCS_SMALL_NAME) $(DESTDIR)$(datadir)
$(V1) $(INSTALL) -T $(ROOT_DIR)/package/linux/openpilot.desktop $(DESTDIR)$(datadir)/applications/$(ORG_SMALL_NAME).desktop $(V1) $(INSTALL) -T $(ROOT_DIR)/package/linux/gcs.desktop $(DESTDIR)$(datadir)/applications/$(ORG_SMALL_NAME).desktop
$(V1) sed -i -e 's/openpilotgcs/$(GCS_SMALL_NAME)/g;s/OpenPilot GCS/$(GCS_BIG_NAME)/g' $(DESTDIR)$(datadir)/applications/$(ORG_SMALL_NAME).desktop $(V1) sed -i -e 's/gcs/$(GCS_SMALL_NAME)/g;s/GCS/$(GCS_BIG_NAME)/g;s/org/$(ORG_SMALL_NAME)/g;s/ORG/$(ORG_BIG_NAME)/g' $(DESTDIR)$(datadir)/applications/$(ORG_SMALL_NAME).desktop
$(V1) $(INSTALL) -T $(ROOT_DIR)/package/linux/openpilot.png $(DESTDIR)$(datadir)/pixmaps/$(ORG_SMALL_NAME).png $(V1) $(INSTALL) -T $(ROOT_DIR)/package/linux/openpilot.png $(DESTDIR)$(datadir)/pixmaps/$(ORG_SMALL_NAME).png

2
package/Windows.mk
View File

@ -2,7 +2,7 @@
# Windows-specific packaging script # Windows-specific packaging script
# #
ifndef OPENPILOT_IS_COOL ifndef TOP_LEVEL_MAKEFILE
$(error Top level Makefile must be used to build this target) $(error Top level Makefile must be used to build this target)
endif endif

11
package/linux/gcs.desktop Normal file
View File

@ -0,0 +1,11 @@
[Desktop Entry]
Version=0.1.0
Encoding=UTF-8
Name=GCS
Exec=gcs
TryExec=gcs
Comment=Configure, Tune, Diagnose, Track, & Upgrade FW for ORG solutions
Terminal=false
Categories=Utility;Robotics;Engineering;
Icon=org
Type=Application

11
package/linux/openpilot.desktop
View File

@ -1,11 +0,0 @@
[Desktop Entry]
Version=0.1.0
Encoding=UTF-8
Name=OpenPilot GCS
Exec=openpilotgcs
TryExec=openpilotgcs
Comment=Configure, Tune, Diagnose, Track, & Upgrade FW for OpenPilot solutions
Terminal=false
Categories=Utility;Robotics;Engineering;
Icon=openpilot
Type=Application