cleanup all copydata.pro files

ground/gcs/copydata.pro

@@ -3,9 +3,10 @@ include(gcs.pri)
 TEMPLATE = aux
 
 # Copy Qt runtime libraries into the build directory (to run or package)
-equals(copyqt, 1) {
+
 linux {
-        QT_LIBS = libQt5Core.so.5 \
+    QT_LIBS = \
+        libQt5Core.so.5 \
         libQt5Gui.so.5 \
         libQt5Widgets.so.5 \
         libQt5Network.so.5 \
@@ -31,14 +32,18 @@ equals(copyqt, 1) {
         libicui18n.so.54 \
         libicuuc.so.54 \
         libicudata.so.54
+
     contains(QT_ARCH, x86_64) {
-            QT_LIBS += libqgsttools_p.so.1
+        QT_LIBS += \
+            libqgsttools_p.so.1
     }
+
     for(lib, QT_LIBS) {
         addCopyFileTarget($${lib},$$[QT_INSTALL_LIBS],$${GCS_QT_LIBRARY_PATH})
     }
 
-        QT_PLUGINS = iconengines/libqsvgicon.so \
+    QT_PLUGINS = \
+        iconengines/libqsvgicon.so \
         imageformats/libqgif.so \
         imageformats/libqico.so \
         imageformats/libqjpeg.so \
@@ -48,11 +53,14 @@ equals(copyqt, 1) {
         platforms/libqxcb.so \
         xcbglintegrations/libqxcb-glx-integration.so \
         sqldrivers/libqsqlite.so
+
     contains(QT_ARCH, x86_64) {
-            QT_PLUGINS += mediaservice/libgstaudiodecoder.so \
+        QT_PLUGINS += \
+            mediaservice/libgstaudiodecoder.so \
             mediaservice/libgstmediaplayer.so
     } else {
-            QT_PLUGINS += mediaservice/libqtmedia_audioengine.so
+        QT_PLUGINS += \
+            mediaservice/libqtmedia_audioengine.so
     }
 }
 
@@ -61,7 +69,8 @@ equals(copyqt, 1) {
     CONFIG(debug, debug|release):DS = "d"
 
     # copy Qt DLLs
-        QT_DLLS = Qt5Core$${DS}.dll \
+    QT_DLLS = \
+        Qt5Core$${DS}.dll \
         Qt5Gui$${DS}.dll \
         Qt5Widgets$${DS}.dll \
         Qt5Network$${DS}.dll \
@@ -94,10 +103,13 @@ equals(copyqt, 1) {
         libglib-2.0-0.dll \
         libintl-8.dll \
         libiconv-2.dll
+
     contains(QT_ARCH, i386) {
-            QT_DLLS += libgcc_s_dw2-1.dll
+        QT_DLLS += \
+            libgcc_s_dw2-1.dll
     } else {
-            QT_DLLS += libgcc_s_seh-1.dll
+        QT_DLLS += \
+            libgcc_s_seh-1.dll
     }
 
     for(dll, QT_DLLS) {
@@ -108,6 +120,7 @@ equals(copyqt, 1) {
     OPENSSL_DLLS = \
         ssleay32.dll \
         libeay32.dll
+
     for(dll, OPENSSL_DLLS) {
         addCopyFileTarget($${dll},$$[QT_INSTALL_BINS],$${GCS_APP_PATH})
     }
@@ -115,11 +128,13 @@ equals(copyqt, 1) {
     # copy OpenGL DLL
     OPENGL_DLLS = \
         opengl32.dll
+
     for(dll, OPENGL_DLLS) {
         addCopyFileTarget($${dll},$$[QT_INSTALL_BINS],$${GCS_APP_PATH}/opengl32)
     }
 
-        QT_PLUGINS = iconengines/qsvgicon$${DS}.dll \
+    QT_PLUGINS = \
+        iconengines/qsvgicon$${DS}.dll \
         imageformats/qgif$${DS}.dll \
         imageformats/qico$${DS}.dll \
         imageformats/qjpeg$${DS}.dll \
@@ -138,7 +153,8 @@ equals(copyqt, 1) {
 # Copy QtQuick2 complete directories
 # Some of these directories have a lot of files
 # Easier to copy everything
-    QT_QUICK2_DIRS = QtQuick/Controls \
+QT_QUICK2_DIRS = \
+    QtQuick/Controls \
     QtQuick/Dialogs \
     QtQuick/Layouts \
     QtQuick/LocalStorage \
@@ -147,7 +163,7 @@ equals(copyqt, 1) {
     QtQuick/Window.2 \
     QtQuick/XmlListModel \
     QtQuick.2
+
 for(dir, QT_QUICK2_DIRS) {
     addCopyDirTarget($${dir},$$[QT_INSTALL_QML],$${GCS_QT_QML_PATH})
 }
-}

ground/gcs/gcs.pro

@@ -1,6 +1,7 @@
 #
-# Qmake project for the OpenPilot GCS.
+# Qmake project for the LibrePilot GCS.
 # Copyright (c) 2009-2013, The OpenPilot Team, http://www.openpilot.org
+# Copyright (c) 2015-2016, The LibrePilot Team, http://www.librepilot.org
 #
 
 cache()
@@ -31,6 +32,9 @@ CONFIG   += ordered
 
 DEFINES += USE_PATHPLANNER
 
-SUBDIRS = src copydata
+SUBDIRS = src
 
+equals(copyqt, 1) {
+    SUBDIRS += copydata
     copydata.file = copydata.pro
+}

ground/gcs/src/libs/sdlgamepad/copydata.pro

@@ -1,10 +1,9 @@
-equals(copydata, 1) {
 win32 {
     # copy SDL DLL
     SDL_DLLS = \
         SDL.dll
+
     for(dll, SDL_DLLS) {
         addCopyFileTarget($${dll},$$[QT_INSTALL_BINS],$${GCS_APP_PATH})
     }
 }
-}

ground/gcs/src/libs/sdlgamepad/sdlgamepad.pro

@@ -28,19 +28,16 @@ macx {
     # Ensures that SDL framework and header files are found when compiled with Qt5.2.1
     INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers
     SDL = -F/Library/Frameworks
+
     # Add SDL to CFLAGS fixes build problems on mac
     QMAKE_CFLAGS += $$SDL
     QMAKE_CXXFLAGS += $$SDL
+
     # Let the linker know where to find the frameworks
     LIBS += $$SDL
     LIBS += -framework OpenGL -framework SDL -framework Cocoa
 }
 
-win32 {
-    INCLUDEPATH += $${SDL_DIR}/include
-    LIBS += -L$${SDL_DIR}/lib
-}
-
 !mac:LIBS += -lSDL
 
 SOURCES += \
@@ -56,4 +53,4 @@ OTHER_FILES += \
     sdlgamepad.dox \
     sdlgamepad.doc
 
-include(copydata.pro)
+equals(copydata, 1):include(copydata.pro)

ground/gcs/src/plugins/hitl/aerosimrc/src/copydata.pro

@@ -0,0 +1,36 @@
+# Windows only
+
+# set debug suffix if needed
+win32:CONFIG(debug, debug|release):DS = "d"
+
+win32 {
+    # resources and sample configuration
+    PLUGIN_RESOURCES = \
+        cc_off.tga \
+        cc_off_hover.tga \
+        cc_on.tga \
+        cc_on_hover.tga \
+        cc_plugin.ini \
+        plugin.txt
+
+    for(res, PLUGIN_RESOURCES) {
+        addCopyFileTarget($${res},$${RES_DIR},$${PLUGIN_DIR})
+    }
+
+    # Qt DLLs
+    QT_DLLS = \
+        Qt5Core$${DS}.dll \
+        Qt5Network$${DS}.dll
+
+    for(dll, QT_DLLS) {
+        addCopyFileTarget($${dll},$$[QT_INSTALL_BINS],$${SIM_DIR})
+    }
+
+    # MinGW DLLs
+    #MINGW_DLLS = \
+    #             libgcc_s_dw2-1.dll \
+    #             mingwm10.dll
+    #for(dll, MINGW_DLLS) {
+    #    addCopyFileTarget($${dll},$$(QTMINGW),$${SIM_DIR})
+    #}
+}

ground/gcs/src/plugins/hitl/aerosimrc/src/plugin.pro

@@ -1,15 +1,15 @@
+TEMPLATE = lib
+TARGET = plugin_AeroSIMRC
+
+QT += network
+QT -= gui
+
 !win32 {
     error("AeroSimRC plugin is only available for win32 platform")
 }
 
 include(../../../../../gcs.pri)
 
-QT += network
-QT -= gui
-
-TEMPLATE = lib
-TARGET = plugin_AeroSIMRC
-
 RES_DIR    = $${PWD}/resources
 SIM_DIR    = $$GCS_BUILD_TREE/misc/AeroSIM-RC
 PLUGIN_DIR = $$SIM_DIR/Plugin/CopterControl
@@ -30,37 +30,4 @@ SOURCES = \
     settings.cpp
 
 # Resemble the AeroSimRC directory structure and copy plugin files and resources
-equals(copydata, 1) {
+equals(copydata, 1):include(copydata.pro)
-
-    # Windows release only
-    win32:CONFIG(release, debug|release) {
-
-        # resources and sample configuration
-        PLUGIN_RESOURCES = \
-                cc_off.tga \
-                cc_off_hover.tga \
-                cc_on.tga \
-                cc_on_hover.tga \
-                cc_plugin.ini \
-                plugin.txt
-        for(res, PLUGIN_RESOURCES) {
-            addCopyFileTarget($${res},$${RES_DIR},$${PLUGIN_DIR})
-        }
-
-        # Qt DLLs
-        QT_DLLS = \
-                  Qt5Core.dll \
-                  Qt5Network.dll
-        for(dll, QT_DLLS) {
-            addCopyFileTarget($${dll},$$[QT_INSTALL_BINS],$${SIM_DIR})
-        }
-
-        # MinGW DLLs
-        #MINGW_DLLS = \
-        #             libgcc_s_dw2-1.dll \
-        #             mingwm10.dll
-        #for(dll, MINGW_DLLS) {
-        #    addCopyFileTarget($${dll},$$(QTMINGW),$${SIM_DIR})
-        #}
-    }
-}