aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2021-08-26 12:48:33 +0300
committerHeikki Halmet <heikki.halmet@qt.io>2021-09-08 08:37:04 +0300
commit0253936025da524ab8a510cad65fc9243b48dc6f (patch)
treefa909410b9ee5a92473fabeba5b94f72fc9ed336
parentf7f32fa29339cb00e01ebcc9b976fee01832f553 (diff)
Provisioning: Add needed packages for supporting libarchiveifw-5.12.10
This is required by IFW Task-number: QTIFW-2310 Change-Id: Iade1ff6339bfe43f3f35486377f6c77ae593cec3 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/26-xz.sh (renamed from coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh)18
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/35-libiconv.sh5
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/35-bzip2.ps153
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/35-xz.ps156
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/35-zlib.ps154
6 files changed, 176 insertions, 14 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
index e0810b74..cbe4e512 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
@@ -115,6 +115,10 @@ installPackages+=(unixODBC-devel)
installPackages+=(unixODBC)
# Vulkan support
installPackages+=(vulkan-devel)
+# IFW
+installPackages+=(zlib-devel)
+installPackages+=(lzma)
+installPackages+=(bzip2-devel)
sudo yum -y install "${installPackages[@]}"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-xz.sh
index 9a667c64..b2766808 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-xz.sh
@@ -2,7 +2,7 @@
#############################################################################
##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,20 +33,10 @@
##
#############################################################################
-# This script installs XZ-Utils
+# This script installs XZ
-# XZ-Utils are needed for uncompressing xz-compressed files
+# XZ are needed for uncompressing xz-compressed files
set -ex
-# shellcheck source=../common/macos/InstallPKGFromURL.sh
-source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh"
-
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg"
-AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg"
-SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67"
-DestDir="/"
-
-InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
-
-echo "XZ = 5.0.7" >> ~/versions.txt
+brew install xz
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-libiconv.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-libiconv.sh
new file mode 100755
index 00000000..d02cea5c
--- /dev/null
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-libiconv.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -ex
+# Needed by IFW
+brew install libiconv; brew unlink libiconv
diff --git a/coin/provisioning/qtci-windows-10-x86_64/35-bzip2.ps1 b/coin/provisioning/qtci-windows-10-x86_64/35-bzip2.ps1
new file mode 100644
index 00000000..1054a1f5
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/35-bzip2.ps1
@@ -0,0 +1,53 @@
+############################################################################
+##
+## Copyright (C) 2021 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
+
+# This script will install prebuilt PZIB2 for IFW
+
+# 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
+# "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+# nmake -f makefile.msc
+
+$version = "1.0.8"
+$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"
+
+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
new file mode 100644
index 00000000..be464515
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/35-xz.ps1
@@ -0,0 +1,56 @@
+############################################################################
+##
+## Copyright (C) 2021 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
+
+# This script will install prebuilt XZ for IFW
+
+# 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
+# "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+# msbuild /property:Configuration=ReleaseMT windows/vs2015/liblzma.vcxproj
+
+$version = "5.2.5"
+$sha1 = "75570c1826428cfd86efd9835e342334f1493f7b"
+Download http://ci-files01-hki.intra.qt.io/input/windows/xz-$version-prebuilt.zip http://ci-files01-hki.intra.qt.io/input/windows/xz-$version-prebuilt.zip C:\Windows\Temp\xz-$version.zip
+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"
+
+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
new file mode 100644
index 00000000..a47d9dc2
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/35-zlib.ps1
@@ -0,0 +1,54 @@
+############################################################################
+##
+## Copyright (C) 2021 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
+
+# This script will install prebuilt ZLIB for IFW
+
+# Prebuilt instructions:
+# Download https://zlib.net/zlib1211.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
+# nmake -f win32\makefile.msc
+
+$version = "1.2.11"
+$sha1 = "e1992ff9ad58ad6631a84c1557e2a158ec90c5ce"
+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"
+
+Write-Output "ZLIB = $version" >> ~\versions.txt
+