rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity
14,370 Commits 5 Branches 8 Tags 266 MiB
19b474341c
Commit Graph

292 Commits

Author SHA1 Message Date
James Duley
51e4f3aa0e OP-1695 Ubuntu PPA: add missing build depends 2015-03-03 13:06:52 +13:00
James Duley
f611279291 OP-1695 Ubuntu PPA: update standards version and deb builder version 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
53e4be9bdb OP-1695 Ubuntu PPA: added correct debian/control/format 2015-03-03 12:24:32 +13:00
James Duley
4410f955c1 OP-1695 Ubuntu PPA: made debian/rules executable 2015-03-03 12:24:32 +13:00
James Duley
9a1f155510 OP-1695 Ubuntu PPA: made OP modifications in package rule rather than hardcoded to debian rules file 2015-03-03 12:17:50 +13:00
James Duley
61395f44fc OP-1695 Ubuntu PPA: add debian target 2015-03-03 12:17:50 +13:00
James Duley
5f1f156d10 OP-1695 Ubuntu PPA: check for fakeroot 2015-03-03 12:17:50 +13:00
James Duley
6bfe1e66a7 OP-1695 Ubuntu PPA: actually put debs in PACKAGE_DIR 2015-03-03 12:17:50 +13:00
Alessio Morale
6ed06362a7 Merge branch 'master' into next 2015-02-10 23:50:19 +01:00
Laurent Lalanne
105b01680d Merge branch 'laurent/OP-1644_Wrong_wizard_neutral' into next 2015-02-07 19:03:36 +01:00
James Duley
3d797914a3 OP-1701 Fix Linux Qt config: added a resource with qt.conf which has correct prefix set 2015-02-03 15:51:59 +13:00
Alessio Morale
c2a8f8fe11 OP-1699 - Fix Linux build issue with tagged releases 2015-02-01 21:34:05 +01: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
0711f89180 OP-1694 make package rule non-nested: added clean alias for all_clean 2015-01-30 09:42:07 +13:00
James Duley
25c7825144 OP-1666 deb tidy: fix incorrect maintainer email address 2015-01-10 23:56:39 +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
ea6b2dd9b6 OP-1666 deb tidy: added Qt to install 2015-01-10 00:23:16 +13:00
James Duley
9cc7b654af OP-1666 deb tidy: changed to using dh 2015-01-10 00:08:24 +13:00
James Duley
ea0bafa27e OP-1666 deb tidy: update debhelper compatibility to v9 2015-01-10 00:08:24 +13:00
James Duley
f66bcbad78 OP-1666 deb tidy: removed a bunch of uneeded files 2015-01-10 00:08:24 +13:00
James Duley
c013b09a8e OP-1666 deb tidy: remove probably unneeded shlibs directory 2015-01-10 00:08:24 +13:00
James Duley
2a1faf6544 OP-1666 deb tidy: update deb changelog to sayrelease from git and change name to mine 2015-01-10 00:08:23 +13:00
James Duley
d0d025e12e OP-1666 deb tidy: made version use PACKAGE_LBL 2015-01-10 00:08:23 +13:00
James Duley
931da8ecb9 OP-1666 deb tidy: use "dkg --print-architecture" to get arch 2015-01-10 00:08:23 +13:00
James Duley
67ecb92d90 OP-1666 deb tidy: made debian udev rules a symlink rather that copy 2015-01-10 00:08:23 +13:00
James Duley
f3ebed43ad OP-1666_deb_tidy: removes spilt arch control file 2015-01-10 00:08:18 +13:00
James Duley
059b52597b OP-1666 deb tidy: changed to using make install 2015-01-07 16:39:37 +13:00
James Duley
b45057fe89 OP-1666 deb tidy: remove unneeded menu stuff pt2 2015-01-07 16:24:56 +13:00
James Duley
95b916397e Merge branch 'next' into parched/OP-1666_deb_tidy 2015-01-07 16:19:41 +13:00
James Duley
73cabf450c OP-1667_Remove_firmware_files_from_packages: missed one dir creation: 2015-01-07 16:18:00 +13:00
James Duley
7e16a1ff1f OP-1666 deb tidy: remove unneeded deletions 2015-01-07 14:54:28 +13:00
James Duley
26552bb082 OP-1666 deb tidy: remove unneeded menu stuff 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
Laurent Lalanne
5e22a4d15b Copyright character issue, convert openpilotgcs.nsi to UTF-8 2014-11-23 12:35:57 +01:00
Fredrik Larsson
3362c84ec5 Add cloudconfig to installer 2014-11-22 03:51:36 +11:00
Laurent Lalanne
c0d9adb9a9 Missed head file changes 2014-10-23 11:03:56 +02:00
Laurent Lalanne
43e521e791 Copyright fix (encoding) 2014-10-23 10:58:33 +02:00
Fredrik Larsson
6774e82cc8 Copyrights 2014-10-23 04:09:59 +11:00
Fredrik Larsson
1c7d5c5693 Installer Name updated 2014-10-21 22:37:20 +11:00
James Duley
7b10fbc5c4 OP-1451 udev change plugdev to uaccess : update in deb too 2014-08-24 12:22:28 +12:00
James Duley
dc191f7523 changed udev from plugdev to uacces/udev-acl 2014-08-17 21:31:03 +12:00
Laurent Lalanne
05e7339ecc OP-1390 Copy only opengl32.dll 32bit version 2014-07-05 14:12:27 +02:00
Laurent Lalanne
99db0c5025 OP-1390 First commit - Need valid download link 2014-07-04 17:21:39 +02:00
Alessio Morale
4ac9940854 OP-1254 fix packaging rules 2014-03-08 14:20:32 +01:00
Laurent Lalanne
8e837fb985 OP-1187 Wrong file copy in lasted commit. 
qt_fr.qm located in tools/Qt_install_dir, allow copy of this file for all systems
 2014-01-29 13:42:39 +01:00
