From e05b987a53c1cb7ed92b59d99e13f51d800f8c3c Mon Sep 17 00:00:00 2001 From: Nate Weibley Date: Wed, 13 Apr 2016 12:41:23 -0400 Subject: [PATCH] - Use NSIS installer + script from AppVeyor tracker / closer to CI builder (#3217) - Include appveyor YAML script in windows build other files See also: https://github.com/appveyor/ci/issues/743 --- .appveyor.yml | 10 ++++++++-- qgroundcontrol.pro | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 9422d4f4a..53d650c60 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -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 diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 8d72286c5..5c5116309 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -320,6 +320,7 @@ WindowsBuild { PRECOMPILED_HEADER += src/stable_headers.h HEADERS += src/stable_headers.h CONFIG -= silent + OTHER_FILES += .appveyor.yml } contains(DEFINES, QGC_ENABLE_BLUETOOTH) { -- 2.22.0