mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-12-26 10:31:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

corrected appveyor.yml: Unix-Build (calculating Qt path)

Browse Source
This commit is contained in:
jkriege2 2022-04-16 23:31:00 +02:00
parent 24f764616d
commit 1bbbe3564f
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
appveyor.yml
View File

@ -1,4 +1,4 @@
version: {branch}-0.{build} version: 0.{build}-{branch}
# don't build tags # don't build tags
skip_tags: true skip_tags: true
@ -27,7 +27,6 @@ environment:
matrix: matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
QTABI: mingw53_32 QTABI: mingw53_32
ARCH: x32
MINGWDIR: C:\Qt\Tools\mingw530_32 MINGWDIR: C:\Qt\Tools\mingw530_32
QTVER: 5.11 QTVER: 5.11
MAKETOOL: mingw32-make MAKETOOL: mingw32-make
@ -35,36 +34,32 @@ environment:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
QTABI: msvc2015_64 QTABI: msvc2015_64
ARCH: x64
QTVER: 5.11 QTVER: 5.11
CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
QTABI: msvc2015 QTABI: msvc2015
ARCH: x32
QTVER: 5.11 QTVER: 5.11
CMAKE_GENERATOR: "Visual Studio 15 2017" CMAKE_GENERATOR: "Visual Studio 15 2017"
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
QTABI: msvc2019_64 QTABI: msvc2019_64
ARCH: x64
QTVER: 5.15 QTVER: 5.15
CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" CMAKE_GENERATOR: "Visual Studio 16 2019 Win64"
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
QTABI: mingw81_64 QTABI: mingw81_64
ARCH: x64
MINGWDIR: C:\Qt\Tools\mingw810_64 MINGWDIR: C:\Qt\Tools\mingw810_64
QTVER: 5.15 QTVER: 5.15
CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" CMAKE_GENERATOR: "Visual Studio 16 2019 Win64"
- APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
QTABI: gcc_64 QTABI: gcc_64
ARCH: x64
QTVER: 5.15 QTVER: 5.15
CMAKE_GENERATOR: "Unix Makefiles" CMAKE_GENERATOR: "Unix Makefiles"
for: for:
# Windows (MinGW 5.3 & MSVC2015) # Windows (MinGW 5.3 & MSVC2015)
- matrix: - matrix:
@ -78,7 +73,6 @@ for:
- cmd: echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS% - cmd: echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS%
- cmd: echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER% - cmd: echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER%
- cmd: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% - cmd: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE%
- cmd: echo ARCH=%ARCH%
- cmd: echo QTABI=%QTABI% - cmd: echo QTABI=%QTABI%
- cmd: echo CMAKE_GENERATOR=%CMAKE_GENERATOR% - cmd: echo CMAKE_GENERATOR=%CMAKE_GENERATOR%
- cmd: echo CMAKE_BUILDFLAGS=%CMAKE_BUILDFLAGS% - cmd: echo CMAKE_BUILDFLAGS=%CMAKE_BUILDFLAGS%
@ -94,8 +88,6 @@ for:
- cmd: if %QTABI%==msvc2015_64 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 - cmd: if %QTABI%==msvc2015_64 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
# Rename sh.exe as sh.exe in PATH interferes with MinGW # Rename sh.exe as sh.exe in PATH interferes with MinGW
- cmd: if /i "%QTABI:~0:5%"=="mingw" rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" - cmd: if /i "%QTABI:~0:5%"=="mingw" rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe"
- cmd: if /i "%QTABI:~0:5%"=="mingw" echo "USING MINGW: %QTABI%"
- cmd: if /i "%QTABI:~0:4%"=="msvc" echo "USING MSVC: %QTABI%"
- cmd: echo QTDIR=%QTDIR% - cmd: echo QTDIR=%QTDIR%
- cmd: echo JOMDIR=%JOMDIR% - cmd: echo JOMDIR=%JOMDIR%
- cmd: echo PATH=%PATH% - cmd: echo PATH=%PATH%
@ -141,7 +133,6 @@ for:
- cmd: echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS% - cmd: echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS%
- cmd: echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER% - cmd: echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER%
- cmd: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% - cmd: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE%
- cmd: echo ARCH=%ARCH%
- cmd: echo QTABI=%QTABI% - cmd: echo QTABI=%QTABI%
- cmd: echo CMAKE_GENERATOR=%CMAKE_GENERATOR% - cmd: echo CMAKE_GENERATOR=%CMAKE_GENERATOR%
- cmd: echo CMAKE_BUILDFLAGS=%CMAKE_BUILDFLAGS% - cmd: echo CMAKE_BUILDFLAGS=%CMAKE_BUILDFLAGS%
@ -156,8 +147,6 @@ for:
- cmd: if %QTABI%==msvc2019_64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" - cmd: if %QTABI%==msvc2019_64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
# Rename sh.exe as sh.exe in PATH interferes with MinGW # Rename sh.exe as sh.exe in PATH interferes with MinGW
- cmd: if /i "%QTABI:~0:5%"=="mingw" rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" - cmd: if /i "%QTABI:~0:5%"=="mingw" rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe"
- cmd: if /i "%QTABI:~0:5%"=="mingw" echo "USING MINGW: %QTABI%"
- cmd: if /i "%QTABI:~0:4%"=="msvc" echo "USING MSVC: %QTABI%"
- cmd: echo QTDIR=%QTDIR% - cmd: echo QTDIR=%QTDIR%
- cmd: echo JOMDIR=%JOMDIR% - cmd: echo JOMDIR=%JOMDIR%
- cmd: echo PATH=%PATH% - cmd: echo PATH=%PATH%
@ -204,13 +193,13 @@ for:
- sh: echo == INIT SYSTEM ENVIRONMENT ====================================================================== - sh: echo == INIT SYSTEM ENVIRONMENT ======================================================================
- sh: echo _NPROCESSORS_ONLN=$(getconf _NPROCESSORS_ONLN) - sh: echo _NPROCESSORS_ONLN=$(getconf _NPROCESSORS_ONLN)
- sh: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% - sh: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE%
- sh: echo ARCH=%ARCH%
- sh: echo QTABI=%QTABI% - sh: echo QTABI=%QTABI%
- sh: echo CMAKE_GENERATOR=%CMAKE_GENERATOR% - sh: echo CMAKE_GENERATOR=%CMAKE_GENERATOR%
install: install:
# Init compiler environment # Init compiler environment
- sh: echo == INIT COMPILER ENVIRONMENT ==================================================================== - sh: echo == INIT COMPILER ENVIRONMENT ====================================================================
- sh: set QTDIR=$HOME/Qt/%QTVER%/%QTABI%/bin
- sh: sudo apt update -qq - sh: sudo apt update -qq
- sh: sudo apt install -y build-essential git qt5-qmake cmake ninja-build - sh: sudo apt install -y build-essential git qt5-qmake cmake ninja-build
- cmd: echo QTDIR=%QTDIR% - cmd: echo QTDIR=%QTDIR%