From c5ddbdb86b837fcdd406d12e66d8193c991bdede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Tue, 24 Apr 2018 10:50:54 +0200 Subject: [PATCH] Update clang version to 6.0 The version also contains statically compiled libraries so we can ship qdoc without shipping libclang. The change temporarly removes CI qdoc builds from RHEL6 and MinGW, these two configurations are not used for packaging, just for CI testing. We should restore MinGW later. Task-number: QTBUG-66015 Task-number: QTBUG-67764 Change-Id: Ie37b4be6a639e81d9ef0815682c6d60981cbeaae Reviewed-by: Jesus Fernandez Reviewed-by: Fredrik de Vibe Reviewed-by: Simon Hausmann --- coin/provisioning/common/shared/sw_versions.txt | 2 +- coin/provisioning/common/unix/libclang.sh | 2 +- coin/provisioning/common/windows/libclang.ps1 | 8 ++++---- .../qtci-linux-RHEL-6.6-x86_64/08-libclang.sh | 12 ------------ .../qtci-linux-RHEL-7.4-x86_64/05-libclang.sh | 2 +- .../qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh | 2 +- coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 | 1 - 8 files changed, 9 insertions(+), 22 deletions(-) delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh delete mode 100644 coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 diff --git a/coin/provisioning/common/shared/sw_versions.txt b/coin/provisioning/common/shared/sw_versions.txt index cc165dd5..fb2fecb9 100644 --- a/coin/provisioning/common/shared/sw_versions.txt +++ b/coin/provisioning/common/shared/sw_versions.txt @@ -1 +1 @@ -libclang_version="4.0" +libclang_version="6.0" diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 7f29259e..53b9dfda 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -53,7 +53,7 @@ if [ $# -eq 0 ] echo "Using macOS defaults" version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-mac.7z" - sha1="4781d154b274b2aec99b878c364f0ea80ff00a80" + sha1="10e48167b61726b20517172f8aff80fa1d9a379b" fi zip="libclang.7z" diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index a8095ffe..745b61ed 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -24,7 +24,7 @@ function setURL() { if ( $toolchain -eq "vs2015" ) { if ( $archVer -eq 64 ) { - $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0" + $sha1 = "37afa18d243a50c05bee5c6e16b409ed526ec17a" $destination = $baseDestination + "-64" setURL @@ -37,7 +37,7 @@ if ( $toolchain -eq "vs2015" ) { } $archVer=32 - $sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205" + $sha1 = "812b6089c6da99ced9ebebbd42923bd96590519d" $destination = $baseDestination + "-32" setURL @@ -51,7 +51,7 @@ if ( $toolchain -eq "vs2015" ) { if ( $toolchain -eq "mingw" ) { if ( $archVer -eq 64 ) { - $sha1 = "3e318f70a1e76c14365ced65f4fa7031bb730818" + $sha1 = "1233e6c008b90d89483df0291a597a0bac426d29" $destination = $baseDestination + "-64" setURL @@ -64,7 +64,7 @@ if ( $toolchain -eq "mingw" ) { } $archVer=32 - $sha1 = "a9973192a01a9c16976ed0cc6ef6dac3dbc4a2d3" + $sha1 = "2d6ceab0e1a05e2b19fe615c57b64d36977b4933" $destination = $baseDestination + "-32" setURL diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh deleted file mode 100755 index 7d96209c..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -# shellcheck source=../common/shared/sw_versions.txt -. "$BASEDIR/../common/shared/sw_versions.txt" -VERSION=$libclang_version -URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" -SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952" - -"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh index 49d4d4f5..e125a9e2 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh @@ -5,6 +5,6 @@ BASEDIR=$(dirname "$0") . $BASEDIR/../common/shared/sw_versions.txt VERSION=$libclang_version URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" -SHA1="bbdbbc0296f42310077539b7247d285386119ef4" +SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0" $BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh index dde7d702..1589b004 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh @@ -4,6 +4,6 @@ BASEDIR=$(dirname "$0") . $BASEDIR/../common/shared/sw_versions.txt VERSION=$libclang_version URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" -SHA1="bbdbbc0296f42310077539b7247d285386119ef4" +SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0" $BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh index b4155e86..53715dd4 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh @@ -6,6 +6,6 @@ BASEDIR=$(dirname "$0") . $BASEDIR/../common/shared/sw_versions.txt VERSION=$libclang_version URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" -SHA1="bbdbbc0296f42310077539b7247d285386119ef4" +SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0" $BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 deleted file mode 100644 index 375deed3..00000000 --- a/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw