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

168 Commits

Author SHA1 Message Date
Alessio Morale
f9f7b62f9d OP-1258 fix an issue with Windows package (root folder is missing in the zip file) 2014-05-11 13:26:36 +02:00
Alessio Morale
858d81d501 OP-1258 make TOOL_INSTALL_TEMPLATE md5 url optional so that it defaults to fileurl.md5 2014-05-11 13:26:35 +02:00
Alessio Morale
a1afa6e889 OP-1258 updated to 2014q1, also allow to manually specify MD5 file url
Conflicts:
	make/tools.mk
2014-05-11 13:26:35 +02:00
Alessio Morale
7cc47e4cdc OP-1258 update toolchain installer for Linux to 4.8-2013q4, change ARM_SDK_DIR accordingly 2014-05-11 13:26:35 +02:00
Alessio Morale
10a0f69c82 OP-1255 Win:Fixed 7z detection when it is not in path but under tools/bin
Lin:Switch from 7zr to 7za due to wider availability
2014-04-08 14:11:17 +02:00
Philippe Renon
eed38b7f35 OP-1255 removed mingw_install and python_install make targets (obsolete since Qt 5.1.1. upgrade) 2014-03-21 18:53:16 +01:00
Philippe Renon
93cb920cef OP-1255 Qt 5.2.1 upgrade : put back qt.conf generation to work around QTBUG-33254 2014-03-21 18:30:39 +01:00
Philippe Renon
40f648eab1 OP-1255 Windows toolchain : upgraded Qt from version 5.1.1 to version 5.2.1
- Qt installer is now downloaded from official web site
- Qt is not anymore tweaked to contain the SDL SDK (see OP-1263)
- Installing Qt now requires 7-Zip to be available (run "./make/scripts/win_sdk_install.sh [<OpenPilot tools dir>]" to get it)
- SLD needs to be installed with "make sdl_sdk_install"
KNOWN ISSUE : GCS build fails unless V=1 command line arg is provided
2014-03-20 00:46:05 +01:00
Philippe Renon
2ee3780d08 OP-1263 SDL is now downloaded and installed independently and is not added to Qt anymore 2014-03-17 20:43:38 +01:00
Alessio Morale
d778e2612c OP-1254 fix md5 url 2014-03-08 15:06:17 +01:00
Alessio Morale
b1f1c4cd0f OP-1254 Hide 7z check command line from output 2014-03-08 14:23:15 +01:00
Alessio Morale
a600ed93dc OP-1254 Check if p7zip is installed, use 7zr rather than 7z 2014-03-08 14:19:24 +01:00
Alessio Morale
0dff941cbe OP-1254 update toolchain installer to support Qt 5.2.1 2014-03-08 14:18:45 +01:00
Alessio Morale
98076fb194 OP-1160: fixes from review 2014-01-15 11:19:35 +01:00
Alessio Morale
eeec9db3b4 OP-1160 fix openssl, missing _version receipt 2014-01-14 15:06:36 +01:00
Alessio Morale
0423d4ce99 OP-1160 Copydata was pointing to OPENSSL instead of OPENSSL_DIR, added related
export in tool.mk
2014-01-14 12:50:31 +01:00
Alessio Morale
1efefbd586 Fix an isssue with OpenSSL installation that was causing all_sdk_install
to fail on windows.
2014-01-14 11:05:16 +01:00
Alessio Morale
c9fad94b51 OP-1160 use commit.template config instead of a hook.
Added also a _clean target to unset that config