Laurent Lalanne
c39fb50acf OP-1187 Fix : Like Win package, qt_fr.qm file is needed under Linux 2014-01-28 13:12:39 +01:00
Laurent Lalanne
63f7b840df OP-1187 Allow translations in Win32 system, includes openpilotgcs_fr.qm in package. Still need qt_fr.qm file to detect french translation. 
Works automaticaly and display Gcs in french, at first start.
 2014-01-22 13:44:24 +01:00
Alessio Morale
6d63b6b9b0 Merge remote-tracking branch 'origin/fnurgel/OP-1162_linux_deb_packaging_qt5' into next 2014-01-18 14:18:46 +01:00
Mikael Blomqvist
450fa6e5a4 updated linux dependencies list 2014-01-13 22:46:39 +01:00
Mikael Blomqvist
c98b8b4763 Fix for broken dependency lookup during deb packaging 2014-01-11 01:11:00 +01:00
a*morale
8a7dda78d5 OP-1155 OSX Package: change QtQuick plugin path for install_name_tool processing 2014-01-10 23:27:10 +01:00
a*morale
589074cf24 OP-1155 OSX Package: patch qt.conf adding Qml2Imports 2014-01-10 23:26:33 +01:00
a*morale
11259a3ac3 Merge remote-tracking branch 'origin/fnurgel/linux_deb_packaging_qt5' into amorale/OP-1155_osx_package 2014-01-10 23:24:18 +01:00
Mikael Blomqvist
63127011bd Removing leaked Makefiles from the deb package 2014-01-10 09:32:04 +01:00
a*morale
6231b6f85d OP-1155 OSX Package: Provision for running install_name_tool on QTQuick plugins dylib. 2014-01-10 01:04:44 +01:00
a*morale
771037eeac OP-1155 OSX Package: chmod +/-w before/after running install_name_tool 2014-01-09 21:46:50 +01:00
a*morale
311e948da3 OP-1155 OSX Package: Fix macdeployqt search path issue. Use QT_DIR to find it 2014-01-09 21:45:16 +01:00
a*morale
21956e7596 OP-1155 OSX Package: Update Qt libraries list 2014-01-09 20:13:52 +01:00
a*morale
444744c3da OP-1155 OSX Package: chmod SDL and sdlgamepad before running install_name_tool 2014-01-09 20:12:45 +01:00
a*morale
f5a7345d75 OP-1155 OSX Package: check for existing /Volumes/OpenPilot and try to unmount first. 
retrieve actual volume name with hdiutil
 2014-01-09 20:05:14 +01:00
Mikael Blomqvist
6379a7d937 deb package now bundles qt5 libs and goodies 2014-01-09 15:57:12 +01:00
Alessio Morale
c4f4916590 OP-1143: add missing ids to udev rules 
+review OPReview
 2013-12-13 18:40:05 +01:00
