1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-12 20:08:48 +01:00
Commit Graph

144 Commits

Author SHA1 Message Date
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
Oleg Semyonov
d78e4f2ca5 nsis: add some translations for DE (thanks, D-Lite) 2012-07-13 00:14:50 +03:00
Oleg Semyonov
0c8cc5768c nsis: CDC driver, per-machine installation, release notes
Now CDC driver will be pre-installed during the install process.

Since driver installation requires elevated (admin) privileges
on Windows Vista/7, the software will also be installed into the
Program Files folder instead of user local profile. Former did not
require admin rights, but now it does not matter, so Program Files
folder is preferred.

HISTORY.txt file will be shown after installation.
2012-07-10 18:14:54 +03:00
Oleg Semyonov
4d169dbd54 nsis: add PipXtreme fw, matlab log parser and CDC driver file to the Windows package
Note that this does not install the CDC driver yet. It just puts the
inf file into the drivers subdirectory under OpenPilot installation
directory.

Installer string translations are welcome. But they are not used yet
because utilities and drivers sections are currently hidden and always
will be installed/removed.
2012-07-09 11:51:45 +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
James Cotton
cd311642dd Merge branch 'next' into revo 2012-06-28 10:35:47 +02:00
Oleg Semyonov
6ed1348f13 Add "OpenPilotGCS (clean configuration)" Windows shortcut to reset GCS configuration
Similar options for Mac/Linux are welcome, so users don't have to search
for GCS configuration file in case they need to reset it to defaults.
2012-06-25 12:07:26 +03:00
James Cotton
b074b1f712 Work on the OSX packaging to get it working for revo and to package OSG. 2012-06-13 12:30:07 -05:00
James Cotton
d45fae1380 For now disable the bootloader updaters from being built with packaging. They
aren't packaged into the distributable and the bu_revolution breaks.
2012-06-13 02:58:44 -05:00
Stacey Sheldon
c73cffce59 Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
	Makefile
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/Revolution/System/inc/pios_config.h
	package/Makefile

Fixed CRLF line end clobbering in:
	flight/Bootloaders/Revolution/inc/pios_config.h
	flight/Modules/OveroSync/inc/overosync.h
	flight/Modules/Sensors/inc/sensors.h
	flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/Common/pios_usb_util.c
	flight/PiOS/STM32F4xx/pios_iap.c
	flight/PiOS/inc/pios_rfm22b_priv.h
	flight/PiOS/inc/pios_usb_util.h
2012-06-10 19:01:11 -04:00
James Cotton
f5b2575c88 Merge branch 'next' into revo
Conflicts:
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/Revolution/System/inc/pios_config.h
	package/Makefile
2012-06-07 12:45:06 -05:00
James Cotton
09b6c03fd2 Make packaging on OSX include all pipxtremem compiled opfw in the packaging directory 2012-06-07 12:39:00 -05:00
James Cotton
3546e7fd6c Include PipX firmware in packaging 2012-06-07 11:29:27 -05:00
James Cotton
0f2c41ac5d Merge branch 'revolution' into navigation
Conflicts:
	flight/Modules/ManualControl/manualcontrol.c
	flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
2012-05-07 21:53:10 -05:00
James Cotton
a40a0b0e31 Small fix to be able to build CC for Revo branch and to include revo in
package.
2012-05-07 01:55:52 -05:00
James Cotton
e9966da666 Add the OPLogConvert.m script to the OSX packages 2012-05-04 12:25:01 -05:00
James Cotton
353fe8b349 Need to link a few new libraries for the QML stuff 2012-02-14 22:05:20 -06:00
James Cotton
7990d209a8 Fix package deployment script for OSX to make sure the SVG pixmap shows up 2012-01-31 14:48:24 -06:00
naiiawah
6c38114cfc Fixed borkage in the rules file where the if test was malformed. Added
a change to force an error if the passed in ENV var is not defined.  If
that had been there, the borkage wouldn't have been undetected.

