From 457aa0f56f279db7617dfd42b3a9ce68320f4a7a Mon Sep 17 00:00:00 2001 From: James Duley Date: Fri, 1 Apr 2016 22:23:21 +0100 Subject: [PATCH 1/7] Remove unicode apostrophe --- Makefile | 2 +- package/linux/deb.mk | 2 +- package/linux/rpm.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 53a6a3b5c..21c7b55eb 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ endef define DESCRIPTION_LONG := The LibrePilot open source project was founded in July 2015. It focuses on research and development of software and hardware to be used in a variety of applications including vehicle control and stabilization, unmanned autonomous vehicles and robotics. -One of the project’s primary goals is to provide an open and collaborative environment making it the ideal home for development of innovative ideas. +One of the project's primary goals is to provide an open and collaborative environment making it the ideal home for development of innovative ideas. endef diff --git a/package/linux/deb.mk b/package/linux/deb.mk index e862fc87c..207d0287a 100644 --- a/package/linux/deb.mk +++ b/package/linux/deb.mk @@ -20,7 +20,7 @@ SED_SCRIPT := $(SED_SCRIPT)' \ s//$(SED_DATE_STRG)/g; \ s//$(DEB_DIST)/g; \ s//$(DEB_NAME)/g; \ - s//$(DESCRIPTION_SHORT)\n $(subst $(NEWLINE),\n ,$(DESCRIPTION_LONG))/g; \ + s//$(DESCRIPTION_SHORT)\n $(subst ','"'"',$(subst $(NEWLINE),\n ,$(DESCRIPTION_LONG)))/g; \ ' # Ubuntu 14.04 (Trusty Tahr) has different names for the qml-modules diff --git a/package/linux/rpm.mk b/package/linux/rpm.mk index 042492231..53a544ff9 100644 --- a/package/linux/rpm.mk +++ b/package/linux/rpm.mk @@ -13,7 +13,7 @@ SED_SCRIPT := $(SED_SCRIPT)' \ s//$(notdir $(DIST_TAR_GZ))/g; \ s//$(notdir $(FW_DIST_TAR_GZ))/g; \ s//$(DESCRIPTION_SHORT)/g; \ - s//$(subst $(NEWLINE),\n,$(DESCRIPTION_LONG))/g; \ + s//$(subst ','"'"',$(subst $(NEWLINE),\n,$(DESCRIPTION_LONG)))/g; \ ' RPM_DIRS := $(addprefix $(PACKAGE_DIR)/,BUILD RPMS SOURCES SPECS SRPMS) From 5d26e81c9ee9d6e601ae44a91c8b0b03629162be Mon Sep 17 00:00:00 2001 From: James Duley Date: Thu, 31 Mar 2016 09:49:01 +1300 Subject: [PATCH 2/7] Make ubuntu trusty use opt Qt --- package/linux/deb.mk | 18 ++++++++---------- package/linux/debian/rules | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/package/linux/deb.mk b/package/linux/deb.mk index 207d0287a..664b9dc8b 100644 --- a/package/linux/deb.mk +++ b/package/linux/deb.mk @@ -23,14 +23,10 @@ SED_SCRIPT := $(SED_SCRIPT)' \ s//$(DESCRIPTION_SHORT)\n $(subst ','"'"',$(subst $(NEWLINE),\n ,$(DESCRIPTION_LONG)))/g; \ ' -# Ubuntu 14.04 (Trusty Tahr) has different names for the qml-modules -TRUSTY_DEPS_SED := s/qml-module-qtquick-controls/qtdeclarative5-controls-plugin/g; \ - s/qml-module-qtquick-dialogs/qtdeclarative5-dialogs-plugin/g; \ - s/qml-module-qtquick-localstorage/qtdeclarative5-localstorage-plugin/g; \ - s/qml-module-qtquick-particles2/qtdeclarative5-particles-plugin/g; \ - s/qml-module-qtquick2/qtdeclarative5-qtquick2-plugin/g; \ - s/qml-module-qtquick-window2/qtdeclarative5-window-plugin/g; \ - s/qml-module-qtquick-xmllistmodel/qtdeclarative5-xmllistmodel-plugin/g; +# Ubuntu 14.04 (Trusty Tahr) use qt in /opt PPA +OPT_QT := qt56 +TRUSTY_DEPS_SED := s/qml-module-.*/$(OPT_QT)quickcontrols/g; \ + s/qt5-default.*/$(OPT_QT)-meta-minimal, $(OPT_QT)svg, $(OPT_QT)script, $(OPT_QT)serialport, $(OPT_QT)multimedia, $(OPT_QT)translations, $(OPT_QT)tools/g; # Leave off Qt and ARM compiler dependencies if calling package target under the assumption that # OP is providing them or the user already has them installed because OP is already built. @@ -40,7 +36,7 @@ PACKAGE_DEPS_SED := s/python.*/python/;s/{misc:Depends}.*/{misc:Depends}/; package: debian @$(ECHO) "Building Linux package, please wait..." $(V1) sed -i -e "$(PACKAGE_DEPS_SED)" debian/control - $(V1) sed -i -e 's/WITH_PREBUILT.*firmware//' debian/rules + $(V1) sed -i -e 's/WITH_PREBUILT.*//' debian/rules $(V1) dpkg-buildpackage -b -us -uc -nc $(V1) mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).deb $(BUILD_DIR) $(V1) mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).changes $(BUILD_DIR) @@ -53,7 +49,9 @@ debian: $(DEB_DIR) $(V1) cp -T package/linux/45-uav.rules debian/$(DEB_NAME).udev $(V1) $(SED_SCRIPT) debian/changelog debian/control ifeq ($(DEB_DIST), trusty) - $(V1) sed -i -e "$(TRUSTY_DEPS_SED)" debian/control + $(V1) sed -i -e '$(TRUSTY_DEPS_SED)' debian/control + $(V1) sed -i -e 's,dh ,source /opt/$(OPT_QT)/bin/$(OPT_QT)-env.sh || true; dh ,' debian/rules + $(V1) echo "SHELL := /bin/bash" >> debian/rules endif .PHONY: package_src diff --git a/package/linux/debian/rules b/package/linux/debian/rules index 4f29ac36e..4fb060a22 100755 --- a/package/linux/debian/rules +++ b/package/linux/debian/rules @@ -12,7 +12,7 @@ export DH_OPTIONS dh $@ override_dh_auto_build: - dh_auto_build -- WITH_PREBUILT_FW=$(CURDIR)/firmware opfw_resource gcs + dh_auto_build -- opfw_resource gcs WITH_PREBUILT_FW=$(CURDIR)/firmware override_dh_auto_install: dh_auto_install -- prefix=/usr From c7ab6ff358936621f5def9088c50a68eb51dcd3d Mon Sep 17 00:00:00 2001 From: James Duley Date: Thu, 31 Mar 2016 10:01:29 +1300 Subject: [PATCH 3/7] Make deb package do osg --- package/linux/deb.mk | 2 +- package/linux/debian/control | 2 +- package/linux/debian/rules | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/linux/deb.mk b/package/linux/deb.mk index 664b9dc8b..a752bfb82 100644 --- a/package/linux/deb.mk +++ b/package/linux/deb.mk @@ -36,7 +36,7 @@ PACKAGE_DEPS_SED := s/python.*/python/;s/{misc:Depends}.*/{misc:Depends}/; package: debian @$(ECHO) "Building Linux package, please wait..." $(V1) sed -i -e "$(PACKAGE_DEPS_SED)" debian/control - $(V1) sed -i -e 's/WITH_PREBUILT.*//' debian/rules + $(V1) sed -i -e 's,config_new.*, --help > /dev/null,' debian/rules $(V1) dpkg-buildpackage -b -us -uc -nc $(V1) mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).deb $(BUILD_DIR) $(V1) mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).changes $(BUILD_DIR) diff --git a/package/linux/debian/control b/package/linux/debian/control index 96a668ddd..99d3e537e 100644 --- a/package/linux/debian/control +++ b/package/linux/debian/control @@ -2,7 +2,7 @@ Source: Section: electronics Priority: optional Maintainer: The LibrePilot Project <> -Build-Depends: debhelper (>= 9), libudev-dev, libusb-1.0-0-dev, libsdl1.2-dev, python, qt5-default, qttools5-dev-tools, libqt5svg5-dev, qtdeclarative5-dev, qml-module-qtquick-controls, libqt5serialport5-dev, qtmultimedia5-dev, qtscript5-dev, libqt5opengl5-dev +Build-Depends: debhelper (>= 9), libudev-dev, libusb-1.0-0-dev, libsdl1.2-dev, python, libopenscenegraph-dev, qt5-default, qttools5-dev-tools, libqt5svg5-dev, qtdeclarative5-dev, qml-module-qtquick-controls, libqt5serialport5-dev, qtmultimedia5-dev, qtscript5-dev, libqt5opengl5-dev Standards-Version: 3.9.5 Homepage: Vcs-Git: diff --git a/package/linux/debian/rules b/package/linux/debian/rules index 4fb060a22..66bbb414c 100755 --- a/package/linux/debian/rules +++ b/package/linux/debian/rules @@ -11,8 +11,11 @@ export DH_OPTIONS %: dh $@ +override_dh_auto_configure: + $(MAKE) config_new GCS_EXTRA_CONF=osg WITH_PREBUILT_FW=$(CURDIR)/firmware + override_dh_auto_build: - dh_auto_build -- opfw_resource gcs WITH_PREBUILT_FW=$(CURDIR)/firmware + dh_auto_build -- opfw_resource gcs override_dh_auto_install: dh_auto_install -- prefix=/usr From c74c89423511bc428836d19b1b9945c702ac5f0f Mon Sep 17 00:00:00 2001 From: James Duley Date: Mon, 4 Apr 2016 20:49:19 +0100 Subject: [PATCH 4/7] Added travis CI --- .travis.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..734e03176 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,15 @@ +language: cpp + +sudo: required + +dist: trusty + +before_install: + - sudo add-apt-repository ppa:librepilot/tools -y + - sudo apt-get update -q + - sudo apt-get install -y libudev-dev libusb-1.0-0-dev libsdl1.2-dev python libopenscenegraph-dev qt56-meta-minimal qt56svg qt56script qt56serialport qt56multimedia qt56translations qt56tools + +script: . /opt/qt56/bin/qt56-env.sh && make gcs GCS_EXTRA_CONF=osg + +git: + depth: 500 From 46f910e9f4a1893bebcbed33b00fa22073838dee Mon Sep 17 00:00:00 2001 From: James Duley Date: Sat, 16 Apr 2016 20:08:39 +0100 Subject: [PATCH 5/7] OSG 3.2 fixes - return textGeode not text --- ground/gcs/src/libs/osgearth/osgQtQuick/OSGTextNode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGTextNode.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGTextNode.cpp index 05624f809..b6f1dce82 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGTextNode.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGTextNode.cpp @@ -68,7 +68,7 @@ public: camera->addChild(textGeode.get()); camera->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF); #endif - return text; + return textGeode; } void updateText() From 4f8cf5474ab87788709a998add25f0c3aa90d655 Mon Sep 17 00:00:00 2001 From: James Duley Date: Sun, 17 Apr 2016 20:04:43 +0100 Subject: [PATCH 6/7] Add travis badge to README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 53a1091d2..0fe1d8c93 100644 --- a/README.md +++ b/README.md @@ -37,3 +37,5 @@ Links for the LibrePilot Project - [Issue tracker](https://librepilot.atlassian.net) - [Gitter Chat](https://gitter.im/librepilot/LibrePilot) - IRC: #LibrePilot on FreeNode + +[![Build Status](https://travis-ci.org/librepilot/LibrePilot.svg?branch=next)](https://travis-ci.org/librepilot/LibrePilot) From bc2fc562da823b7cbb401d6596cf20c20873892e Mon Sep 17 00:00:00 2001 From: James Duley Date: Wed, 20 Apr 2016 22:25:57 +0100 Subject: [PATCH 7/7] Add ccache to travis --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 734e03176..7e50b0ab6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,9 @@ before_install: - sudo apt-get update -q - sudo apt-get install -y libudev-dev libusb-1.0-0-dev libsdl1.2-dev python libopenscenegraph-dev qt56-meta-minimal qt56svg qt56script qt56serialport qt56multimedia qt56translations qt56tools -script: . /opt/qt56/bin/qt56-env.sh && make gcs GCS_EXTRA_CONF=osg +script: . /opt/qt56/bin/qt56-env.sh && make gcs CCACHE=ccache GCS_EXTRA_CONF=osg git: depth: 500 + +cache: ccache