Fredrik Larsson
8fadcd85d2 Rename GCS Configuration, check it to be removed by default 2013-12-08 03:28:32 +11:00
Alessio Morale
bacc4d3d79 Merge branch 'master' into next 
Conflicts:
	flight/targets/boards/oplinkmini/firmware/pios_board.c
	ground/openpilotgcs/copydata.pro
 2013-11-25 01:12:10 +01:00
Patrick Huebner
b4d0a93133 OP-1103 Some minor cleanup work and adding a version check for Qt5.1 2013-11-13 21:04:57 +11:00
Patrick Huebner
d99727306c OP-1103 Fixes packaging issues for OSX. Using this version I had no problem to run GCS on 10.9 Mavericks 2013-11-10 19:20:40 +11:00
David
c267d73b42 Update install script for new drivers 2013-08-17 04:12:09 +10:00
Oleg Semyonov
1b1bb04305 OP-1002: Windows Installer: update branding images 2013-06-22 04:14:23 +02:00
a*morale
1e4e8af165 Fix template for dmg not opening with correct size/options 2013-06-21 10:55:35 +02:00
Oleg Semyonov
74272eea03 Windows installer: add GPLv3.txt to the list of files to copy 2013-06-03 16:45:43 +03:00
a*morale
b8236c6db6 OP-910 Updated osx package to include WHATSNEW.txt files and Docs folder with GPLv3, LICENSE, MILESTONES and README. 
+review OPReview
 2013-06-02 14:26:14 +02:00
David Ankers
73f7243019 Change to next release name, this was likely to be forgotten so doing it 
while I remember.
 2013-06-02 20:22:46 +10:00
Philippe Renon
b0111c12d1 OP-981 fixed broken GCS clean configuration link created by installer 2013-06-02 10:55:34 +02:00
Oleg Semyonov
166baaeaf2 OP-910: fix Mac package script 2013-06-01 23:39:40 +03:00
Oleg Semyonov
1c04bcae36 OP-910: update Windows installer 2013-06-01 23:26:43 +03:00
Oleg Semyonov
4c34695315 Windows installer: better web site name 2013-05-29 12:05:35 +03:00
Oleg Semyonov
dcc9425b7e Merge remote-tracking branch 'origin/os/OP-893_remove-firmware-from-package' into next 2013-05-28 14:56:05 +02:00
Oleg Semyonov
b6d3b2ac22 OP-893: do not include *.opfw firmware files into package 
Now GCS has all firmware embedded and available through the Vehicle Setup
Wizard or Auto-Update function. Hence it is not necessary to include
another copies of the same files. But the code to do this is kept because
later we will include sim targets as firmware. Linux version does include
it already, OSX and Windows should follow.
 2013-05-26 22:47:43 +03:00
David Ankers
892da0d977 Update comments in linux packaging scripts to OPLink Mini 2013-05-26 15:56:59 +10:00
David Ankers
0bff51f79f Add uninstall information, Icon and other details 
Keeping Unicode intact this time
 2013-05-26 02:13:43 +10:00
Oleg Semyonov
a5d63eb452 tools: make nsis_install (Windows only) 2013-05-01 22:44:11 +03:00
Oleg Semyonov
79c2d6f8e0 Windows packaging: fix bug, probably introduced with new python version 
A space was added to the end of each positional parameter value if used
with quotes (removed by shell).
 2013-04-28 14:08:30 +02:00
Oleg Semyonov
f9f721a76a Reset executable bits from non-executable files (Windows legacy) 2013-04-24 01:18:46 +03:00
Oleg Semyonov
da68ac1c8b Merge remote-tracking branch 'origin/amedee/OP-678' into next 
+review OPReview-433
OP-678 #resolve #comment Thanks Philippe! Merged to next. Needs testing.
 2013-04-19 12:58:56 +03:00
Oleg Semyonov
3bebec22f7 OP-772: Enforce line ending agreements (git 1.7.2+ required for this to work) 
This is a part of OP-726, OP-727 tasks to normalize source code.
Use the following to normalise your local repository to be able to merge:

git rm --cached -r .
git diff --cached --name-only -z | xargs -0 git add
git commit -m "Normalise line endings"
git ls-files -z | xargs -0 rm
git checkout .
 2013-04-05 23:43:58 +03:00