Changed to only put the main FW in the firmware dir, instead of BL and
FW.
2012-01-04 21:39:23 -07:00
naiiawah
f136f3d956 Updated Vid/Pids for Revo, CC3D and some minor comment cleanup in the UDev rules file. 2011-12-30 17:47:22 -07:00
naiiawah
5da31269a6 Changed the top level menu to OpenPilot. 2011-12-24 20:38:04 -07:00
naiiawah
e7a5c14fe2 Improved the handling of the UDev rules installation. Uses
dh_installudev now instead of just manually copying files.  Should
survive any changes to where UDev puts rules better if there is a
channge in their scheme of locations.

Suggested change by Stac after finding the dh_installudev tool.  Good
find!
2011-12-24 14:30:02 -07:00
naiiawah
15061dccab Updates based on review feedback. Fixed (unlikely) case of empty
PACKAGE_DIR var to prevent splatered copying.
2011-12-21 22:38:40 -07:00
naiiawah
ed86805458 Updates to fix review issues: -jX build issues fixes, updated URLs in
<processor_type>/control
2011-12-21 22:18:08 -07:00
naiiawah
5aaa155995 Initial version of the integrated Linux-Deb package system
implementation.  Uses the standard OP package system front end then
connects into the Debian Package manager for package building.  Should
work on both i386 and amd64 systems.  Auto determins and runtime which
system it is building on and produces an appropriate package for the
platform in the build dir.
2011-12-18 17:58:42 -07:00
James Cotton
62cf257071 Update to OSX packaging to allow 32/64 bit binaries to fit 2011-12-10 14:02:18 -06:00
Oleg Semyonov
a4dfe9ac4e packaging: do not build not yet supported targets for package (save time) 2011-09-06 15:46:21 +03:00
James Cotton
beabbcaab5 OSX Packaging: Go back to release configuration for build 2011-08-04 20:54:59 -05:00
James Cotton
041d713045 OSX Packaging: Make the base package file bigger but then resize after copying 2011-08-04 19:03:55 -05:00
James Cotton
7d8842e9a0 OSX Packaging: Also need to include QtTest for debug build 2011-08-04 18:07:52 -05:00
James Cotton
863db897e6 Make OSX build in debug configuration for now and also copy HISTORY.txt to the
package.
2011-08-04 15:25:11 -05:00
James Cotton
76b833e409 Change the OSX packaging to grab the correct Qt path 2011-08-04 13:15:41 -05:00
Oleg Semyonov
6e5e807691 Windows installer: add HISTORY.txt and web links to the Start menu 2011-08-04 12:51:05 +03:00
Oleg Semyonov
9a882811a2 packaging: put only CC firmware into the distributable package
All firmware still will be built, but only CC firmware is packaged
to prevent abuse of bootloader updaters etc.
2011-08-01 12:40:45 +03:00
Oleg Semyonov
af309557e4 gcs: (windows) do not install GCS language files until they're translated properly
Currently the GCS code is too agile to track few translations.
So they are disabled at the moment (except qt own language files).
2011-07-22 22:24:48 +03:00
James Cotton
61e6a47d2e Update the OSX dmg to not be as big (up to 150 MB now) 2011-07-14 14:13:44 -05:00
James Cotton
86997c5c3e Small fix for OSX packaging which makes the SDL library be included. Should
fix error message about missing GCS Control.
2011-07-14 13:56:48 -05:00
Oleg Semyonov
ca44469b92 packaging: build unified firmware for Rx interfaces and remove flash-erase tool 2011-07-13 00:09:30 +03:00
Oleg Semyonov
d372c615ed sbus: added packaging target for CopterControl S.Bus firmware
Serial telemetry relocated to other port (USART3) for this firmware.
PPM OP MB firmware seems to be broken (the same as PWM one). Fix needed.
2011-06-19 16:26:14 +03:00
James Cotton
2f6fe11924 Fix for OSX packaging with PlugIns 2011-06-01 14:02:59 -05:00
Oleg Semyonov
0305dc1094 package: replace 'spektrum' by 'dsm2sat' in the binary name 2011-05-30 02:52:01 +03:00
James Cotton
bac56d23a9 Merge branch 'master' of ssh://git.openpilot.org/OpenPilot 2011-05-28 04:05:58 -05:00
Oleg Semyonov
3dec910954 package: now it is called 'make package' instead of 'make release' 2011-05-28 03:14:51 +03:00