From 5b8ba21675dfe5f013bcafc70dc9e79e93a34a48 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 9 Jul 2016 19:39:42 -0400
Subject: [PATCH] fix qgroundcontrol to QGroundControl rename

---
 QGCInstaller.pri                | 8 ++++----
 android_environment.sh          | 2 +-
 deploy/create_linux_appimage.sh | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/QGCInstaller.pri b/QGCInstaller.pri
index de98aa7d1..7e7fa2eb1 100644
--- a/QGCInstaller.pri
+++ b/QGCInstaller.pri
@@ -29,7 +29,7 @@ installer {
         QMAKE_POST_LINK += && mkdir -p $${DESTDIR}/package
         QMAKE_POST_LINK += && cd $${DESTDIR} && $$dirname(QMAKE_QMAKE)/macdeployqt qgroundcontrol.app -appstore-compliant -verbose=2 -qmldir=$${BASEDIR}/src
         QMAKE_POST_LINK += && cd $${OUT_PWD}
-        QMAKE_POST_LINK += && hdiutil create -verbose -stretch 1g -layout SPUD -srcfolder $${DESTDIR}/qgroundcontrol.app -volname QGroundControl $${DESTDIR}/package/qgroundcontrol.dmg
+        QMAKE_POST_LINK += && hdiutil create -verbose -stretch 1g -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
@@ -44,13 +44,13 @@ installer {
     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 {
         #-- 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
+        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
     }
 }
diff --git a/android_environment.sh b/android_environment.sh
index 04abee5d5..3cfba9ac1 100644
--- a/android_environment.sh
+++ b/android_environment.sh
@@ -25,5 +25,5 @@ export ANDROID_NDK_TOOLS_PREFIX=arm-linux-androideabi
 # cd android_build
 # >~/local/Qt/5.4/android_armv7/bin/qmake -r -spec android-g++ CONFIG+=debug ../qgroundcontrol/qgroundcontrol.pro
 # >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
+# >~/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
 #
diff --git a/deploy/create_linux_appimage.sh b/deploy/create_linux_appimage.sh
index 6a75cff99..5ebb9bd80 100755
--- a/deploy/create_linux_appimage.sh
+++ b/deploy/create_linux_appimage.sh
@@ -14,8 +14,8 @@ if [ ! -f ${QGC_SRC}/qgroundcontrol.pro ]; then
 fi
 
 QGC_RELEASE_DIR=$2
-if [ ! -f ${QGC_RELEASE_DIR}/qgroundcontrol ]; then
-	echo 'please specify path to qgroundcontrol release as the 2nd argument'
+if [ ! -f ${QGC_RELEASE_DIR}/QGroundControl ]; then
+	echo 'please specify path to QGroundControl release as the 2nd argument'
 	exit 1
 fi
 
-- 
2.22.0