Merge pull request #3472 from dogmaphobic/iosAppStore

Ios app store

.gitignore

@@ -60,6 +60,9 @@ gstreamer-1.0-android*
 *.autosave
 .settings/
 
+# iOS Generated files
+ios/iOSForAppStore-Info.plist
+
 # Generated files
 moc_*
 ui_*

build_ios.sh

+#!/bin/bash
+if [ ! -d /Volumes/RAMDisk ] ; then
+    echo 'RAM Disk not found'
+    echo 'Only used for App Store builds. It will not work on your computer.'
+    exit 1
+fi
+#-- Set to my local installation
+QMAKE=/Applications/Qt/5.5/ios/bin/qmake
+#-- Using Travis variables as this will eventually live there
+SHADOW_BUILD_DIR=/Volumes/RAMDisk/build-qgroundcontrol-iOS-Release
+TRAVIS_BUILD_DIR=/Users/gus/github/work/qgroundcontrol
+#-- Build it
+mkdir -p ${SHADOW_BUILD_DIR} &&
+cd ${SHADOW_BUILD_DIR} &&
+${QMAKE} -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=WarningsAsErrorsOn CONFIG-=debug_and_release CONFIG+=release CONFIG+=ForAppStore &&
+xcodebuild -configuration Release -xcconfig ${TRAVIS_BUILD_DIR}/ios/qgroundcontrol_appstore.xcconfig

ios/iOS-Info.plist

@@ -6,26 +6,24 @@
     <string>QGroundControl</string>
     <key>CFBundleExecutable</key>
     <string>qgroundcontrol</string>
-    <key>CFBundleGetInfoString</key>
-    <string>Created by Qt/QMake</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>Open Source Flight Systems GmbH - Internal Build</string>
     <key>CFBundleIconFile</key>
     <string></string>
     <key>CFBundleIdentifier</key>
-    <string>org.mavlink.qgroundcontrol</string>
+    <string>org.QGroundControl.qgc</string>
     <key>CFBundleName</key>
     <string>QGroundControl</string>
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>#.#.#</string>
+    <string>0.0.0</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>###</string>
+    <string>1</string>
     <key>LSRequiresIPhoneOS</key>
     <true/>
-    <key>NOTE</key>
-    <string>This file was generated by Qt/QMake.</string>
     <key>UILaunchStoryboardName</key>
     <string>QGCLaunchScreen</string>
     <key>UIRequiresFullScreen</key>
@@ -80,6 +78,7 @@
                 <string>AppIcon72x72@2x~ipad.png</string>
                 <string>AppIcon76x76~ipad.png</string>
                 <string>AppIcon76x76@2x~ipad.png</string>
+                <string>AppIcon83.5x83.5@2x~ipad.png</string>
             </array>
         </dict>
     </dict>

ios/iOSForAppStore-Info.plist → ios/iOSForAppStore-Info-Source.plist

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
+<plist version="1">
 <dict>
     <key>CFBundleDisplayName</key>
     <string>QGroundControl</string>
     <key>CFBundleExecutable</key>
     <string>qgroundcontrol</string>
-    <key>CFBundleGetInfoString</key>
-    <string>Created by Qt/QMake</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>Open Source Flight Systems GmbH</string>
     <key>CFBundleIconFile</key>
     <string></string>
-    <key>CFBundleIdentifier</key>
-    <string>com.grubba.qgroundcontrol</string>
-    <key>CFBundleName</key>
-    <string>QGroundControl</string>
-    <key>CFBundlePackageType</key>
-    <string>APPL</string>
-    <key>CFBundleShortVersionString</key>
-    <string>#.#.#</string>
-    <key>CFBundleSignature</key>
-    <string>????</string>
-    <key>CFBundleVersion</key>
-    <string>###</string>
-    <key>LSRequiresIPhoneOS</key>
-    <true/>
-    <key>NOTE</key>
-    <string>This file was generated by Qt/QMake.</string>
-    <key>UILaunchStoryboardName</key>
-    <string>QGCLaunchScreen</string>
-    <key>UIRequiresFullScreen</key>
-    <true/>
-    <key>CFBundleInfoDictionaryVersion</key>
-    <string>6.0</string>
-    <key>ForAppStore</key>
-    <string>Yes</string>
-    <key>NSLocationUsageDescription</key>
-    <string>Ground Station Location</string>
-    <key>NSLocationWhenInUseUsageDescription</key>
-    <string>Ground Station Location</string>
-    <key>UISupportedInterfaceOrientations</key>
-    <array>
-        <string>UIInterfaceOrientationLandscapeLeft</string>
-        <string>UIInterfaceOrientationLandscapeRight</string>
-    </array>
     <key>CFBundleIcons</key>
     <dict>
         <key>CFBundlePrimaryIcon</key>
@@ -80,8 +47,40 @@
                 <string>AppIcon72x72@2x~ipad.png</string>
                 <string>AppIcon76x76~ipad.png</string>
                 <string>AppIcon76x76@2x~ipad.png</string>
+                <string>AppIcon83.5x83.5@2x~ipad.png</string>
             </array>
         </dict>
     </dict>
+    <key>CFBundleIdentifier</key>
+    <string>org.QGroundControl.qgc</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>QGroundControl</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>###VERSION###</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleVersion</key>
+    <string>###BUILD###</string>
+    <key>ForAppStore</key>
+    <string>Yes</string>
+    <key>LSRequiresIPhoneOS</key>
+    <true/>
+    <key>NSLocationUsageDescription</key>
+    <string>Ground Station Location</string>
+    <key>NSLocationWhenInUseUsageDescription</key>
+    <string>Ground Station Location</string>
+    <key>UILaunchStoryboardName</key>
+    <string>QGCLaunchScreen</string>
+    <key>UIRequiresFullScreen</key>
+    <true/>
+    <key>UISupportedInterfaceOrientations</key>
+    <array>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+    </array>
 </dict>
 </plist>

