lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-17 17:56:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update QDoc libclang to 10.0

Browse Source 
Change-Id: Ic4899f188c92502c6f6808dcc05922d4980cadfd
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
This commit is contained in:
Tony Sarajärvi
2019-08-16 12:14:52 +00:00
committed by Alexandru Croitor
parent 22af804aee
commit 7a5069e979
4 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,18 +47,23 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
# shellcheck source=./DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
libclang_version=6.0
libclang_version=10.0
if uname -a |grep -q Darwin; then
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-mac.7z"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-mac.7z"
sha1="0af8ab8c1174faf4b721d079587190fc32ea8364"
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="6e019c428511e74c5d46d0ddca79d8e804b67f8a"
elif test -f /etc/redhat-release; then
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z"
sha1="16fcb99c139ee613ccc46683fa842a5187457f35"
else
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
sha1="ef59b699f4fcce2e45108b3ff04cc7471c1c4abe"
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
sha1="08f352d411e4b47c2a259c3b120d7cb2db01e41d"
fi
zip="/tmp/libclang.7z"

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

@@ -1,11 +1,11 @@
param(
[Int32]$archVer=32,
[string]$toolchain="vs2015",
[string]$toolchain="vs2019",
[bool]$setDefault=$true
)
. "$PSScriptRoot\helpers.ps1"
$libclang_version="6.0"
$libclang_version="10.0"
Write-Output "libClang = $libclang_version" >> ~/versions.txt
# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
@@ -25,8 +25,8 @@ function install() {
$zip = "c:\users\qt\downloads\libclang.7z"
$script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z"
$script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z"
$script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z"
$script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z"
Download $OfficialUrl $CachedUrl $zip
Verify-Checksum $zip $sha1
@@ -37,44 +37,34 @@ function install() {
$toolchainSuffix = ""
if ( $toolchain -eq "vs2015" ) {
if ( $toolchain -eq "vs2019" ) {
if ( $archVer -eq 64 ) {
$sha1 = "a399af949271e6d3bfc578ea2c17ff1d6c6318b9"
$destination = $baseDestination + "-64"
install $sha1 $destination
$sha1 = "6e1b3e6d38803a3bf088e521f4f4feb1ca44bac3"
}
else {
$sha1 = "36fcdc3155eef3636d99ed591f12e73d7a9a2e0c"
}
$archVer=32
$sha1 = "aa3f68f1cfa87780a4631a98ce883d3d9cb94330"
$destination = $baseDestination + "-32"
install $sha1 $destination
$toolchainSuffix = "msvc"
}
if ( $toolchain -eq "mingw" ) {
if ( $archVer -eq 64 ) {
$sha1 = "b382502f82d1cfa7d3cc3016d909d37edc19c22c"
$destination = $baseDestination + "-64"
install $sha1 $destination
$sha1 = "34daf2324d190de49f8e4005afeb39a7d70c5842"
}
else {
$sha1 = "3d7c809ab12c9293df8ffd9343cee68f184c8612"
}
$archVer=32
$sha1 = "cbc68e0f93f4cb0ed7084a045b7c07a1980a2a44"
$destination = $baseDestination + "-32"
install $sha1 $destination
$toolchainSuffix = "mingw"
}
install $sha1 $baseDestination-$archVer
if ( $setDefault ) {
Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
}
Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_")
if ( $libclang_version -eq "60" ) {
if ( $libclang_version -eq "100" ) {
# This is a hacked static build of libclang which requires special
# handling on the qdoc side.
Set-EnvironmentVariable "QDOC_USE_STATIC_LIBCLANG" "1"

3
coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
View File

@@ -1 +1,2 @@
. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 vs2015
. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 vs2019
. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw $False

4
coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
View File

@@ -1,3 +1,5 @@
# 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
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019
. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw $False
. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 vs2019