diff options
4 files changed, 54 insertions, 15 deletions
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 diff --git a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 index 3ad5b9fd..8da8cc5a 100644 --- a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 +. "$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 b6e3582c..f7a722d7 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 @@ -. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 +. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2015 diff --git a/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 new file mode 100644 index 00000000..375deed3 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw |