mirror of https://github.com/qt/qt5.git
Update Clang libraries for QDoc to 19.1.7
* Update the version variable used to identify the correct package for download and cache sites. * Update the file names for all platforms, as these libraries are built directly from upstream without other patches applied on top. * Add provisioning package locations for Windows VS2022 x64. * Set 'vs2022' as default toolchain on Windows. * Update call sites for `libclang.ps1` to pass `vs2022` as argument to the script. * Drop Windows configurations with VS2019. * Update cached and official URLs with the major version for Windows platforms. * Update SHA1 for provisioning packages on all platforms. * Move from RHEL 8.8 to 8.10. * Move from RHEL 9.2 to 9.4. Fixes: QTBUG-129506 Fixes: QTQAINFRA-6605 Task-number: QTBUG-129373 Pick-to: 6.8 6.9 Change-Id: I5146e6551a1b3c83133803f61ca6f8428cb6a14f Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
This commit is contained in:
Paul Wicking
parent
9a3f36f1ec
commit
9ff9d34626
|
|
@ -20,38 +20,38 @@ PROVISIONING_DIR="$(dirname "$0")/../../"
|
|||
# shellcheck source=./common.sourced.sh
|
||||
source "$PROVISIONING_DIR"/common/unix/common.sourced.sh
|
||||
|
||||
libclang_version="18.1.7"
|
||||
libclang_version="19.1.7"
|
||||
|
||||
if uname -a |grep -q Darwin; then
|
||||
version=$libclang_version
|
||||
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-mac.7z"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-mac.7z"
|
||||
sha1="9ea511576645ef4abee6d4c27550406e929334d5"
|
||||
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-macos-universal.7z"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-macos-universal.7z"
|
||||
sha1="0b30bbe47cefe413a6d2fbc3da6b0b8ac5d84613"
|
||||
elif test -f /etc/redhat-release && grep "Red Hat" /etc/redhat-release | grep "9" ; then
|
||||
version=$libclang_version
|
||||
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel9.2-gcc10.0-x86_64.7z"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel9.2-gcc10.0-x86_64.7z"
|
||||
sha1="32c29d8df726b035e0a97e767c5c3e392aa331e1"
|
||||
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Rhel9.4-gcc11.4-x86_64.7z"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Rhel9.4-gcc11.4-x86_64.7z"
|
||||
sha1="1657d6a9419e9d3ecf4416cd757f488c079ec779"
|
||||
elif test "$PROVISIONING_OS_ID" == "debian" && test "$PROVISIONING_ARCH" == "arm64" ; then
|
||||
version=$libclang_version
|
||||
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
|
||||
sha1="8d876f60c2fe9c55e18fbac0be2acb70bd20d5d1"
|
||||
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Debian11.6-gcc10.0-arm64.7z"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Debian11.6-gcc10.0-arm64.7z"
|
||||
sha1="2536f55987d6240c40fd1127895b0885d41148ed"
|
||||
elif test "$PROVISIONING_OS_ID" == "ubuntu" && test "$PROVISIONING_ARCH" == "arm64" ; then
|
||||
version=$libclang_version
|
||||
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu24.04-gcc11.2-arm64.7z"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu24.04-gcc11.2-arm64.7z"
|
||||
sha1="5a7bda4fbd2c52ae66557034591d977ba617482c"
|
||||
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Ubuntu24.04-gcc11.2-arm64.7z"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Ubuntu24.04-gcc11.2-arm64.7z"
|
||||
sha1="0e1c0c492f9fcd669a77fe4480cfa271f408af9e"
|
||||
elif test "$PROVISIONING_OS_ID" == "ubuntu" && test "$PROVISIONING_ARCH" == "x86_64" ; then
|
||||
version=$libclang_version
|
||||
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
|
||||
sha1="b9f8735a148342174d7d763b5475175cd0827441"
|
||||
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
|
||||
sha1="eed115ea52f3b4283d02d96cd8f4fce95c5aaafe"
|
||||
else
|
||||
version=$libclang_version
|
||||
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel8.8-gcc10.0-x86_64.7z"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel8.8-gcc10.0-x86_64.7z"
|
||||
sha1="a51c5562c9b071250e7971390d55ef21924271ca"
|
||||
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Rhel8.10-gcc10.0-x86_64.7z"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Rhel8.10-gcc10.0-x86_64.7z"
|
||||
sha1="479fa87ad804ec91a462ccb20fc9acad6982bddb"
|
||||
fi
|
||||
|
||||
zip="/tmp/libclang.7z"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
param(
|
||||
[string]$archVer="32",
|
||||
[string]$toolchain="vs2019",
|
||||
[string]$toolchain="vs2022",
|
||||
[bool]$setDefault=$true
|
||||
)
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
$libclang_version="18.1.7"
|
||||
$libclang_version="19.1.7"
|
||||
Write-Output "libClang = $libclang_version" >> ~/versions.txt
|
||||
|
||||
# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
|
||||
|
|
@ -24,8 +24,8 @@ function install() {
|
|||
|
||||
$zip = "c:\users\qt\downloads\libclang.7z"
|
||||
|
||||
$script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z"
|
||||
$script:CachedUrl = "http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z"
|
||||
$script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-$libclang_version-windows-$toolchain`_$archVer.7z"
|
||||
$script:CachedUrl = "http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-$libclang_version-windows-$toolchain`_$archVer.7z"
|
||||
|
||||
Download $OfficialUrl $CachedUrl $zip
|
||||
Verify-Checksum $zip $sha1
|
||||
|
|
@ -38,20 +38,10 @@ $toolchainSuffix = ""
|
|||
|
||||
if ( $toolchain -eq "vs2022" ) {
|
||||
if ( $archVer -eq "64" ) {
|
||||
$sha1 = "7e51f0eabdfe8eea17aaf1dce7b2ffe1ea064f66"
|
||||
$sha1 = "f56057b8679e21a44b341bb1041cb03fbe6f5c0d"
|
||||
}
|
||||
elseif ( $archVer -eq "arm64" ) {
|
||||
$sha1 = "986d4d0f253de505ef499345238c101dac1ca3a6"
|
||||
}
|
||||
else {
|
||||
$sha1 = ""
|
||||
}
|
||||
$toolchainSuffix = "msvc"
|
||||
}
|
||||
|
||||
if ( $toolchain -eq "vs2019" ) {
|
||||
if ( $archVer -eq "64" ) {
|
||||
$sha1 = "8e0862386caef7e4537599ef980eeb6ebee8767f"
|
||||
$sha1 = "89fddd8c4bde3e8b70382e21059743637c27d38d"
|
||||
}
|
||||
else {
|
||||
$sha1 = ""
|
||||
|
|
@ -61,7 +51,7 @@ if ( $toolchain -eq "vs2019" ) {
|
|||
|
||||
if ( $toolchain -eq "mingw" ) {
|
||||
if ( $archVer -eq "64" ) {
|
||||
$sha1 = "a23cbb0822cf2eb8d1cecf26e8614ef37a7611e3"
|
||||
$sha1 = "fcc1f06bd395bc133b7828d0be48e8492b9ba807"
|
||||
}
|
||||
else {
|
||||
$sha1 = ""
|
||||
|
|
@ -72,7 +62,7 @@ if ( $toolchain -eq "mingw" ) {
|
|||
|
||||
if ( $toolchain -eq "llvm-mingw" ) {
|
||||
if ( $archVer -eq "64" ) {
|
||||
$sha1 = "9c34f99eb575b42c2befe27829c08e6d3f01ae58"
|
||||
$sha1 = "ee01352eb68bee252cefb1b8ff4ad086baa8ab5f"
|
||||
}
|
||||
else {
|
||||
$sha1 = ""
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
|
||||
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False
|
||||
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 llvm-mingw $False
|
||||
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019
|
||||
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2022
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
|
||||
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False
|
||||
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019
|
||||
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2022
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
|
||||
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False
|
||||
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 llvm-mingw $False
|
||||
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019
|
||||
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2022
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
|
||||
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False
|
||||
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 llvm-mingw $False
|
||||
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019
|
||||
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2022
|
||||
|
|
|
|||
Loading…
Reference in New Issue