Fix ARM64 builds in AppVeyor

We have to replace some files that were built with incorrect paths
This commit is contained in:
Cameron Gutman 2023-09-10 15:40:51 -05:00
parent a16647f16c
commit acddc3cabd
4 changed files with 23 additions and 1 deletions

View file

@ -6,7 +6,7 @@ environment:
matrix: matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
QTDIR: C:\Qt\5.15 QTDIR: C:\Qt\5.15
QTDIR_ARM64: C:\Qt\6.4 QTDIR_ARM64: C:\Qt\6.4.3
- APPVEYOR_BUILD_WORKER_IMAGE: macOS-Monterey - APPVEYOR_BUILD_WORKER_IMAGE: macOS-Monterey
BUILD_TARGET: macos BUILD_TARGET: macos
- APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1604 - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1604
@ -40,6 +40,9 @@ before_build:
- sh: 'export VERSION=`cat app/version.txt`' - sh: 'export VERSION=`cat app/version.txt`'
build_script: build_script:
- cmd: 'copy /y scripts\appveyor\qmake.bat %QTDIR_ARM64%\msvc2019_arm64\bin\'
- cmd: 'copy /y scripts\appveyor\qtpaths.bat %QTDIR_ARM64%\msvc2019_arm64\bin\'
- cmd: 'copy /y scripts\appveyor\target_qt.conf %QTDIR_ARM64%\msvc2019_arm64\bin\'
- cmd: 'set PATH=%OLDPATH%;%QTDIR%\msvc2019_64\bin' - cmd: 'set PATH=%OLDPATH%;%QTDIR%\msvc2019_64\bin'
- cmd: 'scripts\build-arch.bat Release' - cmd: 'scripts\build-arch.bat Release'
- cmd: 'set PATH=%OLDPATH%;%QTDIR%\msvc2019\bin' - cmd: 'set PATH=%OLDPATH%;%QTDIR%\msvc2019\bin'

View file

@ -0,0 +1,2 @@
@echo off
%QTDIR_ARM64%\msvc2019_64\bin\qmake.exe -qtconf "%~dp0\target_qt.conf" %*

View file

@ -0,0 +1,2 @@
@echo off
%QTDIR_ARM64%\msvc2019_64\bin\qtpaths.exe -qtconf "%~dp0\target_qt.conf" %*

View file

@ -0,0 +1,15 @@
[DevicePaths]
Prefix=C:/Qt/Qt-6.4.3
[Paths]
Prefix=../
HostPrefix=../../msvc2019_64
HostBinaries=bin
HostLibraries=lib
HostLibraryExecutables=./bin
HostData=../msvc2019_arm64
Sysroot=
SysrootifyPrefix=false
TargetSpec=win32-arm64-msvc
HostSpec=
Documentation=../../Docs/Qt-6.4.3
Examples=../../Examples/Qt-6.4.3