Merge pull request #3759 from dagar/build_misc

.appveyor.yml

@@ -66,6 +66,7 @@ artifacts:
     name: symbols
 
 deploy:
+# deploy continuous builds to s3
   - provider: S3
     access_key_id:
       secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
@@ -77,6 +78,7 @@ deploy:
     artifact: qgcinstaller
     on:
       CONFIG: installer
+# deploy daily build symbols to s3
   - provider: S3
     access_key_id:
       secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
@@ -89,6 +91,7 @@ deploy:
     on:
       CONFIG: installer
       appveyor_repo_tag: false
+# deploy release symbols to s3
   - provider: S3
     access_key_id:
       secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
@@ -101,6 +104,7 @@ deploy:
     on:
       CONFIG: installer
       appveyor_repo_tag: true
+# deploy tagged releases to Github releases
   - provider: GitHub
     auth_token:
       secure: dzWLqd0eTKjrAWC5LgqVnwLemmrNdddGA2ZZn/OthAP37mwCLkP2C1zil7ivmEE8
@@ -110,3 +114,29 @@ deploy:
     on:
       CONFIG: installer
       appveyor_repo_tag: true
+# deploy tagged releases to s3 version folder
+  - provider: S3
+    access_key_id:
+      secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
+    secret_access_key:
+      secure: RiYqaR+3T2PMNz2j5ur8LCA6H/Zfd4jTX33CZE5iBxm+zaz4QLs25p0B7prpaoNN
+    bucket: qgroundcontrol
+    set_public: true
+    folder: $(APPVEYOR_REPO_TAG)
+    artifact: qgcinstaller
+    on:
+      CONFIG: installer
+      appveyor_repo_tag: true
+# deploy tagged releases to s3 latest folder
+  - provider: S3
+    access_key_id:
+      secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
+    secret_access_key:
+      secure: RiYqaR+3T2PMNz2j5ur8LCA6H/Zfd4jTX33CZE5iBxm+zaz4QLs25p0B7prpaoNN
+    bucket: qgroundcontrol
+    set_public: true
+    folder: latest
+    artifact: qgcinstaller
+    on:
+      CONFIG: installer
+      appveyor_repo_tag: true

.travis.yml

@@ -76,7 +76,7 @@ before_install:
     fi
 
   # setup ccache
-  - ccache -M 500MB && ccache -z
+  #- ccache -M 500MB && ccache -z
 
   # compile threads
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
@@ -167,15 +167,15 @@ script:
     else
         xcodebuild -IDEBuildOperationMaxNumberOfConcurrentCompileTasks=$JOBS -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty -c && $(exit ${PIPESTATUS[0]});
     fi
-  - ccache -s
+  #- ccache -s
 
   # unit tests linux/osx
   - if [[ "${SPEC}" = "linux-g++-64" && "${CONFIG}" = "debug" ]]; then
         mkdir -p ~/.config/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/ &&
-        debug/qgroundcontrol --unittest;
+        ./debug/QGroundControl --unittest;
     elif [[ "${SPEC}" = "macx-clang" && "${CONFIG}" = "debug" ]]; then
         mkdir -p ~/Library/Preferences/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/ &&
-        debug/qgroundcontrol.app/Contents/MacOS/qgroundcontrol --unittest;
+        ./debug/qgroundcontrol.app/Contents/MacOS/QGroundControl --unittest;
     fi
 
 after_success:
@@ -192,7 +192,7 @@ after_success:
         pip install --user google-api-python-client PyOpenSSL &&
         echo "Google Play Track:" ${GOOGLE_PLAY_TRACK} &&
         openssl aes-256-cbc -K $encrypted_25db6eb7c3fd_key -iv $encrypted_25db6eb7c3fd_iv -in android/Google_Play_Android_Developer-4432a3c4f5d1.json.enc -out android/Google_Play_Android_Developer-4432a3c4f5d1.json -d &&
