build cleanups and bugfixes

- introduce a build-time test for flite support to determine if a
  compatible version of flite is installed
- remove duplicate code from apm_planner.pro
- correct spelling of redhat-release in apm_planner.pro
- make installation of debian menu files only happen on debian/ubuntu
  environments
- move sik firmware into /usr/share

QGCSetup.pri

@@ -67,29 +67,30 @@ LinuxBuild {
         DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
 
         #MAKE INSTALL - copy files
-        INSTALLS += target radioup datafiles desktopLink menuLink
+        INSTALLS += target radioup_bin radioup_firmware datafiles desktopLink
 
         target.path =$$BINDIR
 
-        radioup.path = $$BINDIR
-        radioup.files += $$BASEDIR/sik_uploader
+        radioup_bin.path = $$BINDIR
+        radioup_bin.files += $$BASEDIR/sik_uploader/sik_uploader.py
+
+	radioup_firmware.path = $$DATADIR/sik_uploader
+	radioup_firmware.files += $$BASEDIR/sik_uploader/firmware
 
         datafiles.path = $$DATADIR/APMPlanner2
         datafiles.files += $$BASEDIR/files
         datafiles.files += $$BASEDIR/data
         datafiles.files += $$BASEDIR/qml
 
-        #fix up file permissions. Bit of a hack job
-        #permFolders.path = $$DATADIR/APMPlanner2
-        #permFolders.commands += find $$DATADIR -type d -exec chmod 755 {} \\;
-        #permFiles.path = $$DATADIR/APMPlanner2
-        #permFiles.commands += find $$DATADIR -type f -exec chmod 644 {} \\;
-
-        #create menu links
-        desktopLink.path = $$DATADIR/menu
-        desktopLink.files += $$BASEDIR/debian/apmplanner2
-        menuLink.path = $$DATADIR/applications
-        menuLink.files += $$BASEDIR/debian/apmplanner2.desktop
+        desktopLink.path = $$DATADIR/applications
+        desktopLink.files += $$BASEDIR/common/apmplanner2.desktop
+}
+
+DebianIntegration {
+	INSTALLS += menuLink
+
+        menuLink.path = $$DATADIR/menu
+        menuLink.files += $$BASEDIR/debian/apmplanner2.menu
 }
 
 MacBuild {

apm_planner.pro

@@ -25,44 +25,48 @@
 
 message(Qt version $$[QT_VERSION])
 
-# Setup our supported build types. We do this once here and then use the defined config scopes
-# to allow us to easily modify suported build types in one place instead of duplicated throughout
-# the project file.
+# Setup our supported build types. We do this once here and then use the
+# defined config scopes to allow us to easily modify suported build types in
+# one place instead of duplicated throughout the project file.
 
 DEFINES+=DISABLE_3DMOUSE    # Disable 3D mice support for now
 #DEFINES+=ENABLE_CAMRAVIEW   # Example to include camraview
 
-linux-g++-64 {
-    message(Linux build x64_86)
+load(configure)
+
+linux-g++-64 | linux-g++ {
     CONFIG += LinuxBuild
-    DEFINES += Q_LINUX_64
-    DEFINES += FLITE_AUDIO_ENABLED
 
     DISTRO = $$system(lsb_release -i)
+    REDHAT_RELEASE = $$system(cat /etc/redhat-release)
 
-    contains( DISTRO, "Ubuntu" ) {
-        message(Ubuntu Build)
-        DEFINES += Q_UBUNTU
-    }
+    qtCompileTest(has_flite)
 
-    contains( DISTRO, "Arch" ) {
-        message(ArchLinux Build)
-        DEFINES += Q_ARCHLINUX
-        INCLUDEPATH += /usr/include/openssl-1.0
-        LIBRARYPATH += /usr/lib/openssl-1.0
+    linux-g++-64 {
+        message(Linux build x86_64)
+        DEFINES += Q_LINUX_64
     }
 
-} else: linux-g++ {
-    message(Linux build x86)
-    CONFIG += LinuxBuild
-    DEFINES += Q_LINUX_32
-    DEFINES += FLITE_AUDIO_ENABLED
+    linux-g++ {
+        message(Linux build x86)
+        DEFINES += Q_LINUX_32
+    }
 
-    DISTRO = $$system(lsb_release -i)
+    CONFIG(config_has_flite) {
+        message(Enabling flite audio support)
+        DEFINES += FLITE_AUDIO_ENABLED
+    }
 
     contains( DISTRO, "Ubuntu" ) {
         message(Ubuntu Build)
         DEFINES += Q_UBUNTU
+	CONFIG += DebianIntegration
+    }
+
+    contains ( Distro, "Debian" ) {
+        message(Debian Build)
+        DEFINES += Q_DEBIAN
+	CONFIG += DebianIntegration
     }
 
     contains( DISTRO, "Arch" ) {
@@ -72,6 +76,10 @@ linux-g++-64 {
         LIBRARYPATH += /usr/lib/openssl-1.0
     }
 
+    contains( REDHAT_RELEASE, "Fedora" ) {
+        message(Fedora Build)
+        DEFINES += Q_FEDORA
+    }
 } else : win32-msvc2012 | win32-msvc2013 {
     message(Windows build)
     CONFIG += WindowsBuild

debian/apmplanner2.desktop → common/apmplanner2.desktop

@@ -2,9 +2,9 @@
 Type=Application
 Name=APM Planner 2
 GenericName=apmplanner2
-Exec=apmplanner2.sh
+Exec=/usr/bin/apmplanner2
 Terminal=false
 Categories=Education;Robotics;
-Comment=A UAV Ground Station
+Comment=An open-source ground station application for MAVlink based autopilots
 Icon=/usr/share/APMPlanner2/files/APMIcons/ap_rc.png
 

common/apmplanner2.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# On Intel graphics chipsets, the primary flight display can hog the
+# CPU leading to poor system performance. For more details, see:
+# https://github.com/ArduPilot/apm_planner/issues/646
+#
+# To use this wrapper, rename apmplanner2 to apmplanner2.bin and install
+# this script as apmplanner2.
+
+export QSG_RENDER_LOOP=threaded
+exec ${0}.bin "$@"

config.tests/has_flite/has_flite.pro

@@ -0,0 +1,2 @@
+SOURCES = main.cpp
+LIBS += -lflite

config.tests/has_flite/main.cpp

@@ -0,0 +1,9 @@
+/*
+ * check if flite includes the flite_voices_list variable.
+ */
+
+#include <flite/flite.h>
+
+int main() {
+	flite_voice_list;
+}