Skip to content

Commit

Permalink
- Use NSIS installer + script from AppVeyor tracker / closer to CI bu…
Browse files Browse the repository at this point in the history
…ilder

- Include appveyor YAML script in windows build other files

See also: appveyor/ci#743
  • Loading branch information
NaterGator committed Apr 12, 2016
1 parent cd281bb commit 7589ddc
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
10 changes: 8 additions & 2 deletions .appveyor.yml
Expand Up @@ -17,8 +17,14 @@ install:
- call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
- set PATH=C:\Qt\Tools\QtCreator\bin;C:\Qt\5.5\msvc2013\bin;%PATH%
- mkdir %LOCALAPPDATA%\QtProject && copy test\qtlogging.ini %LOCALAPPDATA%\QtProject\
- ps: Start-FileDownload https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/nsis-3.0rc1-setup.exe -FileName nsis.exe
- nsis.exe /S
- ps: |
Write-Host "Installing NSIS..." -ForegroundColor Cyan
$exePath = "$($env:USERPROFILE)\nsis-3.0rc1-setup.exe"
Write-Host "Downloading..."
(New-Object Net.WebClient).DownloadFile('https://storage.googleapis.com/appveyor-download-cache/nsis/nsis-3.0rc1-setup.exe', $exePath)
Write-Host "Installing..."
cmd /c start /wait $exePath /S
Write-Host "Installed" -ForegroundColor Green
build_script:
- mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.5\msvc2013\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro
Expand Down
1 change: 1 addition & 0 deletions qgroundcontrol.pro
Expand Up @@ -312,6 +312,7 @@ WindowsBuild {
PRECOMPILED_HEADER += src/stable_headers.h
HEADERS += src/stable_headers.h
CONFIG -= silent
OTHER_FILES += .appveyor.yml
}

contains(DEFINES, QGC_ENABLE_BLUETOOTH) {
Expand Down

0 comments on commit 7589ddc

Please sign in to comment.