From 56a8d5a74d03e1180d15ef47a6a75da9a33cccb3 Mon Sep 17 00:00:00 2001 From: Luca Di Sera Date: Thu, 6 Oct 2022 14:08:04 +0200 Subject: [PATCH] Update QDoc libclang to 15.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The `libclang_version` variable is now updated to the current version, 15.0.0, in both "coin/provisioning/common/unix/libclang.sh" and "coin/provisioning/common/windows/libclang.ps1". The naming of the artifacts for the provided library was slightly changed from previous versions. Before, the version number would contain two integers separated by a dot. The generated artifact would be named after this version number, with the dot removed. That is, for example, for version 12.0, a release artifact would be called "libclang-release_120.*". The updated two version uses a three segments version number and, furthermore, the artifacts name do not collapse the separating dots such that a release artifact would be called "libclang-release_15.0.0.*". To support the new naming scheme, some processing was removed from both provisioning scripts. For Windows, the line removing all dots from the `libclang_version` variable was removed. For Unix, the removal of the dots in the `libclang_version` variable when expanding the variable to generate the target urls to retrieve the artifact was removed, using the bare value of the variable itself. For Unix provisioning, the artifacts for some of the platform, namely "CentOS" and "Ubuntu 22.04", are not provided anymore. "CentOS" was replaced by "Rhel8.4" on "gcc10.0", hence the target url for the redhat platform was modified based on the new name. The "Ubuntu 22.04" artifacts were not provided, such that the platform was removed. The sha1 of the target artifacts on both provisioning script was updated for all platforms. Task-number: QTBUG-107199 Change-Id: I873680825b0953e897c610fb0b47f3cd90625646 Reviewed-by: Qt CI Bot Reviewed-by: Kai Köhne Reviewed-by: Topi Reiniö (cherry picked from commit 487c92a3d086cc3b086899c5a212c1a64b27881f) --- coin/provisioning/common/unix/libclang.sh | 14 +++++++------- coin/provisioning/common/windows/libclang.ps1 | 9 ++++----- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 53a76469..af82263c 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -53,13 +53,13 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh" # shellcheck source=./DownloadURL.sh source "${BASH_SOURCE%/*}/DownloadURL.sh" -libclang_version=12.0 +libclang_version="15.0.0" 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.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-mac.7z" - sha1="bb9223450c1c36ee37d8c91e876dba82db117a7a" + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-mac.7z" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version}-based-mac.7z" + sha1="6d916a17459c81551dde47580ae3f071e93338a5" elif test -f /etc/redhat-release && cat /etc/redhat-release | grep "Red Hat" | grep -v "8" ; then version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-CentOS8.3-gcc9.2-x86_64.7z" @@ -67,9 +67,9 @@ elif test -f /etc/redhat-release && cat /etc/redhat-release | grep "Red Hat" | g sha1="d02e4dd30fe3f810c3a0cdcbed5870dec56ed91b" else version=$libclang_version - url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z" - url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z" - sha1="81b3e640befa23b5cdebd59e206dc79e4de20ba3" + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z" + sha1="bd6615012b8bdb2720a45ede56e05f6db7191843" fi zip="/tmp/libclang.7z" diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index ba7a7d80..3a343614 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -5,7 +5,7 @@ param( ) . "$PSScriptRoot\helpers.ps1" -$libclang_version="12.0" +$libclang_version="15.0.0" Write-Output "libClang = $libclang_version" >> ~/versions.txt # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). @@ -14,7 +14,6 @@ Write-Output "libClang = $libclang_version" >> ~/versions.txt # Starting from Qt 5.11 QDoc requires Clang to parse C++ $baseDestination = "C:\Utils\libclang-" + $libclang_version + "-" + $toolchain -$libclang_version = $libclang_version -replace '["."]' function install() { @@ -39,7 +38,7 @@ $toolchainSuffix = "" if ( $toolchain -eq "vs2019" ) { if ( $archVer -eq 64 ) { - $sha1 = "44fabbd45b4b7e659c49347c156bae09d7aaffdc" + $sha1 = "e7c2d27f0e99d63e49225cb1be18c76a1e2a124b" } else { $sha1 = "" @@ -49,7 +48,7 @@ if ( $toolchain -eq "vs2019" ) { if ( $toolchain -eq "mingw" ) { if ( $archVer -eq 64 ) { - $sha1 = "9333170111aa90af6e1db824cd964dba227a4710" + $sha1 = "6c9300051533d5648ffe3e8ae1eb00decae8e6bf" } else { $sha1 = "" @@ -64,7 +63,7 @@ if ( $setDefault ) { } Set-EnvironmentVariable ("LLVM_INSTALL_DIR_${toolchainSuffix}") ($baseDestination + "-$archVer") -if ( $libclang_version -eq "120" ) { +if ( $libclang_version -eq "15.0.0" ) { # This is a hacked static build of libclang which requires special # handling on the qdoc side. Set-EnvironmentVariable "QDOC_USE_STATIC_LIBCLANG" "1"