Merge pull request #2202 from dogmaphobic/buildWork

iOS Build Work (and other stuff)

.appveyor.yml

@@ -7,8 +7,10 @@ environment:
   matrix:
 #  - BUILD: 'Debug'
 #    CONFIG: debug
+#    SHADOW_BUILD_DIR: $(APPVEYOR_BUILD_FOLDER)\build_windows_debug
   - BUILD: 'Release'
     CONFIG: installer
+    SHADOW_BUILD_DIR: $(APPVEYOR_BUILD_FOLDER)\build_windows_install
 
 install:
   - git submodule update --init --recursive
@@ -18,14 +20,14 @@ install:
   - if "%CONFIG%" EQU "installer" ( cinst nsis -y -installArgs /D="%programfiles(x86)%\NSIS" )
 
 build_script:
-  - C:\Qt\5.5\msvc2013\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn qgroundcontrol.pro
-  - jom
+  - mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.5\msvc2013\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro
+  - cd %SHADOW_BUILD_DIR% && jom
 
 test_script:
-  - if "%CONFIG%" EQU "debug" ( debug\qgroundcontrol --unittest )
+  - if "%CONFIG%" EQU "debug" ( %SHADOW_BUILD_DIR%\debug\qgroundcontrol --unittest )
 
 artifacts:
-  - path: 'release\qgroundcontrol-installer.exe'
+  - path: '%SHADOW_BUILD_DIR%\release\qgroundcontrol-installer.exe'
     name: s3
 
 deploy:
@@ -37,11 +39,11 @@ deploy:
     bucket: qgroundcontrol
     set_public: true
     folder: $(APPVEYOR_REPO_BRANCH)
-    artifact: 'release\qgroundcontrol-installer.exe'
+    artifact: '$(SHADOW_BUILD_DIR)\release\qgroundcontrol-installer.exe'
     on:
       CONFIG: installer
   - provider: GitHub
-    artifact: 'release\qgroundcontrol-installer.exe'
+    artifact: '$(SHADOW_BUILD_DIR)\release\qgroundcontrol-installer.exe'
     draft: false
     prerelease: false
     on:

.travis.yml

@@ -12,24 +12,24 @@ matrix:
     fast_finish: true
     include:
         - os: linux
-          env: SPEC=linux-g++-64 CONFIG=debug
+          env: SPEC=linux-g++-64 CONFIG=debug SHADOW_BUILD_DIR=/tmp/build_linux_debug
           sudo: false
         - os: linux
-          env: SPEC=linux-g++-64 CONFIG=installer
+          env: SPEC=linux-g++-64 CONFIG=installer SHADOW_BUILD_DIR=/tmp/build_linux_install
           sudo: false
         - os: osx
           osx_image: xcode7
-          env: SPEC=macx-clang CONFIG=debug QT_FATAL_WARNINGS=1
+          env: SPEC=macx-clang CONFIG=debug QT_FATAL_WARNINGS=1 SHADOW_BUILD_DIR=/tmp/build_macos_debug
         - os: osx
           osx_image: xcode7
-          env: SPEC=macx-clang CONFIG=installer
+          env: SPEC=macx-clang CONFIG=installer SHADOW_BUILD_DIR=/tmp/build_macos_install
 #        - os: android
 #          language: android
-#          env: SPEC=android-g++ CONFIG=debug
+#          env: SPEC=android-g++ CONFIG=debug SHADOW_BUILD_DIR=/tmp/build_android_debug
 #          sudo: false
         - os: android
           language: android
-          env: SPEC=android-g++ CONFIG=installer
+          env: SPEC=android-g++ CONFIG=installer SHADOW_BUILD_DIR=/tmp/build_android_install
           sudo: false
         - os: linux
           env: CONFIG=doxygen
@@ -109,22 +109,22 @@ before_script:
   - ln -s /usr/bin/ccache ~/bin/gcc-4.8
   - export PATH=~/bin:$PATH
   - if [[ "${TRAVIS_OS_NAME}" = "android" && "${CONFIG}" = "installer" && -z ${ANDROID_STOREPASS} ]]; then export CONFIG=release; fi