-        tools/google_play_upload.py ${GOOGLE_PLAY_TRACK} org.mavlink.qgroundcontrol ${SHADOW_BUILD_DIR}/release/package/qgroundcontrol.apk
+        tools/google_play_upload.py ${GOOGLE_PLAY_TRACK} org.mavlink.qgroundcontrol ${SHADOW_BUILD_DIR}/release/package/QGroundControl.apk
         ;
     fi
 
@@ -204,7 +204,7 @@ before_deploy:
     fi
 
 deploy:
-  # upload installers to s3 if on a branch
+  # deploy installers to s3 builds/ if on a branch
   - provider: s3
     access_key_id: AKIAIVORNALE7NHD3T6Q
     secret_access_key:
@@ -219,6 +219,36 @@ deploy:
       all_branches: true
       condition: $CONFIG = installer
 
+  # deploy installers to s3 latest/ if on a tag
+  - provider: s3
+    access_key_id: AKIAIVORNALE7NHD3T6Q
+    secret_access_key:
+      secure: BsLXeXUPsCJdX4tawrDnO8OFK5Hk4kzlDTiyH93En6TbjUargVAWDMcHVj7TUhr7+3Tao1W1zb0G4SJe9kHv+jrky0yE72KvoG3YAON0VXWKizxBAKkgHE2RxSTNAwDeKbi2G6YJfNDescBBfX7zEohShdXglQu7CGaUQKRaiI4=
+    bucket: qgroundcontrol
+    local_dir: ${SHADOW_BUILD_DIR}/release/package
+    upload-dir: latest
+    acl: public_read
+    region: us-west-2
+    skip_cleanup: true
+    on:
+      tags: true
+      condition: $CONFIG = installer
+
+  # deploy tagged installers to s3 version folder
+  - provider: s3
+    access_key_id: AKIAIVORNALE7NHD3T6Q
+    secret_access_key:
+      secure: BsLXeXUPsCJdX4tawrDnO8OFK5Hk4kzlDTiyH93En6TbjUargVAWDMcHVj7TUhr7+3Tao1W1zb0G4SJe9kHv+jrky0yE72KvoG3YAON0VXWKizxBAKkgHE2RxSTNAwDeKbi2G6YJfNDescBBfX7zEohShdXglQu7CGaUQKRaiI4=
+    bucket: qgroundcontrol
+    local_dir: ${SHADOW_BUILD_DIR}/release/package
+    upload-dir: builds/${TRAVIS_BRANCH}
+    acl: public_read
+    region: us-west-2
+    skip_cleanup: true
+    on:
+      tags: true
+      condition: $CONFIG = installer
+
   # deploy installers to Github releases if on a tag
   - provider: releases
     api-key:

deploy/qgroundcontrol-start.sh

@@ -7,4 +7,4 @@ export QT_PLUGIN_PATH="${HERE}/Qt/plugins"
 # hack until icon issue with AppImage is resolved
 mkdir -p ~/.icons && cp ${HERE}/qgroundcontrol.png ~/.icons
 
-"${HERE}/qgroundcontrol" "$@"
+"${HERE}/QGroundControl" "$@"

qgroundcontrol.pro

@@ -19,7 +19,7 @@ message(Qt version $$[QT_VERSION])
 
 include(QGCCommon.pri)
 
-TARGET   = qgroundcontrol
+TARGET   = QGroundControl
 TEMPLATE = app
 
 DebugBuild {
@@ -140,7 +140,7 @@ RC_ICONS = resources/icons/qgroundcontrol.ico
 QMAKE_TARGET_COMPANY = "qgroundcontrol.org"
 QMAKE_TARGET_DESCRIPTION = "Open source ground control app provided by QGroundControl dev team"
 QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2016 QGroundControl Development Team. All rights reserved."
-QMAKE_TARGET_PRODUCT = "qgroundcontrol"
+QMAKE_TARGET_PRODUCT = "QGroundControl"
 
 #
 # Build-specific settings

tools/google_play_upload.py

@@ -33,7 +33,7 @@ argparser.add_argument('release_track',
 argparser.add_argument('package_name', 
                        help='The package name. Example: com.android.sample')
 argparser.add_argument('apk_file',
-                       default='qgroundcontrol.apk',
+                       default='QGroundControl.apk',
                        help='The path to the APK file to upload.')