Provisioning: Install prebuilt 64-bit packages from bzip2, zlib and xz

These are needed by IFW.
Also Zlib version is updated to 1.2.12 version

Task-number: QTQAINFRA-4877
Change-Id: Ic5507d2456331c8ee50059be6ed9e0c89c8024ee
Reviewed-by: Katja Marttila <katja.marttila@qt.io>

3 files changed, 35 insertions, 10 deletions

diff --git a/coin/provisioning/qtci-windows-10-x86_64/35-bzip2.ps1 b/coin/provisioning/qtci-windows-10-x86_64/35-bzip2.ps1
index 1054a1f5..50a86ca5 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/35-bzip2.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/35-bzip2.ps1
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -40,14 +40,24 @@
 # Extract to C:\Utils
 # cd C:\Utils\bzip2-$version
 # Run in powershell: (Get-Content C:\Utils\bzip2-$version\makefile.msc) | ForEach-Object { $_ -replace "-DWIN32 -MD -Ox -D_FILE_OFFSET_BITS=64 -nologo", "-DWIN32 -MT -Ox -D_FILE_OFFSET_BITS=64 -nologo" } | Set-Content C:\Utils\bzip2-$version\makefile.msc
-# "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+# exit powershell
+# x86: "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+# x64: "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
 # nmake -f makefile.msc
 
 $version = "1.0.8"
+# Install x86 version
 $sha1 = "4397208f4c4348d6662c9aa459cb3e508a872d42"
 Download http://ci-files01-hki.intra.qt.io/input/windows/bzip2-$version-prebuilt.zip http://ci-files01-hki.intra.qt.io/input/windows/bzip2-$version-prebuilt.zip C:\Windows\Temp\bzip2-$version.zip
 Verify-Checksum "C:\Windows\Temp\bzip2-$version.zip" "$sha1"
 Extract-7Zip "C:\Windows\Temp\bzip2-$version.zip" C:\Utils
 Remove-Item -Path "C:\Windows\Temp\bzip2-$version.zip"
 
+#Install x64 version
+$sha1_64 = "887bb6cfd6a25b3c9b8303698a27ea56fe726758"
+Download http://ci-files01-hki.intra.qt.io/input/windows/bzip2-$version-x64-prebuilt.zip http://ci-files01-hki.intra.qt.io/input/windows/bzip2-$version-x64-prebuilt.zip C:\Windows\Temp\bzip2-$version-x64.zip
+Verify-Checksum "C:\Windows\Temp\bzip2-$version-x64.zip" "$sha1_64"
+Extract-7Zip "C:\Windows\Temp\bzip2-$version-x64.zip" C:\Utils
+Remove-Item -Path "C:\Windows\Temp\bzip2-$version-x64.zip"
+
 Write-Output "Bzip2 = $version" >> ~\versions.txt
diff --git a/coin/provisioning/qtci-windows-10-x86_64/35-xz.ps1 b/coin/provisioning/qtci-windows-10-x86_64/35-xz.ps1
index be464515..d04771b3 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/35-xz.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/35-xz.ps1
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -42,7 +42,9 @@
 # cd C:\Utils\xz-$version
 # copy "C:\Utils\xz-$version\windows\vs2017\*" "C:\Utils\xz-$version\windows\vs2015\"
 # Run in powershell: (Get-Content C:\Utils\xz-$version\windows\vs2015\liblzma.vcxproj) | ForEach-Object { $_ -replace "<PlatformToolset>v141</PlatformToolset>", "<PlatformToolset>v140</PlatformToolset>" } | Set-Content C:\Utils\xz-$version\windows\vs2015\liblzma.vcxproj
-# "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+# Exit powershell
+# x86: "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+# x64: "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
 # msbuild /property:Configuration=ReleaseMT windows/vs2015/liblzma.vcxproj
 
 $version = "5.2.5"
@@ -52,5 +54,11 @@ Verify-Checksum "C:\Windows\Temp\xz-$version.zip" "$sha1"
 Extract-7Zip "C:\Windows\Temp\xz-$version.zip" C:\Utils
 Remove-Item -Path "C:\Windows\Temp\xz-$version.zip"
 
+$sha1_64 = "83c124bf2b32771a3ba89ab78294802d297b23ea"
+Download http://ci-files01-hki.intra.qt.io/input/windows/xz-$version-x64-prebuilt.zip http://ci-files01-hki.intra.qt.io/input/windows/xz-$version-x64-prebuilt.zip C:\Windows\Temp\xz-$version-x64.zip
+Verify-Checksum "C:\Windows\Temp\xz-$version-x64.zip" "$sha1_64"
+Extract-7Zip "C:\Windows\Temp\xz-$version-x64.zip" C:\Utils
+Remove-Item -Path "C:\Windows\Temp\xz-$version-x64.zip"
+
 Write-Output "XZ = $version" >> ~\versions.txt
 
diff --git a/coin/provisioning/qtci-windows-10-x86_64/35-zlib.ps1 b/coin/provisioning/qtci-windows-10-x86_64/35-zlib.ps1
index a47d9dc2..c123cc22 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/35-zlib.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/35-zlib.ps1
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -36,19 +36,26 @@
 # This script will install prebuilt ZLIB for IFW
 
 # Prebuilt instructions:
-# Download https://zlib.net/zlib1211.zip
+# Download https://zlib.net/zlib1212.zip
 # Extract to C:\Utils
 # cd C:\Utils\zlib-$version
-# (Get-Content C:\Utils\zlib-$version\win32\makefile.msc) | ForEach-Object { $_ -replace "-MD -W3 -O2 -Oy- -Zi", "-MT -W3 -O2 -Oy- -Zi" } | Set-Content C:\Utils\zlib-$version\win32\makefile.msc
-# "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+# powershell: (Get-Content C:\Utils\zlib-$version\win32\makefile.msc) | ForEach-Object { $_ -replace "-MD -W3 -O2 -Oy- -Zi", "-MT -W3 -O2 -Oy- -Zi" } | Set-Content C:\Utils\zlib-$version\win32\makefile.msc
+# x86: "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+# x64: "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
 # nmake -f win32\makefile.msc
 
-$version = "1.2.11"
-$sha1 = "e1992ff9ad58ad6631a84c1557e2a158ec90c5ce"
+$version = "1.2.12"
+$sha1 = "d8b9c568ea7a976af1e8de52dfb9a2c55daed0c8"
 Download http://ci-files01-hki.intra.qt.io/input/windows/zlib-$version-prebuilt.zip http://ci-files01-hki.intra.qt.io/input/windows/zlib-$version-prebuilt.zip C:\Windows\Temp\zlib-$version.zip
 Verify-Checksum "C:\Windows\Temp\zlib-$version.zip" "$sha1"
 Extract-7Zip "C:\Windows\Temp\zlib-$version.zip" C:\Utils
 Remove-Item -Path "C:\Windows\Temp\zlib-$version.zip"
 
+$sha1_64 = "8cd758804fbbe33006a09134bedaa95e492e034e"
+Download http://ci-files01-hki.intra.qt.io/input/windows/zlib-$version-x64-prebuilt.zip http://ci-files01-hki.intra.qt.io/input/windows/zlib-$version-x64-prebuilt.zip C:\Windows\Temp\zlib-$version-x64.zip
+Verify-Checksum "C:\Windows\Temp\zlib-$version-x64.zip" "$sha1_64"
+Extract-7Zip "C:\Windows\Temp\zlib-$version-x64.zip" C:\Utils
+Remove-Item -Path "C:\Windows\Temp\zlib-$version-x64.zip"
+
 Write-Output "ZLIB = $version" >> ~\versions.txt