dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 13:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Qt 5.12 and VS2017 on Windows for CI"

Browse Source 
This reverts commit ae70c6e28e058b8c112339bca2e2fd0feea4720a.
This commit is contained in:
Le Tan 2019-03-21 09:11:59 +08:00
parent 79e1a71a74
commit 4890749b5d
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
appveyor.yml
View File

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