ios/qgroundcontrol.xcconfig

+CODE_SIGN_IDENTITY = "";
+CODE_SIGNING_REQUIRED = NO;
+CLANG_WARN_BOOL_CONVERSION = YES;
+CLANG_WARN_CONSTANT_CONVERSION = YES;
+CLANG_WARN_EMPTY_BODY = YES;
+CLANG_WARN_ENUM_CONVERSION = YES;
+CLANG_WARN_INT_CONVERSION = YES;
+CLANG_WARN_UNREACHABLE_CODE = YES;
+CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ENABLE_STRICT_OBJC_MSGSEND = YES;
+GCC_NO_COMMON_BLOCKS = YES;
+GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+GCC_WARN_ABOUT_RETURN_TYPE = YES;
+GCC_WARN_UNDECLARED_SELECTOR = YES;
+GCC_WARN_UNINITIALIZED_AUTOS = YES;
+GCC_WARN_UNUSED_FUNCTION = YES;
+GCC_WARN_UNUSED_VARIABLE = YES;

ios/qgroundcontrol_appstore.xcconfig

+CODE_SIGN_IDENTITY = "iPhone Distribution";
+PROVISIONING_PROFILE = f22bae36-10c2-4fd8-b6f1-c83e47765614;
+CLANG_WARN_BOOL_CONVERSION = YES;
+CLANG_WARN_CONSTANT_CONVERSION = YES;
+CLANG_WARN_EMPTY_BODY = YES;
+CLANG_WARN_ENUM_CONVERSION = YES;
+CLANG_WARN_INT_CONVERSION = YES;
+CLANG_WARN_UNREACHABLE_CODE = YES;
+CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ENABLE_STRICT_OBJC_MSGSEND = YES;
+GCC_NO_COMMON_BLOCKS = YES;
+GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+GCC_WARN_ABOUT_RETURN_TYPE = YES;
+GCC_WARN_UNDECLARED_SELECTOR = YES;
+GCC_WARN_UNINITIALIZED_AUTOS = YES;
+GCC_WARN_UNUSED_FUNCTION = YES;
+GCC_WARN_UNUSED_VARIABLE = YES;

qgroundcontrol.pro

@@ -117,6 +117,12 @@ iOSBuild {
     #-- Info.plist (need an "official" one for the App Store)
     ForAppStore {
         message(App Store Build)
+        #-- Create official, versioned Info.plist
+        APP_STORE = $$system(cd $${BASEDIR} && $${BASEDIR}/tools/update_ios_version.sh $${BASEDIR}/ios/iOSForAppStore-Info-Source.plist $${BASEDIR}/ios/iOSForAppStore-Info.plist)
+        APP_ERROR = $$find(APP_STORE, "Error")
+        count(APP_ERROR, 1) {
+            error("Error building .plist file. 'ForAppStore' builds are only possible through the official build system.")
+        }
         QMAKE_INFO_PLIST  = $${BASEDIR}/ios/iOSForAppStore-Info.plist
         OTHER_FILES      += $${BASEDIR}/ios/iOSForAppStore-Info.plist
     } else {

src/audio/QGCAudioWorker_iOS.mm

@@ -54,7 +54,7 @@ void SpeakIOS::speak(QString msg)
     AVSpeechUtterance *utterance = [[[AVSpeechUtterance alloc] initWithString: msg_ns] autorelease];
     AVSpeechSynthesisVoice* currentVoice = [AVSpeechSynthesisVoice voiceWithLanguage:[AVSpeechSynthesisVoice currentLanguageCode]];
     utterance.voice = currentVoice;
-    //utterance.voice = [AVSpeechSynthesisVoice voiceWithLanguage:@"en-US"];
+    utterance.voice = [AVSpeechSynthesisVoice voiceWithLanguage:@"en-US"];
     utterance.rate  = 0.5;
     [_synth speakUtterance:utterance];
 }

src/ui/MainWindowInner.qml

@@ -267,7 +267,6 @@ Item {
         z:                  QGroundControl.zOrderTopMost + 100
         active:             visible
         onVisibleChanged: {
-            console.log("Visible: " + visible)
             if(!visible) {
                 source = ""
             }

tools/update_ios_version.sh

+#!/usr/bin/env bash
+
+# this requires `master` in the git tree
+#  travis-ci branch builds are unable to set the version properly
+
+PLIST_FILE_SRC=$1
+PLIST_FILE_DST=$2
+
+BUILD_CODE=`git rev-list master --first-parent --count`
+VERSION_CODE=`git describe --always --tags | sed -e 's/[^0-9.]*\([0-9.]*\).*/\1/'`
+
+if [ -z "$BUILD_CODE" -o -z "$VERSION_CODE" ]; then
+    echo "Error: Version and/or build empty."
+    exit 1 # Cause the build to fail
+else
+    echo "Version: ${VERSION_CODE}"
+    echo "Build:   ${BUILD_CODE}"
+fi
+
+sed -e "s/\###BUILD###/${BUILD_CODE}/" -e "s/\###VERSION###/${VERSION_CODE}/" $PLIST_FILE_SRC > $PLIST_FILE_DST