diff --git a/coin/provisioning/common/windows/install-vcpkg-ports.ps1 b/coin/provisioning/common/windows/install-vcpkg-ports.ps1 index 55eae4be..2b73502c 100644 --- a/coin/provisioning/common/windows/install-vcpkg-ports.ps1 +++ b/coin/provisioning/common/windows/install-vcpkg-ports.ps1 @@ -1,5 +1,8 @@ # Copyright (C) 2023 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +param([string]$arch="x64") + . "$PSScriptRoot\helpers.ps1" Write-Host "Installing vcpkg ports" @@ -9,18 +12,15 @@ $vcpkgRoot = "$env:VCPKG_ROOT" Set-Location -Path "$PSScriptRoot\vcpkg" Copy-Item "$PSScriptRoot\..\shared\vcpkg-configuration.json" -Destination "$PSScriptRoot\vcpkg" -Run-Executable "$vcpkgExe" "install --triplet x64-windows-qt --x-install-root x64-windows-qt-tmp --debug" -Run-Executable "$vcpkgExe" "install --triplet arm64-windows-qt --x-install-root arm64-windows-qt-tmp --debug" +Run-Executable "$vcpkgExe" "install --triplet $arch-windows-qt --x-install-root $arch-windows-qt-tmp --debug" New-Item -Path "$vcpkgRoot" -Name "installed" -ItemType "directory" -Force -Copy-Item -Path "x64-windows-qt-tmp\*" -Destination "$vcpkgRoot\installed" -Recurse -Force -Copy-Item -Path "arm64-windows-qt-tmp\*" -Destination "$vcpkgRoot\installed" -Recurse -Force +Copy-Item -Path "$arch-windows-qt-tmp\*" -Destination "$vcpkgRoot\installed" -Recurse -Force $versions = jq.exe -r '.overrides[] | \"vcpkg \(.name) = \(.version)\"' vcpkg.json $versions = $versions.Replace("vcpkg", "`nvcpkg") Write-Output "$versions" >> ~/versions.txt -Remove-Item -Path "x64-windows-qt-tmp" -Recurse -Force -Remove-Item -Path "arm64-windows-qt-tmp" -Recurse -Force +Remove-Item -Path "$arch-windows-qt-tmp" -Recurse -Force Set-Location "$PSScriptRoot" diff --git a/coin/provisioning/qtci-windows-11_23H2-x86_64/94-install-vcpkg-ports.ps1 b/coin/provisioning/qtci-windows-11_23H2-x86_64/94-install-vcpkg-ports.ps1 index 1dd657bc..5198399b 100644 --- a/coin/provisioning/qtci-windows-11_23H2-x86_64/94-install-vcpkg-ports.ps1 +++ b/coin/provisioning/qtci-windows-11_23H2-x86_64/94-install-vcpkg-ports.ps1 @@ -1 +1,2 @@ -. "$PSScriptRoot\..\common\windows\install-vcpkg-ports.ps1" +. "$PSScriptRoot\..\common\windows\install-vcpkg-ports.ps1" -arch x64 +. "$PSScriptRoot\..\common\windows\install-vcpkg-ports.ps1" -arch arm64