Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
aa2bc9aa
Commit
aa2bc9aa
authored
Nov 08, 2015
by
Daniel Agar
Browse files
Merge pull request #2197 from mavlink/appveyor
appveyor cleanup s3 deploy and fix windows installer output
parents
981fbd48
281817eb
Changes
2
Hide whitespace changes
Inline
Side-by-side
.appveyor.yml
View file @
aa2bc9aa
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)
artif
c
at
:
'
release\qgroundcontrol.exe'
artifa
c
t
:
'
release\qgroundcontrol
-installer
.exe'
on
:
CONFIG
:
installer
-
provider
:
GitHub
artifact
:
'
release\qgroundcontrol.exe'
artifact
:
'
release\qgroundcontrol
-installer
.exe'
draft
:
false
prerelease
:
false
on
:
...
...
QGCInstaller.pri
View file @
aa2bc9aa
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment