Skip to content

Commit

Permalink
Windows: Use Qt 5.12.4 builds (MinGW 7.3.0 32 bit, msvc2017 64-bit)
Browse files Browse the repository at this point in the history
Signed-off-by: Lukas Holecek <hluk@email.cz>
  • Loading branch information
hluk committed Oct 6, 2019
1 parent 4025f26 commit e2dbb41
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 25 deletions.
28 changes: 11 additions & 17 deletions appveyor.yml
@@ -1,25 +1,19 @@
# Configuration file for AppVeyor CI
configuration: Release

environment:
VCINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\
image:
- Visual Studio 2017

environment:
matrix:
- QTDIR: C:\Qt\5.6\mingw49_32
CMAKE_GENERATOR: MinGW Makefiles
MINGW_PATH: C:\Qt\Tools\mingw492_32

- QTDIR: C:\Qt\5.9\mingw53_32
CMAKE_GENERATOR: MinGW Makefiles
MINGW_PATH: C:\Qt\Tools\mingw530_32

- QTDIR: C:\Qt\5.9\msvc2015
CMAKE_GENERATOR: Visual Studio 14 2015
VC_VARS_ARCH: x86

- QTDIR: C:\Qt\5.9\msvc2015_64
CMAKE_GENERATOR: Visual Studio 14 2015 Win64
VC_VARS_ARCH: amd64
#- QTDIR: C:\Qt\5.12\mingw73_32
# CMAKE_GENERATOR: MinGW Makefiles
# MINGW_PATH: C:\Qt\Tools\mingw730_32

- QTDIR: C:\Qt\5.12\msvc2017_64
CMAKE_GENERATOR: Visual Studio 15 2017 Win64
CMD_VCVARS: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat'
BUILD_SUB_DIR: Debug

# Parameters for default build commands (build_script is used instead).
build:
Expand Down
10 changes: 6 additions & 4 deletions utils/appveyor/after_build.bat
@@ -1,4 +1,6 @@
git describe --tags --always HEAD > _git_tag.tmp
@echo on

git describe --tags --always HEAD > _git_tag.tmp || goto :error
set /p AppVersion=<_git_tag.tmp
del _git_tag.tmp

Expand All @@ -8,9 +10,8 @@ set Name=copyq-%AppVersion%
set Destination=%APPVEYOR_BUILD_FOLDER%\%Name%
set BuildRoot=%APPVEYOR_BUILD_FOLDER%\build
set Executable=%Destination%\copyq.exe

if [%VC_VARS_ARCH%] == [] (set Build=%BuildRoot%) else (set Build=%BuildRoot%\Release)
if [%VC_VARS_ARCH%] == [] (set BuildPlugins=%BuildRoot%\plugins) else (set BuildPlugins=%BuildRoot%\plugins\Release)
set Build=%BuildRoot%\%BUILD_SUB_DIR%
set BuildPlugins=%BuildRoot%\plugins\%BUILD_SUB_DIR%

mkdir "%Destination%"
xcopy /F "%Build%\copyq.exe" "%Destination%" || goto :error
Expand All @@ -35,6 +36,7 @@ xcopy /F "%BuildPlugins%\*.dll" "%Destination%\plugins" || goto :error
choco install -y InnoSetup
"C:\Program Files (x86)\Inno Setup 5\iscc" "/O%APPVEYOR_BUILD_FOLDER%" "/DAppVersion=%AppVersion%" "/DRoot=%Destination%" "/DSource=%Source%" "%Source%\Shared\copyq.iss" || goto :error

set QT_LOGGING_TO_CONSOLE=1
"%Executable%" --help || goto :error
"%Executable%" --version || goto :error
"%Executable%" --info || goto :error
Expand Down
4 changes: 3 additions & 1 deletion utils/appveyor/before_build.bat
@@ -1 +1,3 @@
cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release -G "%CMAKE_GENERATOR%" -DWITH_TESTS=ON
@echo on

cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -G "%CMAKE_GENERATOR%" -DWITH_TESTS=ON
4 changes: 3 additions & 1 deletion utils/appveyor/build_script.bat
@@ -1 +1,3 @@
cmake --build build/ --config Release
@echo on

cmake --build build/
7 changes: 5 additions & 2 deletions utils/appveyor/install.bat
@@ -1,6 +1,9 @@
@echo on

set PATH=%QTDIR%\bin;%PATH%
set CMAKE_PREFIX_PATH=%QTDIR%\lib\cmake

REM Note: Following removes sh.exe from PATH so that CMake can generate MinGW Makefile.
if NOT [%MINGW_PATH%] == [] set PATH=%MINGW_PATH%\bin;%PATH:C:\Program Files\Git\usr\bin;=%
if [%VC_VARS_ARCH%] == [] call "%VCINSTALLDIR%\vcvarsall.bat" %VC_VARS_ARCH%
if DEFINED MINGW_PATH set PATH=%MINGW_PATH%\bin;%PATH:C:\Program Files\Git\usr\bin;=%

if DEFINED CMD_VCVARSALL call %CMD_VCVARSALL%

0 comments on commit e2dbb41

Please sign in to comment.