diff --git a/appveyor.yml b/appveyor.yml index 3099b106..b2922a94 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -image: Visual Studio 2017 +image: Visual Studio 2015 version: 2.3.{build} @@ -7,33 +7,30 @@ branches: - master environment: + COMPILER: msvc + VSVER: 14 + matrix: - - QT: C:\Qt\5.12\msvc2017_64 - GENERATOR: Visual Studio 15 2017 Win64 - PLATFORM: x64 - - QT: C:\Qt\5.12\msvc2017 - GENERATOR: Visual Studio 15 2017 + - QT: C:\Qt\5.9\msvc2015_64 + PLATFORM: amd64 + - QT: C:\Qt\5.9\msvc2015 PLATFORM: x86 clone_depth: 1 # scripts that run after cloning repository install: - - dir C:\Qt - - set PATH=%QT%\bin\;C:\Qt\Tools\QtCreator\bin\;C:\Qt\QtIFW-3.0.1\bin\;%PATH% + - set PATH=%QT%\bin\;C:\Qt\Tools\QtCreator\bin\;C:\Qt\QtIFW2.0.1\bin\;%PATH% - git submodule update --init --recursive # scripts that run before build before_build: - - '%QT%\bin\qtenv2.bat' - - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM% + - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM% + # After calling vcvarsall.bat, %PLATFORM% will be X64 or x86 - qmake --version - - echo %PLATFORM% - - cd %APPVEYOR_BUILD_FOLDER% - - dir - mkdir build - cd build - - if "%PLATFORM%" EQU "x64" (qmake -r -spec win32-msvc CONFIG+=x86_64 CONFIG-=debug CONFIG+=release ../VNote.pro) + - if "%PLATFORM%" EQU "X64" (qmake -r -spec win32-msvc CONFIG+=x86_64 CONFIG-=debug CONFIG+=release ../VNote.pro) - if "%PLATFORM%" EQU "x86" (qmake -r -spec win32-msvc CONFIG+=Win32 CONFIG-=debug CONFIG+=release ../VNote.pro) # custom build scripts @@ -56,7 +53,7 @@ after_build: # Delete translations\qt_*.qm - del /F /Q "distrib\VNote\translations\qt_*.qm" # Copy OpenSSL DLLs - - if "%PLATFORM%" EQU "x64" (xcopy "openssl-utils.git\win64\*.dll" "distrib\VNote") + - if "%PLATFORM%" EQU "X64" (xcopy "openssl-utils.git\win64\*.dll" "distrib\VNote") - if "%PLATFORM%" EQU "x86" (xcopy "openssl-utils.git\win32\*.dll" "distrib\VNote") - cd distrib - 7z a VNote_win_%PLATFORM%_portable_%vnote_version%.zip VNote