Add prebuilt 64-bit packages for Bzip2, Xz and Zlib

64-bit packages were built using MSVC 2019 environment.

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

3 files changed, 69 insertions, 34 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 50a86ca5..dd11e570 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/35-bzip2.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/35-bzip2.ps1
@@ -37,13 +37,25 @@
 
 # Prebuilt instructions:
 # Download https://www.sourceware.org/pub/bzip2/bzip2-latest.tar.gz
-# 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
-# exit powershell
+#
+# MSVC 2015 used with x86
+# x86: Extract sources to C:\Utils
+# x86: cd C:\Utils\bzip2-$version
+# x86: start powershell
+# x86: (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
+# 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
+# x86: nmake -f makefile.msc
+#
+# MSVC 2019 used with x64
+# x64: Extract sources to C:\Utils
+# x64: rename source folder to C:\Utils\bzip2-$version-x64
+# x64: start powershell
+# x64: (Get-Content C:\Utils\bzip2-$version-x64\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-x64\makefile.msc
+# x64: exit powershell
+# x64: "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat" x64
+# x64: nmake -f makefile.msc
+
 
 $version = "1.0.8"
 # Install x86 version
@@ -54,10 +66,10 @@ 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"
+$sha1_64 = "e4416598c8ba0aa1725a2bfab5a86f2ccd5effc3"
+Download http://ci-files01-hki.intra.qt.io/input/windows/bzip2-$version-x64-prebuilt-msvc2019.zip http://ci-files01-hki.intra.qt.io/input/windows/bzip2-$version-x64-prebuilt-msvc2019.zip C:\Windows\Temp\bzip2-$version-x64-prebuilt-msvc2019.zip
+Verify-Checksum "C:\Windows\Temp\bzip2-$version-x64-prebuilt-msvc2019.zip" "$sha1_64"
+Extract-7Zip "C:\Windows\Temp\bzip2-$version-x64-prebuilt-msvc2019.zip" C:\Utils
+Remove-Item -Path "C:\Windows\Temp\bzip2-$version-x64-prebuilt-msvc2019.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 d04771b3..dd14a007 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/35-xz.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/35-xz.ps1
@@ -37,15 +37,25 @@
 
 # Prebuilt instructions:
 # Download http://ci-files01-hki.intra.qt.io/input/windows/xz-5.2.5.zip or from original donwload page https://tukaani.org/xz/
-# Extract to C:\Utils
-# mkdir C:\Utils\xz-5.2.5\windows\vs2015
-# 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
-# Exit powershell
+#
+# MSVC 2015 used with x86
+# x86: Extract sources to C:\Utils
+# x86: mkdir C:\Utils\xz-5.2.5\windows\vs2015
+# x86: copy "C:\Utils\xz-$version\windows\vs2017\*" "C:\Utils\xz-$version\windows\vs2015\"
+# x86: cd C:\Utils\xz-$version
+# x86: copy "C:\Utils\xz-$version\windows\vs2017\*" "C:\Utils\xz-$version\windows\vs2015\"
+# x86: 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
+# 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
+# x86: msbuild /property:Configuration=ReleaseMT windows/vs2015/liblzma.vcxproj
+#
+# MSVC 2019 used with x64
+# x64: Extract sources to C:\Utils
+# x64: rename source folder to C:\Utils\xz-$version-x64
+# x64: cd C:\Utils\xz-$version-x64
+# Exit powershell
+# x64: "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat" x64
+# x64: msbuild /property:Configuration=ReleaseMT windows/vs2019/liblzma.vcxproj
 
 $version = "5.2.5"
 $sha1 = "75570c1826428cfd86efd9835e342334f1493f7b"
@@ -54,11 +64,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"
+$sha1_64 = "8b49de6a838cc2b479846b00fb92553f32216dd8"
+Download http://ci-files01-hki.intra.qt.io/input/windows/xz-$version-x64-prebuilt-msvc2019.zip http://ci-files01-hki.intra.qt.io/input/windows/xz-$version-x64-prebuilt-msvc2019.zip C:\Windows\Temp\xz-$version-x64-prebuilt-msvc2019.zip
+Verify-Checksum "C:\Windows\Temp\xz-$version-x64-prebuilt-msvc2019.zip" "$sha1_64"
+Extract-7Zip "C:\Windows\Temp\xz-$version-x64-prebuilt-msvc2019.zip" C:\Utils
+Remove-Item -Path "C:\Windows\Temp\xz-$version-x64-prebuilt-msvc2019.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 c123cc22..2cf70bad 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/35-zlib.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/35-zlib.ps1
@@ -37,12 +37,25 @@
 
 # Prebuilt instructions:
 # Download https://zlib.net/zlib1212.zip
-# Extract to C:\Utils
-# cd C:\Utils\zlib-$version
-# 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
+#
+# MSVC 2015 used with x86
+# x86: Extract sources to C:\Utils
+# x86: cd C:\Utils\zlib-$version
+# x86: start powershell
+# x86: (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: 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 win32\makefile.msc
+# x86: nmake -f win32\makefile.msc
+#
+# MSVC 2019 used with x64
+# x64: Extract sources to C:\Utils
+# x64: rename source folder to C:\Utils\zlib-$version-x64
+# x64: cd C:\Utils\zlib-$version-x64
+# x64: start powershell
+# x64: (Get-Content C:\Utils\zlib-$version-x64\win32\makefile.msc) | ForEach-Object { $_ -replace "-MD -W3 -O2 -Oy- -Zi", "-MT -W3 -O2 -Oy- -Zi" } | Set-Content C:\Utils\zlib-$version-x64\win32\makefile.msc
+# x64: exit powershell
+# x64: "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat" x64
+# x64: nmake -f win32\makefile.msc
 
 $version = "1.2.12"
 $sha1 = "d8b9c568ea7a976af1e8de52dfb9a2c55daed0c8"
@@ -51,11 +64,11 @@ 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"
+$sha1_64 = "e28670ccbfee9e7adb916a7cdc139b85dd6e311b"
+Download http://ci-files01-hki.intra.qt.io/input/windows/zlib-$version-x64-prebuilt-msvc2019.zip http://ci-files01-hki.intra.qt.io/input/windows/zlib-$version-x64-prebuilt-msvc2019.zip C:\Windows\Temp\zlib-$version-x64-prebuilt-msvc2019.zip
+Verify-Checksum "C:\Windows\Temp\zlib-$version-x64-prebuilt-msvc2019.zip" "$sha1_64"
+Extract-7Zip "C:\Windows\Temp\zlib-$version-x64-prebuilt-msvc2019.zip" C:\Utils
+Remove-Item -Path "C:\Windows\Temp\zlib-$version-x64-prebuilt-msvc2019.zip"
 
 Write-Output "ZLIB = $version" >> ~\versions.txt