Oleg Semyonov
9b11ef2111 Merge remote-tracking branch 'origin/amedee/OP-888' into next 2013-04-05 19:38:17 +02:00
Philippe Vanhaesendonck
327b24c501 Tabs/Whitespaces cleanup - No code change 
Jira OP-888 / OPReview-432
 2013-04-04 14:52:16 +02:00
Philippe Vanhaesendonck
8a83204715 Jira OP-678 -- remove sudo from debian post-install 2013-04-03 18:29:31 +02:00
Philippe Vanhaesendonck
c538488294 OSX package makefile cleanup 
Jira OP-888
Build without Nokia SDK
 2013-04-03 17:41:30 +02:00
Oleg Semyonov
80e668411f build: remove extra libs, they are not used de-facto 
+review OPReview-429
 2013-03-31 18:06:43 +02:00
Oleg Semyonov
3e815ca8d5 build: get rid of build/ground subdirectory, fix qt-creator builds 
This changeset:
- moves all ground targets one level up, under build directory. The
  build/ground was created as a workaround, now unnecessary;
- fixes QtCreator builds, they are separated from command line builds;
- moves GCS autogenerated files into openpilotgcs-synthetics directory.

The resulting build subdirectory now looks like:

    build
        openpilotgcs             <- Qt-Creator build directory
        openpilotgcs-synthetics  <- version-info and opfw_resource
        openpilotgcs_debug
        openpilotgcs_release     <- Makefile build directory
        uavobject-synthetics
        uavobjgenerator

NOTE: you should update the shadow build path in QtCreator to build,
      not build/ground as before.

+review OPReview
 2013-03-30 17:33:38 +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
105e7d95c9 Packaging: now should work for all 3 platforms 2013-03-24 13:06:20 +02:00
Oleg Semyonov
1407d4ce61 Makefile: update help output 2013-03-24 13:06:12 +02:00
Oleg Semyonov
4082b1498a Makefile: move opfw_resource rules from packaging to top Makefile 
opfw_resource make target now depends on built firmware images. They are
referenced directly from Qt resource file generated. No extra copies
are now necessary.
 2013-03-24 13:06:11 +02:00
Alessio Morale
f293298118 Merge remote-tracking branch 'origin/revo-fixes' into amorale/revo-merge 
Conflicts:
	flight/Modules/ManualControl/manualcontrol.c
	make/scripts/version-info.py
	package/Makefile.linux
 2013-01-19 20:23:48 +01:00
Oleg Semyonov
e9b7db82b4 [OP-759] Latest dpkg-buildpackage does not accept non-numeric version 2012-12-21 04:48:48 +02:00
Oleg Semyonov
30d874e859 [OP-703] Add default string as a source origin when using build servers 
Bamboo does not preserve git repository origin when making builds, and
it is shown later in About dialog as "Built from None". This patch fixes
that providing more accurate source description.
 2012-12-14 03:25:35 +02:00
Oleg Semyonov
e8f9a5b505 [OP-759] More installer renames 
OpenPilot-20121211-15ef4d9f-win32.exe
OpenPilot-20121211-15ef4d9f-amd64.deb
OpenPilot-20121211-15ef4d9f-i386.deb
OpenPilot-20121211-15ef4d9f-osx.dmg
 2012-12-13 15:34:13 +02:00
Oleg Semyonov
52b720a2e1 [OP-759] More installer renames 
OpenPilot-20121211-15ef4d9f-win32.exe
OpenPilot-20121211-15ef4d9f-amd64.deb
OpenPilot-20121211-15ef4d9f-i386.deb
OpenPilot-20121211-15ef4d9f-osx.dmg
 2012-12-12 20:26:11 +02:00
Oleg Semyonov
fc5381dc84 Windows installer: add Revo firmware 2012-12-11 19:55:15 +02:00
Oleg Semyonov
a407f0af31 [OP-759] Rename Linux package file as a workaround 
We should reconsider the Linux packaging later. It creates files
above the source tree directory, and that is not OK. But for now
it should work as a temporary solution.
 2012-12-11 19:55:14 +02:00
Oleg Semyonov
b7d5138c5a [OP-759] Rename all installers in the same style 
Conflicts:

	package/Makefile.winx86
	package/winx86/openpilotgcs.tpl
 2012-12-11 19:55:13 +02:00
