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
7,108 Commits 5 Branches 8 Tags 266 MiB
127ca1e7e1
Commit Graph

161 Commits

Author SHA1 Message Date
Stacey Sheldon
127ca1e7e1 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	ground/openpilotgcs/src/plugins/hitl/plugin.pro
	ground/openpilotgcs/src/plugins/hitlnew/fgsimulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/hitlconfiguration.cpp
	ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.cpp
	ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/simulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/simulator.h
	ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
 2012-10-20 13:56:18 -04:00
Stacey Sheldon
9e75547bb4 makefile: remove nearly all reliance on symlinks 
Symlinks to nonexistent files or directories don't
work on windows.
 2012-10-13 18:59:15 -04:00
Stacey Sheldon
18b5bd4690 makefile: stop using extended regexp in sed 
Looks like mac doesn't support the -r option to sed to
turn on extended regexps.  It only supports the -E option
which linux doesn't.

So, simplest fix is to avoid extended regexps and just
use as many dots as possible from now on.
 2012-10-13 15:58:20 -04:00
Stacey Sheldon
af1b290381 makefile: stop using -I or -i in xargs 
Windows doesn't like -I.  Mac doesn't like -i.

This now avoids using either option to xargs by
using awk to reorder the ln command line args prior
to invoking xargs.
 2012-10-12 23:57:02 -04:00
Stacey Sheldon
ccdd3de47e makefile: fix androidgcs build issues on windows 
Use '-i' (deprecated) in xargs instead of '-I' so old
versions of xargs work.

Use only relative paths to files passed to tar since the
windows version doesn't seem to handle 'c:/' at the start
of the path.
 2012-10-12 22:49:16 -04:00
James Cotton
11dbdf3a52 AndroidGCS: Only use a 16 character name for UAVOs. Was breaking before on hardware. 2012-10-11 12:38:16 -05:00
PT_Dreamer
8863601715 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate 2012-10-10 18:22:53 +01:00
James Cotton
6e3d9a7c72 Merge branch 'dynamic_uavo_next' into next 2012-10-10 08:31:07 -05:00
Stacey Sheldon
201ee521d6 makefile: fall-back to android dx in the PATH 2012-10-10 01:10:53 -04:00
Stacey Sheldon
5314d9ad54 makefile: make android builds more quiet 2012-10-10 00:46:20 -04:00
Stacey Sheldon
f7467cbb47 makefile: generate multiple versions of UAVOs 
This will allow a single GCS to have access to multiple
sets of UAVO libraries.
 2012-10-10 00:35:14 -04:00
Stacey Sheldon
4f6bca2a8a makefile: choose correct qt installer for 64-bit machines 2012-10-07 17:29:27 -04:00
Stacey Sheldon
4f53a88c35 makefile: remove debug cruft 2012-10-05 21:00:17 -04:00
Stacey Sheldon
6b4f60b263 makefile: add support for building androidgcs 2012-10-05 20:54:01 -04:00
Stacey Sheldon
bc2080fec7 makefile: add function for computing relative paths 2012-10-05 20:54:00 -04:00
Stacey Sheldon
40251afd6e makefile: add update target for android SDK 
This installs the components required for actually building
a full APK.
 2012-10-05 19:48:08 -04:00
Stacey Sheldon
4305cf942d makefile: Add installer target for the android SDK 2012-10-05 19:48:08 -04:00
Stacey Sheldon
4eb485bdde package: auto-generate Qt resource file for OPFW images 2012-10-05 16:23:42 -04:00
Stacey Sheldon
ffe88eec5e Merge remote-tracking branch 'op-public/next' into revo-next 2012-09-16 17:14:20 -04:00
Stacey Sheldon
3e236bd3e6 makefile: change QT SDK install dir so we can support multiple installs 
QT SDK version was changed but the install dir wasn't changed
to match.  This makes it impossible to keep both versions
installed at the same time which is essential in order to work
on/build old and new branches.

This update gives the new SDK version a unique install dir so
it can coexist with older versions.
 2012-09-16 16:01:24 -04:00
Stacey Sheldon
754f58c33a Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	flight/Modules/ManualControl/inc/manualcontrol.h
	flight/Revolution/Makefile.osx
	ground/openpilotgcs/src/plugins/plugins.pro
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-16 09:56:35 -04:00
PT_Dreamer
c88c4f0fc0 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
 2012-09-14 14:12:16 +01:00
James Cotton
42213b21f7 Make OSG selection a QMake config option (OSG) 
To include this module from the command line:
    make GCS_QMAKE_OPTS="CONFIG+=OSG" -j7 gcs
 2012-09-13 09:46:03 -05:00
Oleg Semyonov
a8487fc990 qt_sdk_install: update QtSDK to 1.2.1 and Qt to 4.8.1 2012-09-12 23:09:06 +03:00
Sambas
60c4d7f922 bu targets fix 2012-07-30 11:41:10 +03:00
Stacey Sheldon
54a161a3d4 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	shared/uavobjectdefinition/manualcontrolsettings.xml
 2012-07-08 18:14:09 -04:00