+review OPReview-611
2014-01-14 09:42:04 +01:00
Alessio Morale
6a3c5d05c7 OP-1160 fix +x attribute for prepare commit hook, force overwrite of destination during prepare 2014-01-13 22:04:49 +01:00
Alessio Morale
ad8f4fe41c OP-1160 Add a prepare make target that installs a prepare-commit-msg hook and
a text file containing the commit message template addition.
2014-01-13 12:31:28 +01:00
Philippe Renon
56c404e778 OP-1132 added new openssl-install that downloads and install the required SSL libraries for Windows
the missing SSLEAY32.DLL and LIBEAY32.DLL are copied to GCS bin dir
OpenSSL version 1.0.1e was downloaded from http://slproweb.com/products/Win32OpenSSL.html
2013-12-01 23:17:48 +01:00
Alessio Morale
69372ea62a OP-835 Linux SDK Installer: md5 url changed to OP ones 2013-11-03 14:31:28 +01:00
a*morale
4be59a01f1 OP-1101 Linux SDK Installer: fixed missing tabs causing issues in OSX 2013-11-02 17:08:12 +01:00
Alessio Morale
d2355c665d Merge branch 'amorale/OP-835_linux_sdk_installer' into next 2013-11-02 12:16:23 +01:00
Alessio Morale
8fca8122f4 OP-835 Linux SDK Installer: fix "non conformant" installation paths
+review OPReview-577
2013-10-27 13:58:32 +01:00
Alessio Morale
cbb7fcfa9d OP-835 Linux SDK installer: fixes for readmes and some cleanup 2013-10-26 16:39:31 +02:00
Alessio Morale
e331d6e8ad OP-835 Fixes for Linux32, remove duplicated file 2013-10-26 16:28:52 +02:00
Alessio Morale
ff8031d469 OP-835 Add +x attribute to downloaded QT installer 2013-10-26 15:45:33 +02:00
Alessio Morale
7b95bf75a3 OP-835 Add -L parameter to Curl to handle redirects 2013-10-26 15:12:34 +02:00
Alessio Morale
0e35fd15cb OP-835 enable qt_sdk_install target for Linux64 target 2013-10-26 15:07:49 +02:00
Philippe Renon
d08445f0b5 [OP-1085][OP-1094] Turn on Progress for large SDK downloads / remove for MD5 files
This commit removes progress when downloading md5, adding progress for big
files was committed as part of OP-1085
2013-10-26 11:56:56 +02:00
Philippe Renon
6bfef53b81 [OP-1085] Qt5.1.1 - made curl report progress by default (can be switched off by adding BATCH=1 on make command line) 2013-10-24 00:11:58 +02:00
Philippe Renon
0aad8afc90 [OP-1085] upgraded to Qt 5.1.1 2013-10-21 23:59:23 +02:00
Philippe Renon
2d3076e9b8 [OP-835] Upgrade toolchain system to Qt 5.1 (Windows only, use packages for Linux and OSX) 2013-09-15 23:24:13 +02:00
Oleg Semyonov
b6312b3faa OP-910: update python path comment in make/tools.mk to keep in sync 2013-06-06 11:12:21 +03:00
Oleg Semyonov
137ddbf73a Fix broken unit tests 2013-05-03 20:27:03 +02:00
Oleg Semyonov
ee1a149888 tools: add gtest_install and build_sdk_* 2013-05-03 20:26:44 +02:00
Oleg Semyonov
a5d63eb452 tools: make nsis_install (Windows only) 2013-05-01 22:44:11 +03:00
Oleg Semyonov
55c406066d tools: add doxygen_install and docs_* targets 2013-04-29 02:05:15 +02:00
Oleg Semyonov
748b28f4f4 Move doxygen config from flight to make/doxygen/ 2013-04-24 22:44:40 +03:00
Oleg Semyonov
0bff67822b tools: yet another fix for md5 calculation 2013-04-24 16:42:47 +03:00
Oleg Semyonov
f9816175d0 tools: replace md5sum by openssl (now works on Windows/Linux/OSX)
See also: OP-719, OPReview-441
2013-04-22 21:37:34 +02:00
Oleg Semyonov
8d1e1fdbc0 tools: make uncrustify_install target, script and base config file
See also: OPIN-3
2013-04-22 21:35:25 +02:00
Oleg Semyonov
b7de3c99d8 tools: fix typo in comments 2013-04-18 16:03:05 +02:00
Oleg Semyonov
f7236eb180 tools: add Linux 64bit native ARM toolchain 2013-04-18 15:45:38 +03:00
Oleg Semyonov
61bb82ca15 gcs: find python in tools building with Qt-Creator
This fix uses the same approach as OpenPilot toolchain system,
but for build started from Qt-Creator.
2013-04-17 19:08:02 +02:00
Oleg Semyonov
59f8a99ab7 make: warn users about old ARM toolchain instead of cryptic 'no such file' error 2013-04-16 21:26:36 +02:00
Oleg Semyonov
354924deed OP-719: suggest to use native Qt 4.8.x package on Linux and OSX
+review OPReview-441
2013-04-14 23:46:15 +02:00
Oleg Semyonov
d3ad4d3106 OP-719: provide pre-fetch and post-extract options to install template
+review OPReview-441
2013-04-14 23:46:14 +02:00
Oleg Semyonov
159dae9c9b OP-719: print error message if curl is not available and stop
+review OPReview-441
2013-04-14 04:17:10 +03:00
Oleg Semyonov
28314ec170 OP-719: add linux x64 version of qt-4.8.4
It seems we must ship GCS with all Qt libs like we do for Windows.
On Ubuntu x64 the GCS built with this crashes using system libs.