Oleg Semyonov
a2d94ec4fd [OP-703] Add new variables to version-info.py and use them in Makefiles 
${REVISION} - revision info string (tag or branch:hash date time)
${LABEL} - package label string (tag or date-hash)
${DAY} - day of last commit
${MONTH} - month of last commit
${YEAR} - year of last commit

Conflicts:

	package/Makefile
 2012-12-11 19:55:12 +02:00
Oleg Semyonov
15ef4d9fef [OP-759] Rename Linux package file as a workaround 
We should reconsider the Linux packaging later. It creates files
above the source tree directory, and that is not OK. But for now
it should work as a temporary solution.
 2012-12-11 16:35:16 +02:00
Oleg Semyonov
757e72336c [OP-759] Rename all installers in the same style 2012-12-11 03:07:51 +02:00
Oleg Semyonov
5a66f64551 [OP-758] Move Windows installer package into the build directory 2012-12-10 19:29:57 +02:00
Oleg Semyonov
78c002e911 [OP-674] Attempt to fix Linux packaging dependencies 2012-12-10 19:29:08 +02:00
Oleg Semyonov
0f24034433 Merge remote-tracking branch 'origin/rel-12.10.2' into os/OP-758-windows-installer 2012-12-10 17:57:50 +02:00
Oleg Semyonov
8050283118 [OP-758] Move Windows installer package into the build directory 2012-12-10 16:00:03 +02:00
Oleg Semyonov
a0fb1b9061 [OP-674] Attempt to fix Linux packaging dependencies 2012-12-05 17:40:14 +02:00
Oleg Semyonov
3668ecede3 [OP-703] Add new variables to version-info.py and use them in Makefiles 
${REVISION} - revision info string (tag or branch:hash date time)
${LABEL} - package label string (tag or date-hash)
${DAY} - day of last commit
${MONTH} - month of last commit
${YEAR} - year of last commit
 2012-12-04 00:46:49 +02:00
a*morale
bf78a8b3be Fix for wrong DMG image size that prevent package build on OSX 2012-11-29 01:49:43 +01:00
Nuno Guedes
62c626aec3 Set DMG window to origin 
As there's no way to set the DMG window to open centered, it's best to set it to the screen origin (top left corner).
 2012-11-18 20:42:04 +02:00
Nuno Guedes
3b3e8aea3f Background image added 
Now the background image should be present.
 2012-11-18 20:42:02 +02:00
Nuno Guedes
565f5d458d "Polite" DMG 
"Polite" DMG with new style
Design by javl
 2012-11-18 20:42:01 +02:00
Stacey Sheldon
2119067722 Merge remote-tracking branch 'op-revo/james/revo' into revo-next 
Conflicts:
	Makefile
	flight/Modules/Attitude/revolution/attitude.c
	flight/Modules/Battery/battery.c
	flight/Modules/FixedWingPathFollower/fixedwingpathfollower.c
	flight/Modules/GPS/GPS.c
	flight/Modules/ManualControl/inc/manualcontrol.h
	flight/Modules/ManualControl/manualcontrol.c
	flight/Modules/OveroSync/overosync.c
	flight/Modules/PathPlanner/inc/pathplanner.h
	flight/Modules/PathPlanner/pathplanner.c
	flight/Modules/Sensors/sensors.c
	flight/Modules/VtolPathFollower/vtolpathfollower.c
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/Boards/pios_board.h
	flight/PiOS/STM32F4xx/library.mk
	flight/PiOS/inc/pios_hmc5883.h
	flight/PiOS/inc/pios_l3gd20.h
	flight/PiOS/inc/pios_rfm22b_priv.h
	flight/Revolution/Makefile
	flight/Revolution/Makefile.osx
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/UAVObjects.inc
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.h
	ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/plugins.pro
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	package/Makefile
	shared/uavobjectdefinition/fixedwingpathfollowersettings.xml
	shared/uavobjectdefinition/fixedwingpathfollowerstatus.xml
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/pathdesired.xml
	shared/uavobjectdefinition/vtolpathfollowersettings.xml
	shared/uavobjectdefinition/waypoint.xml
 2012-10-30 00:08:43 -04:00