Stacey Sheldon
d9dca0b553 Merge branch 'wireshark-plugins' into next 2012-06-30 22:42:38 -04:00
Stacey Sheldon
22161c56b3 makefile: enable extra context when building multiple targets 
Extra message context is also useful even when building more
than one target in the same invocation of make.

This example would enable extra context:
   make fw_coptercontrol bl_coptercontrol
 2012-06-20 23:38:49 -04:00
Stacey Sheldon
384305d8ee makefile: add additional context to output when building all_* targets 
When building the various all_* targets, it was hard to tell which
board/build-type that each line of output applied to.  Now, the
all_* target types will include something like:
 CC        [fw|cc  ]  flight/PiOS/STM32F10x/pios_gpio.c
which includes the necessary additional context.

This will help with identifying the context for warnings and errors
when building a group of targets.

Conflicts:

	Makefile
 2012-06-20 23:38:21 -04:00
Stacey Sheldon
91a3dec69f makefile: pass short name (CC/PIPX/REVO) into sub-makes 2012-06-20 23:37:37 -04:00
Stacey Sheldon
bbc3877751 makefile: pass build type (BL/FW/BU/EF) into sub-makes 2012-06-20 23:37:29 -04:00
Stacey Sheldon
52a3cff6c6 makefile: remove simposix from all_flight on non-Linux platforms 
The simposix build doesn't work on Windows or Mac so it shouldn't
be in the all_flight build target that is used as a pre-submit
check on all platforms.
 2012-06-20 23:37:21 -04:00
Stacey Sheldon
78e12e9195 makefile: filter out unbuildable targets for SimPosix 2012-06-20 23:37:03 -04:00
Stacey Sheldon
c75ad12946 makefile: fix dependency for EF images so they work with all_* targets 2012-06-20 23:36:51 -04:00
Theodore A. Roth
a0ad94ad8a ef: fix broken all_ef goal in makefile 2012-06-20 22:23:59 -04:00
Stacey Sheldon
4c47a36bda uavobjgenerator: Add generator for wireshark UAVO plugin 
Using 'make uavobjects_wireshark' now generates a complete
wireshark dissector that can decode all fields of the available
UAVObjects.
 2012-06-19 00:21:35 -04:00
James Cotton
f9dc3b1f89 Enable simposix on next for linux only. Keeps all_flight building on all 
platforms
 2012-06-10 14:41:00 -05:00
James Cotton
cac1225607 Remove revolution from main makefile in next as it is currently broken. Also 
remove simposix as it triggers error:
FATAL:/usr/bin/../libexec/gcc/darwin/x86_64/as: I don't understand 'a' flag!
 2012-06-04 12:27:31 -05:00
Stacey Sheldon
3047b8b815 makefile: enable extra context when building multiple targets 
Extra message context is also useful even when building more
than one target in the same invocation of make.

This example would enable extra context:
   make fw_coptercontrol bl_coptercontrol
 2012-06-03 17:43:14 -04:00
Stacey Sheldon
e3393bb255 makefile: add additional context to output when building all_* targets 
When building the various all_* targets, it was hard to tell which
board/build-type that each line of output applied to.  Now, the
all_* target types will include something like:
 CC        [fw|cc  ]  flight/PiOS/STM32F10x/pios_gpio.c
which includes the necessary additional context.

This will help with identifying the context for warnings and errors
when building a group of targets.
 2012-06-03 17:43:14 -04:00
Stacey Sheldon
c5b1522f6a makefile: pass short name (CC/PIPX/REVO) into sub-makes 2012-06-03 17:43:13 -04:00
Stacey Sheldon
1d3694e394 makefile: pass build type (BL/FW/BU/EF) into sub-makes 2012-06-03 17:43:13 -04:00
Corvus Corax
ba50e191af Revert "no simposix for all_flight" 
This reverts commit d8753b3815.
 2012-06-02 22:23:51 +02:00
Corvus Corax
5b5b41a4c5 Merge remote branch 'origin/stac/use-gnu-arm-toolchain' into revo-next 2012-05-31 16:48:37 +02:00
Sambas
cac9000c16 filter-out osd 2012-05-30 16:41:12 +03:00
Sambas
ed1a4dada6 Merge remote-tracking branch 'remotes/origin/sambas/osd_test_v1' into revo-next 
Conflicts:
	flight/PiOS/STM32F4xx/pios_adc.c
 2012-05-30 16:30:09 +03:00
James Cotton
58e9c3b3fb Merge branch 'revo-next' of ssh://git.openpilot.org/revo into revo-next 2012-05-28 22:14:18 -05:00
Stacey Sheldon
8ca60ec183 makefile: remove simposix from all_flight on non-Linux platforms 
The simposix build doesn't work on Windows or Mac so it shouldn't
be in the all_flight build target that is used as a pre-submit
check on all platforms.
 2012-05-28 22:21:46 -04:00
Sambas
d8753b3815 no simposix for all_flight 2012-05-28 19:33:42 +03:00
Sambas
147100bc2f Merge remote-tracking branch 'remotes/origin/revo-next' into osd_test_v1 
Conflicts:
	Makefile
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
 2012-05-28 19:06:25 +03:00