lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-21 14:06:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade vcpkg to version 2025-09-03

Browse Source 
Change-Id: I5501f28cbcf7cc9e88b32031a7fd2e1c763981bf
Reviewed-by: Simo Fält <simo.falt@qt.io>
This commit is contained in:
Alexey Edelev
2025-09-24 13:24:29 +02:00
parent 18c0ccd703
commit 63fd087fa0
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coin/provisioning/common/linux/install-vcpkg.sh
View File

@@ -29,8 +29,8 @@ do
"vcpkg_tool_release_tag")
vcpkgToolReleaseTag=${keyValue[1]}
;;
"linux_sha1")
vcpkgToolSHA1=${keyValue[1]}
"linux_checksum")
vcpkgToolChecksum=${keyValue[1]}
;;
esac
done
@@ -43,9 +43,9 @@ then
exit 1
fi
if [ -z vcpkgToolSHA1 ]
if [ -z vcpkgToolChecksum ]
then
echo "Unable to read vcpkg tool SHA1 from $releaseTagFile"
echo "Unable to read vcpkg tool Checksum from $releaseTagFile"
echo "Content:"
cat $releaseTagFile
exit 1
@@ -58,7 +58,7 @@ vcpkgToolCacheUrl="http://ci-files01-hki.ci.qt.io/input/vcpkg/vcpkg-tool-$nonDot
vcpkgToolSourceFolder="$HOME/vcpkg-tool-$vcpkgToolReleaseTag"
vcpkgToolBuildFolder="$HOME/vcpkg-tool-$vcpkgToolReleaseTag/build"
InstallFromCompressedFileFromURL "$vcpkgToolCacheUrl" "$vcpkgToolOfficialUrl" "$vcpkgToolSHA1" "$HOME" ""
InstallFromCompressedFileFromURL "$vcpkgToolCacheUrl" "$vcpkgToolOfficialUrl" "$vcpkgToolChecksum" "$HOME" ""
cmake -S "$vcpkgToolSourceFolder" -B "$vcpkgToolBuildFolder" -GNinja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF
cmake --build "$vcpkgToolBuildFolder" --parallel

8
coin/provisioning/common/shared/vcpkg_tool_release_tag.txt
View File

@@ -1,4 +1,4 @@
vcpkg_tool_release_tag=2024-09-18
windows_x64_sha1=484373186A905E9F39FE385F4FB59F263B9FFE95
windows_arm64_sha1=E0C4CBCD64B867CE386886806D8CA9C84610545F
linux_sha1=99a31b0bed2845f5c915735121d34c453126ec76
vcpkg_tool_release_tag=2025-09-03
windows_x64_checksum=4523B5B2CE77BD0F6DCA55140D831EA6EB03046D5F4496C85DF94AC1A7EFAB01
windows_arm64_checksum=1E8653243C0E7D73FF1F0F3F25A55C8154888F331510F9545AD200EDD3CCB962
linux_checksum=f0c4b30afc2f7baa9cc4372ac325042418251343e0192dbfac94c4f602e9d3ed

2
coin/provisioning/common/shared/vcpkg_version.txt
View File

@@ -1 +1 @@
vcpkg_version=2024.08.23
vcpkg_version=2025.09.17

12
coin/provisioning/common/windows/install-vcpkg.ps1
View File

@@ -25,13 +25,13 @@ git.exe -C "$vcpkgRoot" checkout "tags/$vcpkgVersion"
$releaseTagFileContent = Get-Content "$PSScriptRoot\..\shared\vcpkg_tool_release_tag.txt"
$n = $releaseTagFileContent.Split("`n")
$sha1key = "windows_" + $arch + "_sha1"
$checksumkey = "windows_" + $arch + "_checksum"
foreach ($keyValue in $n) {
$keyValue = $keyValue.Split('=')
if($keyValue[0] -eq "vcpkg_tool_release_tag") {
$vcpkgExeReleaseTag = $keyValue[1]
} elseif($keyValue[0] -eq $sha1key) {
$vcpkgExeSHA1 = $keyValue[1]
} elseif($keyValue[0] -eq $checksumkey) {
$vcpkgExechecksum = $keyValue[1]
}
}
@@ -43,8 +43,8 @@ if(!$vcpkgExeReleaseTag) {
}
$nonDottedReleaseTag = $vcpkgExeReleaseTag.replace('-', "")
if(!$vcpkgExeSHA1) {
Write-Host "Unable to read vcpkg tool SHA1 from $PSScriptRoot\..\shared\vcpkg_tool_release_tag.txt"
if(!$vcpkgExechecksum) {
Write-Host "Unable to read vcpkg tool checksum from $PSScriptRoot\..\shared\vcpkg_tool_release_tag.txt"
Write-Host "Content:"
Write-Host "$releaseTagFileContent"
exit 1
@@ -60,7 +60,7 @@ $vcpkgExeCacheUrl = "\\ci-files01-hki.ci.qt.io\provisioning\vcpkg\vcpkg-$nonDott
$vcpkgExe = "C:\Windows\Temp\vcpkg.exe"
Download "$vcpkgExeOfficialUrl" "$vcpkgExeCacheUrl" "$vcpkgExe"
Verify-Checksum $vcpkgExe $vcpkgExeSHA1
Verify-Checksum $vcpkgExe $vcpkgExechecksum "sha256"
Move-Item "$vcpkgExe" -Destination "$vcpkgRoot" -Force
if(![System.IO.File]::Exists("$vcpkgRoot\vcpkg.exe")){