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

51 Commits

Author SHA1 Message Date
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
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
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
a*morale
1e4e8af165 Fix template for dmg not opening with correct size/options 2013-06-21 10:55:35 +02: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
Oleg Semyonov
166baaeaf2 OP-910: fix Mac package script 2013-06-01 23:39:40 +03: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
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
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
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
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
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
757e72336c [OP-759] Rename all installers in the same style 2012-12-11 03:07:51 +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
James Cotton
0559c90689 OSX packaging: Finally link SDL in properly. 2012-10-13 18:03:18 +01:00
James Cotton
0e111a62ff OSX Packaging: Make sure to link libgamepad to the distributed SDL 2012-10-10 08:30:55 -05:00
James Cotton
8a2f6f7398 Package revomini 2012-10-05 11:43:22 -05: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
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
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
James Cotton
62cf257071 Update to OSX packaging to allow 32/64 bit binaries to fit 2011-12-10 14:02:18 -06: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
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
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
James Cotton
2f6fe11924 Fix for OSX packaging with PlugIns 2011-06-01 14:02:59 -05:00
James Cotton
bac56d23a9 Merge branch 'master' of ssh://git.openpilot.org/OpenPilot 2011-05-28 04:05:58 -05:00