From 8c32c1dcd792bc328ee5f132555329383aef0848 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 20 Jan 2021 14:22:38 +0200 Subject: Provisioning: Add libclang packages to cache MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Both static and dynamic libclang packages are missing from our local cache. Dynamic and static packages need to be in different folders because package names are identicals Pick-to: 6.0 Pick-to: 5.15 Change-Id: I0d4c0c776f1c5f318417cae6c16d683b31a10710 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/unix/libclang-v100-dyn.sh | 6 +++--- coin/provisioning/common/windows/libclang-v100-dyn.ps1 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/unix/libclang-v100-dyn.sh b/coin/provisioning/common/unix/libclang-v100-dyn.sh index d6609429..2897110f 100755 --- a/coin/provisioning/common/unix/libclang-v100-dyn.sh +++ b/coin/provisioning/common/unix/libclang-v100-dyn.sh @@ -53,15 +53,15 @@ if uname -a |grep -q Darwin; then version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-mac.7z" sha1="0fe1fa50b1b469d2c05acc3a3468bc93a66f1e5a" - url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-mac.7z" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/dynamic/libclang-release_${version//\./}-based-mac.7z" elif test -f /etc/redhat-release || /etc/centos-release; then version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z" sha1="1d2e265502fc0832a854f989d757105833fbd179" - url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/dynamic/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z" else version=$libclang_version - url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z" + url="https://download.qt.io/development_releases/prebuilt/libclang/dynamic/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z" sha1="c1580acb3a82e193acf86f18afb52427c5e67de8" url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z" fi diff --git a/coin/provisioning/common/windows/libclang-v100-dyn.ps1 b/coin/provisioning/common/windows/libclang-v100-dyn.ps1 index b0792a07..2b0caa18 100644 --- a/coin/provisioning/common/windows/libclang-v100-dyn.ps1 +++ b/coin/provisioning/common/windows/libclang-v100-dyn.ps1 @@ -26,7 +26,7 @@ function install() { $zip = "c:\users\qt\downloads\libclang-dyn.7z" $script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z" - $script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z" + $script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/dynamic/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z" Download $OfficialUrl $CachedUrl $zip Verify-Checksum $zip $sha1 -- cgit v1.2.3