diff options
author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2019-08-16 12:14:52 +0000 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-08-25 21:39:00 +0200 |
commit | 7a5069e9796832e28dad6694255f2f543131160b (patch) | |
tree | 351f4f7b1182bf7fb72bc2e7351bb00037c959aa /coin/provisioning/common/windows/libclang.ps1 | |
parent | 22af804aee9f46cdf8bcda96f484624da6bdefaa (diff) | |
download | qt5-7a5069e9796832e28dad6694255f2f543131160b.tar.gz |
Update QDoc libclang to 10.0
Change-Id: Ic4899f188c92502c6f6808dcc05922d4980cadfd
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'coin/provisioning/common/windows/libclang.ps1')
-rw-r--r-- | coin/provisioning/common/windows/libclang.ps1 | 42 |
1 files changed, 16 insertions, 26 deletions
diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 7caecc96..c20c7bc4 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -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" |