From 281817eb9c8fbbaab296aa0a3bf1a0c3619549d0 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 7 Nov 2015 18:01:59 -0500
Subject: [PATCH] appveyor cleanup s3 deploy

-qmake rename installer output
---
 .appveyor.yml    | 14 +++++++++-----
 QGCInstaller.pri |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 7c820fc31..008636fbd 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,3 +1,7 @@
+version: '{branch}-{build}'
+
+build:
+  verbosity: minimal
 
 environment:
   matrix:
@@ -20,12 +24,12 @@ build_script:
 test_script:
   - if "%CONFIG%" EQU "debug" ( debug\qgroundcontrol --unittest )
 
-after_build:
-  - if "%CONFIG%" EQU "installer" ( if defined %APPVEYOR_PULL_REQUEST_NUMBER% ( appveyor PushArtifact C:\projects\qgroundcontrol\release\qgroundcontrol.exe ) )
+artifacts:
+  - path: 'release\qgroundcontrol-installer.exe'
+    name: s3
 
 deploy:
   - provider: S3
-    name: qgroundcontrol-s3
     access_key_id:
       secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
     secret_access_key:
@@ -33,11 +37,11 @@ deploy:
     bucket: qgroundcontrol
     set_public: true
     folder: $(APPVEYOR_REPO_BRANCH)
-    artifcat: 'release\qgroundcontrol.exe'
+    artifact: 'release\qgroundcontrol-installer.exe'
     on:
       CONFIG: installer
   - provider: GitHub
-    artifact: 'release\qgroundcontrol.exe'
+    artifact: 'release\qgroundcontrol-installer.exe'
     draft: false
     prerelease: false
     on:
diff --git a/QGCInstaller.pri b/QGCInstaller.pri
index d885dc692..553916cc1 100644
--- a/QGCInstaller.pri
+++ b/QGCInstaller.pri
@@ -46,7 +46,7 @@ installer {
 		# 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.exe\"" "$$BASEDIR_WIN\\deploy\\qgroundcontrol_installer.nsi")
+        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
         OTHER_FILES += deploy/qgroundcontrol_installer.nsi
-- 
2.22.0