Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
aa2bc9aa
Commit
aa2bc9aa
authored
Nov 08, 2015
by
Daniel Agar
Browse files
Options
Browse Files
Download
Plain Diff
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
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
.appveyor.yml
.appveyor.yml
+9
-5
QGCInstaller.pri
QGCInstaller.pri
+1
-1
No files found.
.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
cat
:
'
release\qgroundcontrol
.exe'
artif
act
:
'
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
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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