-  - if [ "${CONFIG}" != "doxygen" ]; then qmake -r qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=WarningsAsErrorsOn -spec ${SPEC}; fi
+  - if [ "${CONFIG}" != "doxygen" ]; then mkdir ${SHADOW_BUILD_DIR} && cd ${SHADOW_BUILD_DIR} && qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=WarningsAsErrorsOn -spec ${SPEC}; fi
 
 script:
-  - ./tools/update_android_version.sh
+  - cd ${TRAVIS_BUILD_DIR} && ./tools/update_android_version.sh
   - echo 'Building QGroundControl' && echo -en 'travis_fold:start:script.1\\r'
-  - if [ "${CONFIG}" != "doxygen" ]; then make -j4; fi
-  - if [ "${CONFIG}" = "doxygen" ]; then cd src && doxygen documentation.dox; fi
+  - if [ "${CONFIG}" != "doxygen" ]; then cd ${SHADOW_BUILD_DIR} && make -j4; fi
+  - if [ "${CONFIG}" = "doxygen" ]; then cd ${TRAVIS_BUILD_DIR}/src && doxygen documentation.dox; fi
   - echo -en 'travis_fold:end:script.1\\r'
-  - if [[ "${TRAVIS_OS_NAME}" = "linux" && "${CONFIG}" = "debug" ]]; then ./debug/qgroundcontrol --unittest; fi
-  - if [[ "${TRAVIS_OS_NAME}" = "osx" && "${CONFIG}" = "debug" ]]; then ./debug/qgroundcontrol.app/Contents/MacOS/qgroundcontrol --unittest; fi
+  - if [[ "${TRAVIS_OS_NAME}" = "linux" && "${CONFIG}" = "debug" ]]; then ${SHADOW_BUILD_DIR}/debug/qgroundcontrol --unittest; fi
+  - if [[ "${TRAVIS_OS_NAME}" = "osx" && "${CONFIG}" = "debug" ]]; then ${SHADOW_BUILD_DIR}/debug/qgroundcontrol.app/Contents/MacOS/qgroundcontrol --unittest; fi
 
 after_success:
   - if [[ "${TRAVIS_OS_NAME}" = "android" && "${TRAVIS_PULL_REQUEST}" = "false" && "${TRAVIS_BRANCH}" = "master" ]]; then
          pip install --user google-api-python-client PyOpenSSL
       && openssl aes-256-cbc -K $encrypted_25db6eb7c3fd_key -iv $encrypted_25db6eb7c3fd_iv -in Google_Play_Android_Developer-bb93ae7d61ca.p12.enc -out android/Google_Play_Android_Developer-bb93ae7d61ca.p12 -d
-      && ./tools/google_play_upload.py org.mavlink.qgroundcontrol release/package/qgroundcontrol.apk
+      && ${TRAVIS_BUILD_DIR}/tools/google_play_upload.py org.mavlink.qgroundcontrol ${SHADOW_BUILD_DIR}/release/package/qgroundcontrol.apk
       ;
     fi
 
@@ -134,7 +134,7 @@ deploy:
     secret_access_key:
       secure: BsLXeXUPsCJdX4tawrDnO8OFK5Hk4kzlDTiyH93En6TbjUargVAWDMcHVj7TUhr7+3Tao1W1zb0G4SJe9kHv+jrky0yE72KvoG3YAON0VXWKizxBAKkgHE2RxSTNAwDeKbi2G6YJfNDescBBfX7zEohShdXglQu7CGaUQKRaiI4=
     bucket: qgroundcontrol
-    local_dir: release/package
+    local_dir: ${SHADOW_BUILD_DIR}/release/package
     upload-dir: ${TRAVIS_BRANCH}
     acl: public_read
     skip_cleanup: true
@@ -145,9 +145,9 @@ deploy:
     api-key:
       secure: K/Zqr/FCC7QvzFxYvBtCinPkacQq2ubJ2qm982+38Zf/KjibVOF1dEbVdrGZmII6Tg5DaQzNXGYkg5PvYmJgT9xRsqeQjeYIUYqYZpAt+HYWA38AVfMU8jip/1P1wmwqD469nzJOBBa8yfsMs6Ca7tBaNl/zTxCRGnAgEzqtkdQ=
     file:
-      - release/package/qgroundcontrol.apk
-      - release/package/qgroundcontrol.dmg
-      - release/package/qgroundcontrol.tar.bz2
+      - ${SHADOW_BUILD_DIR}/release/package/qgroundcontrol.apk
+      - ${SHADOW_BUILD_DIR}/release/package/qgroundcontrol.dmg
+      - ${SHADOW_BUILD_DIR}/release/package/qgroundcontrol.tar.bz2
     skip_cleanup: true
     on:
       tags: true

QGCCommon.pri

@@ -30,10 +30,13 @@ linux {
     linux-g++ | linux-g++-64 {
         message("Linux build")
         CONFIG += LinuxBuild
+        DEFINES += __STDC_LIMIT_MACROS
     } else : android-g++ {
         message("Android build")
         CONFIG += AndroidBuild MobileBuild
         DEFINES += __android__
+        DEFINES += __STDC_LIMIT_MACROS
+        target.path = $$DESTDIR
         warning("Android build is experimental and not fully functional")
     } else {
         error("Unsuported Linux toolchain, only GCC 32- or 64-bit is supported")
@@ -42,6 +45,7 @@ linux {
     win32-msvc2010 | win32-msvc2012 | win32-msvc2013 {
         message("Windows build")
         CONFIG += WindowsBuild
+        DEFINES += __STDC_LIMIT_MACROS
     } else {
         error("Unsupported Windows toolchain, only Visual Studio 2010, 2012, and 2013 are supported")
     }
@@ -50,6 +54,10 @@ linux {
         message("Mac build")
         CONFIG += MacBuild
         DEFINES += __macos__
+        CONFIG += x86_64
+        CONFIG -= x86
+        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+        QMAKE_MAC_SDK = macosx10.11
         QMAKE_CXXFLAGS += -fvisibility=hidden
     } else {
         error("Unsupported Mac toolchain, only 64-bit LLVM+clang is supported")
@@ -62,6 +70,8 @@ linux {
     CONFIG += iOSBuild MobileBuild app_bundle
     DEFINES += __ios__
     QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
+    QMAKE_IOS_TARGETED_DEVICE_FAMILY = 2 #- iPad only for now
+    QMAKE_LFLAGS += -Wl,-no_pie
     warning("iOS build is experimental and not yet fully functional")
 } else {
     error("Unsupported build platform, only Linux, Windows, Android and Mac (Mac OS and iOS) are supported")
@@ -111,76 +121,22 @@ win32:debug_and_release {
 # Setup our build directories
 
 BASEDIR      = $$IN_PWD
-DESTDIR      = $${OUT_PWD}/debug
-BUILDDIR     = $${OUT_PWD}/build-debug
 
-ReleaseBuild {
-    DESTDIR  = $${OUT_PWD}/release
-    BUILDDIR = $${OUT_PWD}/build-release
-}
-
-iOSBuild {
-    # For whatever reason, the iOS build fails with these set. Some files have the full,
-    # properly concatenaded path and file name while others have only the second portion,
-    # as if BUILDDIR was empty.
-    OBJECTS_DIR = $$(HOME)/tmp/qgcfoo
-    MOC_DIR     = $$(HOME)/tmp/qgcfoo
-    UI_DIR      = $$(HOME)/tmp/qgcfoo
-    RCC_DIR     = $$(HOME)/tmp/qgcfoo
-} else {
-    OBJECTS_DIR = $${BUILDDIR}/obj
-    MOC_DIR     = $${BUILDDIR}/moc
-    UI_DIR      = $${BUILDDIR}/ui
-    RCC_DIR     = $${BUILDDIR}/rcc
+!iOSBuild {
+    OBJECTS_DIR  = $${OUT_PWD}/obj
+    MOC_DIR      = $${OUT_PWD}/moc
+    UI_DIR       = $${OUT_PWD}/ui
+    RCC_DIR      = $${OUT_PWD}/rcc
 }
 
 LANGUAGE = C++
 
-AndroidBuild {
-    target.path = $$DESTDIR
-}
-
-# We place the created plugin lib into the objects dir so that make clean will clean it as well
-iOSBuild {
-    LOCATION_PLUGIN_DESTDIR = $$(HOME)/tmp/qgcfoo
-} else {
-    LOCATION_PLUGIN_DESTDIR = $$OBJECTS_DIR
-}
-
-LOCATION_PLUGIN_NAME = QGeoServiceProviderFactoryQGC
-
-message(BASEDIR $$BASEDIR DESTDIR $$DESTDIR TARGET $$TARGET OUTPUT $$OUT_PWD)
+LOCATION_PLUGIN_DESTDIR = $${OUT_PWD}/src/QtLocationPlugin
+LOCATION_PLUGIN_NAME    = QGeoServiceProviderFactoryQGC
 
 # Turn off serial port warnings
 DEFINES += _TTY_NOWARN_
 
-#
-# OS Specific settings
-#
-
-AndroidBuild {
-    DEFINES += __STDC_LIMIT_MACROS
-}
-
-iOSBuild {
-    QMAKE_IOS_DEPLOYMENT_TARGET = 7.0
-}
-
-MacBuild {
-    CONFIG += x86_64
-    CONFIG -= x86
-    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
-    QMAKE_MAC_SDK = macosx10.11
-}
-
-LinuxBuild {
-    DEFINES += __STDC_LIMIT_MACROS
-}
-
-WindowsBuild {
-    DEFINES += __STDC_LIMIT_MACROS
-}
-
 #
 # By default warnings as errors are turned off. Even so, in order for a pull request
 # to be accepted you must compile cleanly with warnings as errors turned on the default

QGCInstaller.pri

@@ -23,42 +23,44 @@ installer {
         VideoEnabled {
             # Install the gstreamer framework
             # This will:
-            # Copy from the original distibution into libs/lib/Framworks (if not already there)
+            # Copy from the original distibution into DESTDIR/gstwork (if not already there)
             # Prune the framework, removing stuff we don't need
             # Relocate all dylibs so they can work under @executable_path/...
             # Copy the result into the app bundle
             # Make sure qgroundcontrol can find them
             message("Preparing GStreamer Framework")
-            QMAKE_POST_LINK += && $$BASEDIR/tools/prepare_gstreamer_framework.sh $$BASEDIR/libs/lib/Frameworks/ $$DESTDIR/$${TARGET}.app $${TARGET}
+            QMAKE_POST_LINK += && $$BASEDIR/tools/prepare_gstreamer_framework.sh $${OUT_PWD}/gstwork/ $${DESTDIR}/$${TARGET}.app $${TARGET}
         } else {
             message("Skipping GStreamer Framework")
         }
         # We cd to release directory so we can run macdeployqt without a path to the
         # qgroundcontrol.app file. If you specify a path to the .app file the symbolic
         # links to plugins will not be created correctly.
-        QMAKE_POST_LINK += && cd release && mkdir package
-        QMAKE_POST_LINK += && $$dirname(QMAKE_QMAKE)/macdeployqt qgroundcontrol.app -verbose=2 -qmldir=../src
-        QMAKE_POST_LINK += && cd ..
+        QMAKE_POST_LINK += && mkdir -p $${DESTDIR}/package
+        QMAKE_POST_LINK += && cd $${DESTDIR} && $$dirname(QMAKE_QMAKE)/macdeployqt qgroundcontrol.app -verbose=2 -qmldir=$${BASEDIR}/src
+        QMAKE_POST_LINK += && cd $${OUT_PWD}
         QMAKE_POST_LINK += && hdiutil create -layout SPUD -srcfolder $${DESTDIR}/qgroundcontrol.app -volname QGroundControl $${DESTDIR}/package/qgroundcontrol.dmg
     }
     WindowsBuild {
-		# The pdb moving command are commented out for now since we are including the .pdb in the installer. This makes it much
-		# easier to debug user crashes.
-		#QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY $${DESTDIR_WIN}\\qgroundcontrol.pdb
-		#QMAKE_POST_LINK += $$escape_expand(\\n) del $${DESTDIR_WIN}\\qgroundcontrol.pdb
-        QMAKE_POST_LINK += $$escape_expand(\\n) $$quote("\"C:\\Program Files \(x86\)\\NSIS\\makensis.exe\"" /NOCD "\"/XOutFile $${DESTDIR_WIN}\\qgroundcontrol-installer.exe\"" "$$BASEDIR_WIN\\deploy\\qgroundcontrol_installer.nsi")
-		#QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY qgroundcontrol.pdb $${DESTDIR_WIN}
-		#QMAKE_POST_LINK += $$escape_expand(\\n) del qgroundcontrol.pdb
+        # The pdb moving command are commented out for now since we are including the .pdb in the installer. This makes it much
+        # easier to debug user crashes.
+        #QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY $${DESTDIR_WIN}\\qgroundcontrol.pdb
+        #QMAKE_POST_LINK += $$escape_expand(\\n) del $${DESTDIR_WIN}\\qgroundcontrol.pdb
+        QMAKE_POST_LINK += $$escape_expand(\\n) cd $$BASEDIR_WIN && $$quote("\"C:\\Program Files \(x86\)\\NSIS\\makensis.exe\"" /NOCD "\"/XOutFile $${DESTDIR_WIN}\\qgroundcontrol-installer.exe\"" "$$BASEDIR_WIN\\deploy\\qgroundcontrol_installer.nsi")
+        #QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY qgroundcontrol.pdb $${DESTDIR_WIN}
+        #QMAKE_POST_LINK += $$escape_expand(\\n) del qgroundcontrol.pdb
         OTHER_FILES += deploy/qgroundcontrol_installer.nsi
     }
     LinuxBuild {
+        #-- TODO: This uses hardcoded paths. It should use $${DESTDIR}
         QMAKE_POST_LINK += && mkdir -p release/package
-        QMAKE_POST_LINK += && tar -cjf release/package/qgroundcontrol.tar.bz2 release --exclude='package' --transform 's/release/qgroundcontrol/' 
+        QMAKE_POST_LINK += && tar -cjf release/package/qgroundcontrol.tar.bz2 release --exclude='package' --transform 's/release/qgroundcontrol/'
     }
     AndroidBuild {
-        QMAKE_POST_LINK += && mkdir -p release/package
-        QMAKE_POST_LINK += && make install INSTALL_ROOT=release/android-build/
-        QMAKE_POST_LINK += && androiddeployqt --input android-libqgroundcontrol.so-deployment-settings.json --output release/android-build --deployment bundled --gradle --sign android/android_release.keystore dagar --storepass $$(ANDROID_STOREPASS)
-        QMAKE_POST_LINK += && cp release/android-build/build/outputs/apk/android-build-release-signed.apk release/package/qgroundcontrol.apk
+        #-- TODO: This uses hardcoded paths. It should use $${DESTDIR}
+        QMAKE_POST_LINK += && mkdir -p $${DESTDIR}/package
+        QMAKE_POST_LINK += && make install INSTALL_ROOT=$${DESTDIR}/android-build/
+        QMAKE_POST_LINK += && androiddeployqt --input android-libqgroundcontrol.so-deployment-settings.json --output $${DESTDIR}/android-build --deployment bundled --gradle --sign $${BASEDIR}/android/android_release.keystore dagar --storepass $$(ANDROID_STOREPASS)
+        QMAKE_POST_LINK += && cp $${DESTDIR}/android-build/build/outputs/apk/android-build-release-signed.apk $${DESTDIR}/package/qgroundcontrol.apk
     }
 }

QGCLocationPlugin.pro

-include(QGCCommon.pri)
-
-TEMPLATE     = lib
-TARGET       = QGeoServiceProviderFactoryQGC
-CONFIG      += plugin static
-QT          += location-private positioning-private network
-PLUGIN_TYPE  = geoservices
-
-DESTDIR      = $${LOCATION_PLUGIN_DESTDIR}
-
-contains(QT_VERSION, 5.5.1) {
-
-    message(Using Local QtLocation headers for Qt 5.5.1)
-
-    INCLUDEPATH += \
-        libs/qtlocation/include \
-
-} else {
-
-    message(Using Default QtLocation headers)
-
-    INCLUDEPATH += $$QT.location.includes
-
-}
-
-HEADERS += \
-    src/QtLocationPlugin/qgeoserviceproviderpluginqgc.h \
-    src/QtLocationPlugin/qgeotiledmappingmanagerengineqgc.h \
-    src/QtLocationPlugin/qgeotilefetcherqgc.h \
-    src/QtLocationPlugin/qgeomapreplyqgc.h \
-    src/QtLocationPlugin/qgeocodingmanagerengineqgc.h \
-    src/QtLocationPlugin/qgeocodereplyqgc.h \
-    src/QtLocationPlugin/OpenPilotMaps.h
-
-SOURCES += \
-    src/QtLocationPlugin/qgeoserviceproviderpluginqgc.cpp \
-    src/QtLocationPlugin/qgeotiledmappingmanagerengineqgc.cpp \
-    src/QtLocationPlugin/qgeotilefetcherqgc.cpp \
-    src/QtLocationPlugin/qgeomapreplyqgc.cpp \
-    src/QtLocationPlugin/qgeocodingmanagerengineqgc.cpp \
-    src/QtLocationPlugin/qgeocodereplyqgc.cpp \
-    src/QtLocationPlugin/OpenPilotMaps.cc
-
-OTHER_FILES += \
-    src/QtLocationPlugin/qgc_maps_plugin.json

QGCSetup.pri

@@ -51,106 +51,10 @@ WindowsBuild {
 #
 
 MacBuild {
-
-	# Copy non-standard libraries and frameworks into app package
-    QMAKE_POST_LINK += && $$QMAKE_COPY_DIR $$BASEDIR/libs/lib/mac64/lib $$DESTDIR/$${TARGET}.app/Contents/libs
+    # Copy non-standard frameworks into app package
     QMAKE_POST_LINK += && rsync -a --delete $$BASEDIR/libs/lib/Frameworks $$DESTDIR/$${TARGET}.app/Contents/
-
-	# Fix library paths inside executable
-
-    INSTALL_NAME_TARGET = $$DESTDIR/$${TARGET}.app/Contents/MacOS/$${TARGET}
-    INSTALL_NAME_LIB_LIST = \
-        libOpenThreads.dylib \
-        libosg.dylib \
-        libosgViewer.dylib \
-        libosgGA.dylib \
-        libosgDB.dylib \
-        libosgText.dylib \
-        libosgWidget.dylib
-    for(INSTALL_NAME_LIB, INSTALL_NAME_LIB_LIST) {
-        QMAKE_POST_LINK += && install_name_tool -change $$INSTALL_NAME_LIB "@executable_path/../libs/$${INSTALL_NAME_LIB}" $$INSTALL_NAME_TARGET
-    }
-
-	# Fix library paths within libraries (inter-library dependencies)
-
-	# OSG GA LIBRARY
-    INSTALL_NAME_TARGET = $$DESTDIR/$${TARGET}.app/Contents/libs/libosgGA.dylib
-    INSTALL_NAME_LIB_LIST = \
-        libOpenThreads.dylib \
-        libosg.dylib \
-        libosgGA.dylib \
-        libosgDB.dylib \
-        libosgUtil.dylib
-    for(INSTALL_NAME_LIB, INSTALL_NAME_LIB_LIST) {
-        QMAKE_POST_LINK += && install_name_tool -change $$INSTALL_NAME_LIB "@executable_path/../libs/$${INSTALL_NAME_LIB}" $$INSTALL_NAME_TARGET
-    }
-
-	# OSG DB LIBRARY
-    INSTALL_NAME_TARGET = $$DESTDIR/$${TARGET}.app/Contents/libs/libosgDB.dylib
-    INSTALL_NAME_LIB_LIST = \
-        libOpenThreads.dylib \
-        libosg.dylib \
-        libosgDB.dylib \
-        libosgUtil.dylib
-    for(INSTALL_NAME_LIB, INSTALL_NAME_LIB_LIST) {
-        QMAKE_POST_LINK += && install_name_tool -change $$INSTALL_NAME_LIB "@executable_path/../libs/$${INSTALL_NAME_LIB}" $$INSTALL_NAME_TARGET
-    }
-
-	# OSG TEXT LIBRARY
-    INSTALL_NAME_TARGET = $$DESTDIR/$${TARGET}.app/Contents/libs/libosgText.dylib
-    INSTALL_NAME_LIB_LIST = \
-        libOpenThreads.dylib \
-        libosg.dylib \
-        libosgDB.dylib \
-        libosgUtil.dylib \
-        libosgText.dylib
-    for(INSTALL_NAME_LIB, INSTALL_NAME_LIB_LIST) {
-        QMAKE_POST_LINK += && install_name_tool -change $$INSTALL_NAME_LIB "@executable_path/../libs/$${INSTALL_NAME_LIB}" $$INSTALL_NAME_TARGET
-    }
-
-	# OSG UTIL LIBRARY
-    INSTALL_NAME_TARGET = $$DESTDIR/$${TARGET}.app/Contents/libs/libosgUtil.dylib
-    INSTALL_NAME_LIB_LIST = \
-        libOpenThreads.dylib \
-        libosg.dylib
-    for(INSTALL_NAME_LIB, INSTALL_NAME_LIB_LIST) {
-        QMAKE_POST_LINK += && install_name_tool -change $$INSTALL_NAME_LIB "@executable_path/../libs/$${INSTALL_NAME_LIB}" $$INSTALL_NAME_TARGET
-    }
-
-
-	# OSG VIEWER LIBRARY
-    INSTALL_NAME_TARGET = $$DESTDIR/$${TARGET}.app/Contents/libs/libosgViewer.dylib
-    INSTALL_NAME_LIB_LIST = \
-        libOpenThreads.dylib \
-        libosg.dylib \
-        libosgGA.dylib \
-        libosgDB.dylib \
-        libosgUtil.dylib \
-        libosgText.dylib
-    for(INSTALL_NAME_LIB, INSTALL_NAME_LIB_LIST) {
-        QMAKE_POST_LINK += && install_name_tool -change $$INSTALL_NAME_LIB "@executable_path/../libs/$${INSTALL_NAME_LIB}" $$INSTALL_NAME_TARGET
-    }
-
-	# OSG WIDGET LIBRARY
-    INSTALL_NAME_TARGET = $$DESTDIR/$${TARGET}.app/Contents/libs/libosgWidget.dylib
-    INSTALL_NAME_LIB_LIST = \
-        libOpenThreads.dylib \
-        libosg.dylib \
-        libosgGA.dylib \
-        libosgDB.dylib \
-        libosgUtil.dylib \
-        libosgText.dylib \
-        libosgViewer.dylib
-    for(INSTALL_NAME_LIB, INSTALL_NAME_LIB_LIST) {
-        QMAKE_POST_LINK += && install_name_tool -change $$INSTALL_NAME_LIB "@executable_path/../libs/$${INSTALL_NAME_LIB}" $$INSTALL_NAME_TARGET
-    }
-
-	# CORE OSG LIBRARY
-    QMAKE_POST_LINK += && install_name_tool -change libOpenThreads.dylib "@executable_path/../libs/libOpenThreads.dylib" $$DESTDIR/$${TARGET}.app/Contents/libs/libosg.dylib
-
     # SDL Framework
     QMAKE_POST_LINK += && install_name_tool -change "@rpath/SDL.framework/Versions/A/SDL" "@executable_path/../Frameworks/SDL.framework/Versions/A/SDL" $$DESTDIR/$${TARGET}.app/Contents/MacOS/$${TARGET}
-
 }
 
 WindowsBuild {
@@ -165,29 +69,29 @@ WindowsBuild {
         $$BASEDIR\\libs\\thirdParty\\libxbee\\lib\\libxbee.dll
 
     for(COPY_FILE, COPY_FILE_LIST) {
-		QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$COPY_FILE\" \"$$DESTDIR_WIN\"
+        QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$COPY_FILE\" \"$$DESTDIR_WIN\"
     }
 
 
         ReleaseBuild {
-		# Copy Visual Studio DLLs
-		# Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed.
-		win32-msvc2010 {
-			QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp100.dll\"  \"$$DESTDIR_WIN\"
-			QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcr100.dll\"  \"$$DESTDIR_WIN\"
-		}
-		else:win32-msvc2012 {
-			QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp110.dll\"  \"$$DESTDIR_WIN\"
-			QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcr110.dll\"  \"$$DESTDIR_WIN\"
-		}
-		else:win32-msvc2013 {
-			QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp120.dll\"  \"$$DESTDIR_WIN\"
-			QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcr120.dll\"  \"$$DESTDIR_WIN\"
-		}
-		else {
-			error("Visual studio version not supported, installation cannot be completed.")
-		}
-	}
+        # Copy Visual Studio DLLs
+        # Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed.
+        win32-msvc2010 {
+            QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp100.dll\"  \"$$DESTDIR_WIN\"
+            QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcr100.dll\"  \"$$DESTDIR_WIN\"
+        }
+        else:win32-msvc2012 {
+            QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp110.dll\"  \"$$DESTDIR_WIN\"
+            QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcr110.dll\"  \"$$DESTDIR_WIN\"
+        }
+        else:win32-msvc2013 {
+            QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp120.dll\"  \"$$DESTDIR_WIN\"
+            QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcr120.dll\"  \"$$DESTDIR_WIN\"
+        }
+        else {
+            error("Visual studio version not supported, installation cannot be completed.")
+        }
+    }
 
     DEPLOY_TARGET = $$shell_quote($$shell_path($$DESTDIR_WIN\\$${TARGET}.exe))
     QMAKE_POST_LINK += $$escape_expand(\\n) windeployqt --no-compiler-runtime --qmldir=$${BASEDIR_WIN}\\src $${DEPLOY_TARGET}

android_environment.sh

 #!/bin/bash
 #----------------------------------------------------------
 # You will need:
-# - Qt 5.4 android_armv7 kit
+# - Qt 5.5.x android_armv7 kit
 # - Android SDK
 # - Androig NDK
 # - Current Java
@@ -10,7 +10,7 @@
 # Update with correct location for these
 export ANDROID_HOME=~/Library/Android/sdk
 export ANDROID_SDK_ROOT=~/Library/Android/sdk
-export ANDROID_NDK_ROOT=~/Library/Android/ndk
+export ANDROID_NDK_ROOT=~/Library/Android/sdk/ndk-bundle
 export ANDROID_NDK_HOST=darwin-x86_64
 export ANDROID_NDK_PLATFORM=/android-9
 export ANDROID_NDK_TOOLCHAIN_PREFIX=arm-linux-androideabi
@@ -19,19 +19,11 @@ export ANDROID_NDK_TOOLS_PREFIX=arm-linux-androideabi
 #----------------------------------------------------------
 # To build it, run (replacing the path with where you have Qt installed)
 #
-# For a shadow build: (strongly recomended)
-#
 # >source android_environment.sh
 # cd ../
 # mkdir android_build
 # cd android_build
 # >~/local/Qt/5.4/android_armv7/bin/qmake -r -spec android-g++ CONFIG+=debug ../qgroundcontrol/qgroundcontrol.pro
-# >make -j24
-# >~/local/Qt/5.4/android_armv7/bin/androiddeployqt --input ./android-libqgroundcontrol.so-deployment-settings.json --output ./android-build --deployment bundled --android-platform android-22 --jdk /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home --verbose --ant /opt/local/bin/ant
-#
-# For an in place build (not recomended)
+# >make -j24 install INSTALL_ROOT=./android-build/
+# >~/local/Qt/5.4/android_armv7/bin/androiddeployqt --input ./android-libqgroundcontrol.so-deployment-settings.json --output ./android-build --deployment bundled --android-platform android-22 --jdk /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home --verbose --ant /usr/local/bin/ant
 #
-# >source android_environment.sh
-# >~/local/Qt/5.4/android_armv7/bin/qmake -r -spec android-g++ CONFIG+=debug qgroundcontrol.pro
-# >make -j24
-# >~/local/Qt/5.4/android_armv7/bin/androiddeployqt --input ./android-libqgroundcontrol.so-deployment-settings.json --output ./android-build --deployment bundled --android-platform android-22 --jdk /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home --verbose --ant /opt/local/bin/ant

deploy/qgroundcontrol_installer.nsi

@@ -13,7 +13,7 @@ LicenseData license.txt
 
 Section
   SetOutPath $INSTDIR
-  File /r release\*.*
+  File /r build_windows_install\release\*.*
   File deploy\px4driver.msi
   WriteUninstaller $INSTDIR\QGroundControl_uninstall.exe
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\QGroundControl" "DisplayName" "QGroundControl"