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
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