But since it's possible to build GCS using natively installed
Qt SDK, it is not a problem for now. Something is better than
nothing, and two ways of building are better then just one.

+review OPReview-441
2013-04-13 22:51:33 +03:00
Oleg Semyonov
5be0a1919e OP-719: add md5 checksumming 2013-04-12 10:56:12 +02:00
Oleg Semyonov
3967874996 OP-719: use common tool install template 2013-04-12 10:56:11 +02:00
Oleg Semyonov
34b15fedaf OP-719: make python_install (Windows) 2013-04-12 10:56:10 +02:00
Oleg Semyonov
c0878f290d OP-719: make qt_sdk_install (Linux) 2013-04-12 10:56:08 +02:00
Oleg Semyonov
e4d91218b6 OP-719: make qt_sdk_install mingw_install (Windows) 2013-04-12 10:56:07 +02:00
Oleg Semyonov
cf110998a0 tools: fix MSYS tar problem with Windows path names with drive letter colon 2013-04-04 17:03:17 +02:00
Oleg Semyonov
f82d66d217 OP-719: fix curl "invalid time" error if target file is missing
+review OPReview-431
2013-04-04 13:08:48 +03:00
Oleg Semyonov
a0e24a69aa OP-719: upgrade ARM SDK to 4.7-2013q1 +review OPReview-431 2013-04-01 00:42:19 +03:00
Oleg Semyonov
03f7596689 OP-719: fix broken paths to other tools (still to be revised) +review OPReview-431 2013-03-31 21:52:58 +03:00
Oleg Semyonov
b67ce783f5 OP-719: upgrade ARM SDK to 4.7-2012q4, use 'make arm_sdk_install' to install
+review OPReview
2013-03-31 16:59:00 +02:00
Oleg Semyonov
8f977a4411 Final step: lot of small fixes, last commit in this commit series
This is the first cleanup pass through makefiles and pios.
Probably it is difficult to track changes due to the nature of them.
I would recommend to look at resulting files and compiled code instead.

NOTE: original branch was rebased and lot of conflicts were fixed on
the way. So do not expect that every commit in this series will be
buildable (unlike original branch). Only final result was tested.

The main goal was to remove as much duplication of code (and copy/paste
errors) as possible, moving common parts out of Makefiles. It still is
not perfect, and mostly no code changes made - Makefiles and #ifdefs only.
But please while testing make sure that all code works as before, and no
modules/options are missed by accident.

Brief list of changes:
- Moved common parts of Makefiles into the set of *.mk files.
- Changed method of passing common vars from top Makefile to lower ones.
- Some pios cleanup, mostly #ifdefs, and all pios_config.h files.
- Many obsolete files removed (for instance, AHRS files, op_config.h).
- Many obsolete or unused macros removed or fixed/renamed (ALL_DIGNOSTICS).
- Unified pios_config.h template. Please don't remove lines for board
  configs, only comment/uncomment them. Adding new PIOS options, please
  propagate them to all board files keeping the same order.
- Some formatting, spacing, indentation (no line endings change yet).
- Some cosmetic fixes (no more C:\X\Y\filename.c printings on Windows).
- Added some library.mk files to move libs into AR achives later.
- EntireFlash target now uses cross-platform python script to generate bin
  files. So it works on all supported platforms: Linux, OSX, Windows.
- Top level packaging is completely rewritten. Now it is a part of top
  Makefile. As such, all dependencies are checked and accounted, no
  more 'make -j' problems should occur.
- Default GCS_BUILD_CONF is release now, may be changed if necessary
  using 'make GCS_BUILD_CONF=debug gcs'.
- GCS build paths are separated into debug and release, so no more obj
  file clashes. Packaging system supports only release builds.
- New target is introduced: 'clean_package'. Now 'make package' does not
  clean build directory. Use clean_package instead for distributable builds.
- Targets like 'all', 'opfw_resource', etc now will print extra contex
  in parallel builds too.
- If any of 'package', 'clean_package', 'opfw_resource' targets are given
  on command line, GCS build will depend on the resource, so all fw_*.opfw
  targets will be built and embedded into GCS. By default GCS does not
  depend on resource, and will be built w/o firmware (unless the resource
  files already exist and the Qt resource file is generated).
- fw_simposix (ELF executable) is now packaged for linux. Run'n'play!
- Make help is refined and is now up to date.

Still broken:
- UnitTests, should be fixed
- SimPosix: buildable, but should be reworked.

Next planned passes to do:
- toolchain bootstrapping and packaging (including windows - WIP)
- CMSIS/StdPeriph lib cleanup
- more PIOS cleanup
- move libs into AR archives to save build time
- sim targets refactir and cleanup
- move android-related directories under <top>/android
- unit test targets fix
- source code line ending changes (there are many different, were not changed)
- coding style

Merging this, please use --no-ff git option to make it the real commit point

Conflicts:
	A lot of... :-)
2013-03-24 13:06:24 +02:00
Oleg Semyonov
23c605ffba Makefile: indents, comments, spacing, $(CMDS) variables, etc.
How to invoke external command instead of shell builtin on Windows:
ECHO := /bin/echo

Conflicts:
	Makefile
2013-03-24 13:03:58 +02:00
Stacey Sheldon
fb4a1d7b1b gtest: stop compiling gtest libraries on installation 2013-03-03 14:33:03 +01:00
Stacey Sheldon
14c5af6148 ut: convert make rules to template and add TAP file generation
Make targets changed to:
 make ut_<test>
 make ut_<test>_tap
 make ut_<test>_run
 make ut_<test>_clean
 make all_ut
 make all_ut_tap
 make all_ut_run
 make all_ut_clean

Conflicts:
	Makefile
2013-03-03 14:33:03 +01:00
Stacey Sheldon
06f805b00e ut: add googletest (gtest) install rules
See: http://code.google.com/p/googletest/
2013-03-03 14:33:03 +01:00
Stacey Sheldon
264d76382b makefile: allow arch-specific path to qmake
This will be required once we move to Qt5.
2013-03-03 14:33:03 +01:00
Stacey Sheldon
e55519b1e2 makefile: split tool install rules into separate makefile
The rules for downloading/building/installing the various
tools were cluttering the top-level makefile.

Conflicts:

	Makefile
2013-01-28 02:29:08 +02:00