From 52b163092ad890620c1a190f5fce404565e19e99 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Thu, 25 Jan 2018 10:21:35 +0200 Subject: Add missing 08-libclang.ps1 for windows7 provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to set LLVM_INSTALL_DIR to be able to build qdoc. That was missing from windows7. Task-number: QTBUG-65950 Change-Id: I7f75eb0181056a2117080ead6dc5862324906689 Reviewed-by: Simo Fält --- coin/provisioning/common/windows/libclang.ps1 | 64 +++++++++++++++++++++------ 1 file changed, 51 insertions(+), 13 deletions(-) (limited to 'coin/provisioning/common/windows') diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 84d3656f..a8095ffe 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -1,4 +1,7 @@ -param([Int32]$archVer=32) +param( + [Int32]$archVer=32, + [string]$toolchain="vs2015" +) . "$PSScriptRoot\helpers.ps1" # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). @@ -14,11 +17,30 @@ Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object { $zip = "c:\users\qt\downloads\libclang.7z" $baseDestination = "C:\Utils\libclang-" + $libclang_version -if ( $archVer -eq 64 ) { - $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0" - $url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_64.7z" - $destination = $baseDestination + "-64" +function setURL() { + $script:url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z" +} + +if ( $toolchain -eq "vs2015" ) { + if ( $archVer -eq 64 ) { + $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0" + $destination = $baseDestination + "-64" + + setURL + Download $url $url $zip + Verify-Checksum $zip $sha1 + + Extract-7Zip $zip C:\Utils\ + Rename-Item C:\Utils\libclang $destination + Remove-Item -Force -Path $zip + } + + $archVer=32 + $sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205" + $destination = $baseDestination + "-32" + + setURL Download $url $url $zip Verify-Checksum $zip $sha1 @@ -27,16 +49,32 @@ if ( $archVer -eq 64 ) { Remove-Item -Force -Path $zip } -$sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205" -$url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_32.7z" -$destination = $baseDestination + "-32" +if ( $toolchain -eq "mingw" ) { + if ( $archVer -eq 64 ) { + $sha1 = "3e318f70a1e76c14365ced65f4fa7031bb730818" + $destination = $baseDestination + "-64" + + setURL + Download $url $url $zip + Verify-Checksum $zip $sha1 + + Extract-7Zip $zip C:\Utils\ + Rename-Item C:\Utils\libclang $destination + Remove-Item -Force -Path $zip + } -Download $url $url $zip -Verify-Checksum $zip $sha1 + $archVer=32 + $sha1 = "a9973192a01a9c16976ed0cc6ef6dac3dbc4a2d3" + $destination = $baseDestination + "-32" -Extract-7Zip $zip C:\Utils\ -Rename-Item C:\Utils\libclang $destination -Remove-Item -Force -Path $zip + setURL + Download $url $url $zip + Verify-Checksum $zip $sha1 + + Extract-7Zip $zip C:\Utils\ + Rename-Item C:\Utils\libclang $destination + Remove-Item -Force -Path $zip +} Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_") Write-Output "libClang = $libclang_version" >> ~/versions.txt -- cgit v1.2.3