summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-05-09 22:10:02 +0200
committerLiang Qi <liang.qi@qt.io>2018-05-09 22:12:22 +0200
commitb1f1bf55601d061964c84622eb4f8092e1b0f30b (patch)
tree52a52ff0b260b7bbf5d9189c927f023a1cfba82a
parent1989bc105d4a0a154e252ea438f30ea2894f998c (diff)
parentb1b04fcb1aa2f2cd55db258ac30824260485d25a (diff)
Merge remote-tracking branch 'origin/5.11.0' into 5.11
-rw-r--r--coin/provisioning/common/shared/sw_versions.txt2
-rwxr-xr-xcoin/provisioning/common/unix/libclang.sh2
-rw-r--r--coin/provisioning/common/windows/libclang.ps124
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh12
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh2
-rw-r--r--coin/provisioning/qtci-windows-10-x86/08-libclang.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps12
9 files changed, 25 insertions, 25 deletions
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 5b3b6bb1..f024130f 100755
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -55,7 +55,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..5ba0a0aa 100644
--- a/coin/provisioning/common/windows/libclang.ps1
+++ b/coin/provisioning/common/windows/libclang.ps1
@@ -1,6 +1,7 @@
param(
[Int32]$archVer=32,
- [string]$toolchain="vs2015"
+ [string]$toolchain="vs2015",
+ [bool]$setDefault=$true
)
. "$PSScriptRoot\helpers.ps1"
@@ -11,20 +12,22 @@ param(
Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object {
$var = $_.Split('=')
- New-Variable -Name $var[0] -Value $var[1]
+ New-Variable -Name $var[0] -Value $var[1] -Force
$libclang_version = $libclang_version -replace '["."]'
}
$zip = "c:\users\qt\downloads\libclang.7z"
-$baseDestination = "C:\Utils\libclang-" + $libclang_version
+$baseDestination = "C:\Utils\libclang-" + $libclang_version + "-" + $toolchain
function setURL() {
$script:url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z"
}
+$toolchainSuffix = ""
+
if ( $toolchain -eq "vs2015" ) {
if ( $archVer -eq 64 ) {
- $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0"
+ $sha1 = "37afa18d243a50c05bee5c6e16b409ed526ec17a"
$destination = $baseDestination + "-64"
setURL
@@ -37,7 +40,7 @@ if ( $toolchain -eq "vs2015" ) {
}
$archVer=32
- $sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205"
+ $sha1 = "812b6089c6da99ced9ebebbd42923bd96590519d"
$destination = $baseDestination + "-32"
setURL
@@ -47,11 +50,12 @@ if ( $toolchain -eq "vs2015" ) {
Extract-7Zip $zip C:\Utils\
Rename-Item C:\Utils\libclang $destination
Remove-Item -Force -Path $zip
+ $toolchainSuffix = "msvc"
}
if ( $toolchain -eq "mingw" ) {
if ( $archVer -eq 64 ) {
- $sha1 = "3e318f70a1e76c14365ced65f4fa7031bb730818"
+ $sha1 = "1233e6c008b90d89483df0291a597a0bac426d29"
$destination = $baseDestination + "-64"
setURL
@@ -64,7 +68,7 @@ if ( $toolchain -eq "mingw" ) {
}
$archVer=32
- $sha1 = "a9973192a01a9c16976ed0cc6ef6dac3dbc4a2d3"
+ $sha1 = "2d6ceab0e1a05e2b19fe615c57b64d36977b4933"
$destination = $baseDestination + "-32"
setURL
@@ -74,7 +78,11 @@ if ( $toolchain -eq "mingw" ) {
Extract-7Zip $zip C:\Utils\
Rename-Item C:\Utils\libclang $destination
Remove-Item -Force -Path $zip
+ $toolchainSuffix = "mingw"
}
-Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
+if ( $setDefault ) {
+ Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
+}
+Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_")
Write-Output "libClang = $libclang_version" >> ~/versions.txt
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 219f80c4..ed589644 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
@@ -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-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 3202462b..5113633a 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
@@ -7,6 +7,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-10-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
index 8da8cc5a..4d56d612 100644
--- a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
@@ -1 +1,3 @@
+# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw $False
. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 vs2015
diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
index f7a722d7..62f11292 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
@@ -1 +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 vs2015