Oleg Semyonov
73df01bce1 packaging: use release tag without date for tagged releases 2012-10-22 20:36:09 +03:00
Oleg Semyonov
46b6dad9f7 packaging: on Windows use package label passed by Makefile 2012-10-22 20:18:57 +03:00
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
Oleg Semyonov
249e6db241 Windows Uninstaller: remove GCS config files (including obsolete) on demand 2012-10-16 01:14:11 +03:00
James Cotton
0559c90689 OSX packaging: Finally link SDL in properly. 2012-10-13 18:03:18 +01:00
Oleg Semyonov
4aa3c38d40 packaging: fix opfw_resource build dependencies 2012-10-11 16:40:35 +03: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
0e111a62ff OSX Packaging: Make sure to link libgamepad to the distributed SDL 2012-10-10 08:30:55 -05:00
PT_Dreamer
4e4ed172c1 GCS-Added fw bundle resource to the uploader plugin 2012-10-06 19:46:33 +01:00
PT_Dreamer
ce338fdf4f GCS-Make the resources target dependent of the flight package target 2012-10-06 03:20:15 +01:00
PT_Dreamer
f74b149152 GCS-Generate resources file 2012-10-06 03:02:21 +01:00
Stacey Sheldon
4eb485bdde package: auto-generate Qt resource file for OPFW images 2012-10-05 16:23:42 -04:00
James Cotton
8a2f6f7398 Package revomini 2012-10-05 11:43:22 -05: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
James Cotton
51683ffb65 Merge branch 'next' into revo 
Conflicts:
	ground/openpilotgcs/src/plugins/config/input.ui
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/plugins.pro
 2012-09-15 16:31:30 -05:00
Oleg Semyonov
7a5b445f4e Windows Installer: regression fix (really uninstall GCS configuration) 
Thanks Terrier for pointing this out.
 2012-09-01 14:32:09 +03:00
Stacey Sheldon
1f1b240b2a Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml
 2012-08-20 21:22:02 -04:00
Oleg Semyonov
f9f3d6d98c Windows Installer: install also stylesheets 2012-08-20 12:19:21 +03:00
Oleg Semyonov
89e06d7a6b Windows Installer: add default_configurations folder 2012-08-19 22:14:11 +03:00
James Cotton
75db0fcb35 Merge branch 'next' into revo 
Conflicts:
	flight/Modules/GPS/GPS.c
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/systemalarms.xml
 2012-08-12 14:38:38 -05:00
James Cotton
6948f1dc41 Merge remote-tracking branch 'origin/master' into next 
Conflicts:
	package/winx86/translations/strings_de.nsh
 2012-08-03 09:35:18 -05:00
PT_Dreamer
7884b7002e Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	HISTORY.txt
 2012-07-30 15:24:36 +01:00
Sambas
60c4d7f922 bu targets fix 2012-07-30 11:41:10 +03:00
Stacey Sheldon
f5db83bd20 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	flight/Libraries/inc/NMEA.h
	flight/Modules/GPS/GPS.c
	flight/Modules/GPS/NMEA.c
	flight/Modules/GPS/UBX.c
	flight/Modules/GPS/inc/NMEA.h
	flight/Modules/GPS/inc/UBX.h
	flight/Modules/PathPlanner/inc/pathplanner.h
	flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_sections.ld
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/UAVObjects.inc
	flight/SimPosix/UAVObjects.inc
	ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/qdebughandler.h
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	shared/uavobjectdefinition/gpsvelocity.xml
 2012-07-22 23:39:37 -04:00
Oleg Semyonov
8d8a3d0155 AeroSimRC: add plugin option to Windows installer 
Translations are welcome.
 2012-07-20 22:37:36 +03:00
James Cotton
dc1a8205ca Allow building an unsigned linux package until we have official OP signing keys 2012-07-18 17:01:39 -05:00
James Cotton
6b101d71af Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo 2012-07-15 12:32:35 -05:00
James Cotton
d150fd5331 Merge branch 'next' into revo 
Conflicts:
	flight/Modules/ManualControl/manualcontrol.c
	ground/openpilotgcs/src/plugins/config/input.ui
	ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp
	shared/uavobjectdefinition/manualcontrolsettings.xml
 2012-07-13 10:40:14 -05:00
Oleg Semyonov
43bd9a8819 nsis: add some translations for DE (thanks, D-Lite) 2012-07-13 01:55:25 +03:00