1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-11 19:24:10 +01:00
Commit Graph

449 Commits

Author SHA1 Message Date
Alessio Morale
529105489d Merged in paul_jewell/librepilot/LP-94-set-up-wiki-link-in-gcs (pull request #38)
Removed openpilot hard coding from wiki buttons in GCS
2015-09-04 09:45:13 +02:00
James Duley
0fab266d81 LP-101 Made build possible with prebuilt firmware
This is done by setting the WITH_PREBUILT_FW variable
2015-09-02 19:34:59 +12:00
James Duley
0be56a900b LP-100 make firmware package: added fw_dist target
This produces a tarball of the firmware
2015-09-02 19:34:59 +12:00
James Duley
e308039206 LP-99 Decouple flight build
Moved flight make code into flight/Makefile. This should speed up
rebuilds for GCS and keeps the top level Makefile tidier.

Change-Id: I9d33cb5c223b6a8ed2821435a5d63ecf4b97c6b8
2015-09-02 19:34:58 +12:00
Alessio Morale
19400dd6bb Merged in paul_jewell/librepilot/unbrand_documentation2 (pull request #34)
Replaced OpenPilot branding in doxygen configuration files (env version)
2015-08-21 13:35:52 +02:00
Paul Jewell
8a7836171e replaced erroneous spaces with tab 2015-08-20 06:04:10 +01:00
Paul Jewell
c912505798 Removed openpilot hard coding from wiki buttons in GCS 2015-08-19 21:15:32 +01:00
Roy Bekken
ad84547637 Update all changed files against GIT log with copyright headers consistency. 2015-08-19 16:15:58 +02:00
Paul Jewell
e6a4480adb Replaced OpenPilot branding in doxygen configuration files (env version) 2015-08-15 09:41:05 +01:00
Roy Bekken
dcb81a4066 LP-1 - Rebranding
-Remove OP from GCS directory structure; additions.
2015-08-04 16:55:12 +02:00
James Duley
503dff40bc Merged in james-duley/librepilot/LP-80_extend_linux_packaging (pull request #16)
LP 80_extend_linux_packaging
2015-08-03 22:37:32 +01:00
James Duley
c14cacb043 LP-1 rebranding: move ground/{openpilotgcs => gcs}
and associated pro file.

Change-Id: Icc200217f2db27635c7aa2e5b182f9b273925647
2015-08-02 19:20:02 +01:00
James Duley
7bb70e203a LP-80 extend linux packaging: added basis for rpm
Change-Id: I3d00fd1801375abadb1ea0057469f5ba710d15dc
2015-08-02 12:36:03 +01:00
James Duley
a5cd918de7 LP-80 extend linux packaging: reworked dist
Change-Id: Icd7b552d67dfa1ffd32172b78e283e6044bad47d
2015-08-02 12:30:04 +01:00
James Duley
50ee70f492 LP-61 addtional make config options: added libbasename & GCS_LIBRARY_BASENAME
Change-Id: Ied2f50b3f87d40ef7fb0bbad0fff4cd0fd9bb8a9
2015-08-02 11:36:42 +01:00
James Duley
fa29163753 LP-61 more config options: tidy up some make variables
Change-Id: Ibb14d07ccdb5202b1bd9087390a76e84a7282d8d
2015-08-02 11:36:33 +01:00
James Duley
560d01dfd7 LP-61 more config options: split out make helper functions
Change-Id: I54b1ed3f42170c7ee0a3dbe816a5d0400881d9e2
2015-08-02 11:33:51 +01:00
alessio morale
c86f035d2e Merged in amorale/LP-64_ccache_install (pull request #7)
LP-64 ccache install
2015-07-31 14:36:10 +02:00
Alessio Morale
c010d98f21 LP-64 - Configure ccache to have its storage within source tree, under .ccache directory. Add it to gitignore 2015-07-31 11:20:09 +02:00
Roy Bekken
a968e7594d LP-1 – Code Rebranding
Drop prefix for download and tools variables.
2015-07-30 21:47:13 +02:00
Roy Bekken
f6116d7349 LP-1 – Code Rebranding
Rename variables for local tools and installation directory.
2015-07-29 14:49:09 +02:00
Alessio Morale
ba1ab669e5 LP-64 - Add ccache install target 2015-07-28 07:30:45 +02:00
Paul Jewell
6a52f9ecfb Fixed type in Makefile 2015-07-25 08:14:43 +01:00
James Duley
12b207cd8a added a config_show target 2015-07-21 23:21:21 +01:00
James Duley
7710e5c3dc replace echo with printf in config generator 2015-07-21 23:16:42 +01:00
James Duley
4efb8cd5c7 Merge pull request #42 from parched/add_config
Added option for config file.
2015-07-19 15:39:43 +01:00
James Duley
1934dbc427 Make names configurable with config file 2015-07-20 00:33:27 +12:00
Alessio Morale
18bc25aac6 Merge branch 'amorale/LP05-Readd_CC_rebased' of https://github.com/AlessioMorale/LibrePilot into AlessioMorale-amorale/LP05-Readd_CC_rebased
Conflicts:
	ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
2015-07-19 12:59:50 +02:00
James Duley
9097c8b118 Added options to make config file 2015-07-19 02:22:58 +12:00
James Duley
b18523d690 Added option for config file.
Things the can be added to config file are:
export PATH := /usr/lib/ccache/bin:$(PATH)
GCS_OPTS := XXX
etc
2015-07-19 02:19:20 +12:00
paul Jewell
6b6461c8b4 Replaced OPENPILOT_IS_COOL by TOP_LEVEL_MAKEFILE 2015-07-15 08:06:21 +01:00
a*morale
dd6c6054e9 Revert "OP-1810 FOC"
This reverts commit 92e50c2ead.

Conflicts:
	Makefile
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
	ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.cpp
	ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg
	ground/openpilotgcs/src/plugins/uavobjectutil/devicedescriptorstruct.h
2015-07-15 00:07:50 +02:00
James Duley
b6d42f2da8 Passed ORG_NAME to GCS 2015-07-13 07:11:49 +12:00
James Duley
144b0a3d10 changed OP_XXX_NAME to ORG_XXX_NAME 2015-07-13 04:15:53 +12:00
a*morale
e84ad7abff Merge pull request #7 from parched/OP-1879_remove_openpilot_hardcoding
OP-1879 remove openpilot hardcoding
2015-07-11 14:23:29 +02:00
James Duley
68cb8c7bf4 Rename to LibrePilot 2015-07-09 22:41:31 +01:00
James Duley
2ddaa3a345 OP-1879 remove openpilot hardcoding: wrote a smallify function to get the lowercase name with no spaces 2015-07-09 22:01:50 +01:00
James Duley
38c9a7a946 OP-1879 remove openpilot hardocding: remove space from package name 2015-07-09 22:01:39 +01:00
James Duley
4dea2d3d97 OP-1879 remove openpilot hardcoding: added naming variables to top Makefile 2015-07-09 22:01:39 +01:00
James Duley
4b79427b02 OP-1929 fix broken pakage_src by moving include after 2015-06-26 04:30:01 +12:00
abeck70
c14be34551 Merge branch 'rel-15.05' into rel-nano-15.05
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2015-05-19 22:24:16 +10:00
Alessio Morale
690e04f4f0 REVONANO - Initial board support 2015-05-18 18:52:09 +02:00
James Duley
5048ece1b7 Merge remote-tracking branch 'dev/next' into parched/OP-1853_Ground_build_tidy_TEST 2015-05-17 22:52:01 +01:00
James Duley
28a42dade6 OP-1853 Ground build tidy: Make consistent uavobjgenerator output dir.
Because on windows its normally different for release and debug
2015-05-17 21:27:16 +01:00
James Duley
2610a4c463 OP-1853 Ground build tidy: make the gcs build handle generating its own
UAVOs.
This removes warnings and better handles dependencies to speed up rebuilds
New file uavobjgenerator.pri define a qmake compiler of the
uavobjgenerator
2015-05-13 12:47:28 +01:00
James Duley
060d8f1cc1 OP-1853 Ground build tidy: make non PHONY target UAVOBJGENERATOR 2015-05-13 12:47:28 +01:00
James Duley
90420dd164 OP-1853 Ground build tidy: unquote UAVOBJGENERATOR 2015-05-13 12:47:28 +01:00
James Duley
5ab283677f OP-1853 Ground build tidy: Make UAVO_BUILD_CONF use GCS_BUILD_CONF to match qtcreator builds and make things easier later 2015-05-13 12:47:28 +01:00
James Duley
24a270772e OP-1853 Ground build tidy: Remove old android line 2015-05-13 12:47:27 +01:00
James Duley
5a2806c3c0 OP-1853 Ground build tidy: Remove hardcoded prefix from uavobjgenerator output 2015-05-13 12:47:27 +01:00
abeck70
92e50c2ead OP-1810 FOC
Squashed commit for clean commit as discussed in code review
Uncrustify
2015-05-13 17:19:51 +10:00
Philippe Renon
38682f38f4 Merge remote-tracking branch 'origin/filnet/OP-1818_update_OP_toolchain_for_compiling_osgearth' into next
Conflicts:
	make/tools.mk
2015-04-25 17:24:31 +02:00
James Duley
bf527f741d OP-1843 Makefile bugs: split qmake CONFIG variables as a temporary solution to broken qmake quoting on windows 2015-04-22 21:04:00 +12:00
James Duley
989d09803c OP-1843 Makefile bugs: make opfw_resource before gcs_qmake to ensure it is included 2015-04-22 21:01:08 +12:00
Philippe Renon
1ef5d644b8 OP-1818 applied review comments 2015-04-09 21:11:15 +02:00
James Duley
acdba01d4d OP-1792 Maefile tidy: Rewrote ground build so qmake is only run by defualt on first build 2015-04-09 13:01:24 +12:00
James Duley
2c241da639 OP-1792 Makefile tidy: Create a rule for all directories in Makefile 2015-04-09 13:01:23 +12:00
James Duley
68e6231ba1 OP-1792 Makefile tidy: removed incorrect alignment space 2015-04-09 13:01:23 +12:00
Philippe Renon
f700f6bdd6 OP-1818 main Makefile now includes make/3rdparty/3rdparty.mk if present 2015-04-05 18:51:56 +02:00
James Duley
4f50be6a44 OP-1792 Makefile: remove old Android stuff 2015-03-30 11:41:35 +13:00
James Duley
26266f1dee OP-1790: fix up packging make dependencies 2015-03-18 10:18:04 +13:00
James Duley
7c580b693f OP-1790: debian package doesn't depend on package dir 2015-03-17 21:16:33 +13:00
James Duley
c24bee2e28 OP-1790: make packaging debug build error part of package rule 2015-03-17 21:15:44 +13:00
James Duley
655e907506 OP-1695 Ubuntu PPA: remove dirty from version-info.json 2015-03-03 17:51:43 +13:00
James Duley
c0c2e0b721 OP-1695 Ubuntu PPA: made dist targets depend on .git/index instead of being PHONY 2015-03-03 13:06:52 +13:00
James Duley
716358f7ba OP-1695 Ubuntu PPA: added package_src make target 2015-03-03 13:06:49 +13:00
James Duley
d887e7e5ba OP-1695 Ubuntu PPA: made PACKAGE_DIR and DIST_DIR order only make dependcies 2015-03-03 12:24:32 +13:00
James Duley
86dfdb7763 OP-1695 Ubuntu PPA: made .gz a make target 2015-03-03 12:24:32 +13:00
James Duley
2431aa8baa OP-1695 Ubuntu PPA: made dist make target use PACKAE_FULL_NAME 2015-03-03 12:24:32 +13:00
James Duley
5f1f156d10 OP-1695 Ubuntu PPA: check for fakeroot 2015-03-03 12:17:50 +13:00
James Duley
2db0724598 OP-1694 make package rule non-nested: moved install target to Linux.mk 2015-01-31 11:16:57 +13:00
James Duley
81d39562a8 OP-1694 make package rule non-nested 2015-01-31 11:10:13 +13:00
James Duley
b85952be6b OP-1694 make package rule non-nested: tidy dist 2015-01-31 10:57:11 +13:00
James Duley
07cad1db27 OP-1694 make package rule non-nested: tidy 2015-01-31 10:32:58 +13:00
James Duley
225d0fa249 OP-1694 make package rule non-nested: made PACKAGE_DIR target 2015-01-31 10:12:25 +13:00
James Duley
b0ff0f2e52 OP-1694 make package rule non-nested: removed messy clean_package rule, "make clean package" does the same 2015-01-30 09:47:48 +13:00
James Duley
0711f89180 OP-1694 make package rule non-nested: added clean alias for all_clean 2015-01-30 09:42:07 +13:00
James Duley
a35fc57b29 Merge branch 'parched/OP-1666_deb_tidy' into next
Conflicts:
	package/linux/deb_common/openpilot.dirs
2015-01-13 11:25:27 +13:00
James Duley
95fe38143f OP-1666 deb tidy and OP-1663: move Qt inside OP
lib dir to avoid conflict and match Qt dir structure so their rpath is correct
2015-01-10 10:53:22 +13:00
James Duley
240f862196 OP-1666 deb tidy: Removed FORCE_COPY_QT
It does not really make sense because it is designed for OP Qt
which is copied by default if it exists.
2015-01-10 00:19:40 +13:00
James Duley
dd102573d8 OP-1667 remove firmware files: fixed missing dir creation 2 2015-01-08 00:10:08 +13:00
James Duley
e16a58ee5e OP-1666 deb tidy: allow clean under (fake)root 2015-01-07 14:54:27 +13:00
James Duley
170a5f9725 OP-1667 Remove firmware file from packages: removed leftover crap from old attempt 2015-01-04 12:44:58 +13:00
James Duley
1e4df5a542 OP-1657 Remove linux bin wrapper: renamed installed symlink to openpilotgcs 2014-12-24 10:33:26 +13:00
James Duley
04525a0dfd OP-1657 Removed linux bin wrapper 2014-12-24 10:30:20 +13:00
James Duley
7c1f9f99b3 OP-1640 make install rule: added install_qt rule 2014-12-10 11:03:06 +13:00
James Duley
1ecc10f045 OP-1640 make install rule: initial commit (doesn't install Qt) 2014-12-10 10:40:35 +13:00
James Duley
d956c1977a change make source rule to more correct make dist rule 2014-12-10 10:40:35 +13:00
Fredrik Larsson
e8d182978f Merge remote-tracking branch 'origin/parched/OP-1639_make_non-git_source' into next 2014-12-01 14:03:53 +11:00
James Duley
368c726769 OP-1639 make non-git source: made paths relative to help windows 2014-12-01 14:23:13 +13:00
James Duley
f9de8f3afe OP-1639 make non-git source: added git describe to archive name 2014-12-01 11:11:53 +13:00
James Duley
3c0a3ced92 OP-1639 make non-git source: added 'source' make rule 2014-12-01 10:08:21 +13:00
James Duley
28f62b036a OP-1579 Add LDFLAGS to sanitize: added CXXFLAGS, CPPFLAGS, LDFLAGS & LDLIBS 2014-10-29 21:25:35 +13:00
James Duley
71453b2a04 OP-1579 Add LDFLAGS to sanitize: added comments 2014-10-29 21:25:35 +13:00
Alessio Morale
e553014596 Merge branch 'amorale/OP-1476_1477_1275_GPSV9_pios_firmware_bootloader' into next 2014-10-03 00:37:55 +02:00
Alessio Morale
9e0596c2c5 Merge remote-tracking branch 'origin/amorale/OP-1379_ext_led_notification_module_new' into next
Conflicts:
	Makefile
	flight/targets/boards/discoveryf4bare/firmware/Makefile
	flight/targets/boards/revolution/firmware/Makefile
2014-09-29 21:26:31 +02:00
Fredrik Larsson
5bbd6724d6 Merge remote-tracking branch 'origin/skarlsso/OP-1493_discoveryf4bare_support_in_gcs' into next 2014-09-23 21:11:15 +10:00
Alessio Morale
c220257a67 OP-1476 - Makefile fixes from review 2014-09-17 15:43:45 +02:00
Stefan Karlsson
dac84323b1 OP-1493 Make packaging of fw_discoveryf4bare optional and off by default 2014-09-16 23:12:16 +02:00
Alessio Morale
a46683cfea OP-1476 - Exclude GPSv9 from ALL_BU right now. 2014-09-16 22:40:54 +02:00