lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update libclang for QDoc to 18.1.7

Browse Source 
* Update the version variable used to identify the correct libclang
  package for download and cache sites.
* Add provisioning package locations for Ubuntu 24.04 ARM64.
* Update SHA1 for provisioning packages on all platforms.

Fixes: QTBUG-126412
Task-number: QTQAINFRA-6112
Change-Id: Id30841efb29d78c9d2d54ffa6af9993b12734c0b
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit ee8e66fd2a)
This commit is contained in:
Paul Wicking
2024-07-05 11:28:11 +02:00
parent 7af09a0f3d
commit 3964060835
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
coin/provisioning/common/unix/libclang.sh
View File

@@ -20,33 +20,38 @@ PROVISIONING_DIR="$(dirname "$0")/../../"
# shellcheck source=./common.sourced.sh
source "$PROVISIONING_DIR"/common/unix/common.sourced.sh
libclang_version="17.0.6"
libclang_version="18.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="e8ecc2fb0d7d7a0f60a50379f16fbf3eef679d78"
sha1="9ea511576645ef4abee6d4c27550406e929334d5"
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="102374379af906bd26085fcd18047cac4d0fb7bf"
elif test "$PROVISIONING_OS_ID" == "ubuntu" ; 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="4a793c9da9a02bd23c163c74dbc5565164a00c3f"
sha1="32c29d8df726b035e0a97e767c5c3e392aa331e1"
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="b5ff982738dbb6efe1a34ed26ff47fca2b1b3b93"
sha1="8d876f60c2fe9c55e18fbac0be2acb70bd20d5d1"
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"
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"
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="2a58cc71ad90eb6234c56ef7b141f32361b4312a"
sha1="a51c5562c9b071250e7971390d55ef21924271ca"
fi
zip="/tmp/libclang.7z"

9
coin/provisioning/common/windows/libclang.ps1
View File

@@ -5,7 +5,7 @@ param(
)
. "$PSScriptRoot\helpers.ps1"
$libclang_version="17.0.6"
$libclang_version="18.1.7"
Write-Output "libClang = $libclang_version" >> ~/versions.txt
# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
@@ -38,7 +38,7 @@ $toolchainSuffix = ""
if ( $toolchain -eq "vs2019" ) {
if ( $archVer -eq 64 ) {
$sha1 = "7e3e474081d2e1d5d95c9743532de01b8e59b9aa"
$sha1 = "8e0862386caef7e4537599ef980eeb6ebee8767f"
}
else {
$sha1 = ""
@@ -48,7 +48,7 @@ if ( $toolchain -eq "vs2019" ) {
if ( $toolchain -eq "mingw" ) {
if ( $archVer -eq 64 ) {
$sha1 = "b9e65f617cd8d6e8fb8ae734383f03f6a7b202ed"
$sha1 = "a23cbb0822cf2eb8d1cecf26e8614ef37a7611e3"
}
else {
$sha1 = ""
@@ -56,9 +56,10 @@ if ( $toolchain -eq "mingw" ) {
$toolchainSuffix = "mingw"
}
if ( $toolchain -eq "llvm-mingw" ) {
if ( $archVer -eq 64 ) {
$sha1 = "1844f107d067b69deabf375fc024848c1c8b015d"
$sha1 = "9c34f99eb575b42c2befe27829c08e6d3f01ae58"
}
else {
$sha1 = ""