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
