Merged in james-duley/librepilot/travis (pull request #230)

Fix up ubuntu PPA packaging with osg and add travis-ci to check it

.travis.yml

@@ -0,0 +1,17 @@
+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 CCACHE=ccache GCS_EXTRA_CONF=osg
+
+git:
+        depth: 500
+
+cache: ccache

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
 
 

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)

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

package/linux/deb.mk

@@ -20,17 +20,13 @@ SED_SCRIPT           := $(SED_SCRIPT)' \
 			s/<DATE>/$(SED_DATE_STRG)/g; \
 			s/<DIST>/$(DEB_DIST)/g; \
 			s/<NAME>/$(DEB_NAME)/g; \
-			s/<DESCRIPTION>/$(DESCRIPTION_SHORT)\n $(subst $(NEWLINE),\n ,$(DESCRIPTION_LONG))/g; \
+			s/<DESCRIPTION>/$(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,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)
@@ -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

package/linux/debian/control

@@ -2,7 +2,7 @@ Source: <NAME>
 Section: electronics
 Priority: optional
 Maintainer: The LibrePilot Project <<EMAIL>>
-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: <URL>
 Vcs-Git: <GIT_URL>

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 -- WITH_PREBUILT_FW=$(CURDIR)/firmware opfw_resource gcs
+	dh_auto_build -- opfw_resource gcs
 
 override_dh_auto_install:
 	dh_auto_install -- prefix=/usr

package/linux/rpm.mk

@@ -13,7 +13,7 @@ SED_SCRIPT           := $(SED_SCRIPT)' \
 			s/<SOURCE0>/$(notdir $(DIST_TAR_GZ))/g; \
 			s/<SOURCE1>/$(notdir $(FW_DIST_TAR_GZ))/g; \
 			s/<SUMMARY>/$(DESCRIPTION_SHORT)/g; \
-			s/<DESCRIPTION>/$(subst $(NEWLINE),\n,$(DESCRIPTION_LONG))/g; \
+			s/<DESCRIPTION>/$(subst ','"'"',$(subst $(NEWLINE),\n,$(DESCRIPTION_LONG)))/g; \
 			'
 
 RPM_DIRS := $(addprefix $(PACKAGE_DIR)/,BUILD RPMS SOURCES SPECS SRPMS)