From 5fba5922888c301f595b4c54db4999d741b556a3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 23 Mar 2021 14:30:29 +0200 Subject: [PATCH] Remove old QNX provisionings QNX 6.6 and 7.0 are not needed since they don't support Qt6. Change-Id: I56d71bbebf421d1a5d952815878217b0bfdc85b2 Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/qnx_660.sh | 66 ------------------- .../60-qnx660.sh | 39 ----------- .../qtci-macos-10.14-x86_64/40-qnx700.sh | 56 ---------------- .../qtci-macos-10.15-x86_64/40-qnx700.sh | 56 ---------------- .../qtci-macos-11.0-x86_64/40-qnx700.sh | 56 ---------------- .../qtci-windows-10-x86_64/05-qnx_700.ps1 | 47 ------------- 6 files changed, 320 deletions(-) delete mode 100755 coin/provisioning/common/linux/qnx_660.sh delete mode 100755 coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/60-qnx660.sh delete mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh delete mode 100755 coin/provisioning/qtci-macos-10.15-x86_64/40-qnx700.sh delete mode 100755 coin/provisioning/qtci-macos-11.0-x86_64/40-qnx700.sh delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 diff --git a/coin/provisioning/common/linux/qnx_660.sh b/coin/provisioning/common/linux/qnx_660.sh deleted file mode 100755 index eb6fd5f0..00000000 --- a/coin/provisioning/common/linux/qnx_660.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 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$ -## -############################################################################# - -# This script installs QNX 6.6.0. - -set -ex - -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" - -targetFolder="/opt/" -sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/linux/qnx660-patch4687-linux.tar.gz" -sha1="ffcf91489699c42ce9c1d74941f1829531752bbe" -folderName="qnx660" -targetFile="qnx660.tar.gz" -wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" -echo "$sha1 $targetFile" | sha1sum --check -if [ ! -d "$targetFolder" ]; then - mkdir -p $targetFolder -fi -sudo tar -C $targetFolder -xzf $targetFile -sudo chown -R qt:users "$targetFolder"/"$folderName" - -# Verify that we have last file in tar -if [ ! -f $targetFolder/$folderName/qnx660-env.sh ]; then - echo "Installation failed!" - exit -1 -fi - -rm -rf $targetFile - -# Set env variables -SetEnvVar "QNX_660" "$targetFolder$folderName" - -echo "QNX SDP = 6.6.0" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/60-qnx660.sh deleted file mode 100755 index 4dd1d40e..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/60-qnx660.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite 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$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/linux/qnx_660.sh -source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh deleted file mode 100755 index 570e67cb..00000000 --- a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2018 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$ -## -############################################################################# - -# This script installs QNX 7. - -targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" -folderName="qnx700" - -sudo mkdir -p "$targetFolder" - -echo "Extracting QNX 7" -sudo tar -C "$targetFolder" -Jxf $sourceFile - -sudo chown -R qt:wheel "$targetFolder"/"$folderName" - -# Verify that we have last file in zip -if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then - exit 1 -fi - -# Set env variables -echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc -echo "QNX SDP = 7.0.0" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.15-x86_64/40-qnx700.sh deleted file mode 100755 index bb035fdf..00000000 --- a/coin/provisioning/qtci-macos-10.15-x86_64/40-qnx700.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2020 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$ -## -############################################################################# - -# This script installs QNX 7. - -targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" -folderName="qnx700" - -sudo mkdir -p "$targetFolder" - -echo "Extracting QNX 7" -sudo tar -C "$targetFolder" -Jxf $sourceFile - -sudo chown -R qt:wheel "$targetFolder"/"$folderName" - -# Verify that we have last file in zip -if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then - exit 1 -fi - -# Set env variables -echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc -echo "QNX SDP = 7.0.0" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-11.0-x86_64/40-qnx700.sh deleted file mode 100755 index bb035fdf..00000000 --- a/coin/provisioning/qtci-macos-11.0-x86_64/40-qnx700.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2020 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$ -## -############################################################################# - -# This script installs QNX 7. - -targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" -folderName="qnx700" - -sudo mkdir -p "$targetFolder" - -echo "Extracting QNX 7" -sudo tar -C "$targetFolder" -Jxf $sourceFile - -sudo chown -R qt:wheel "$targetFolder"/"$folderName" - -# Verify that we have last file in zip -if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then - exit 1 -fi - -# Set env variables -echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc -echo "QNX SDP = 7.0.0" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 deleted file mode 100644 index e2c82580..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ /dev/null @@ -1,47 +0,0 @@ -############################################################################# -## -## Copyright (C) 2017 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 installs QNX SDP 7.0 - -$zip = Get-DownloadLocation "qnx700.7z" -$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-windows.7z" - -Download $url $url $zip -Verify-Checksum $zip "1f10e9660efc81b18cb897871ba2b0384cf0fc6d" -Extract-7Zip $zip C:\ - -Set-EnvironmentVariable "QNX_700" "C:\QNX700" -Write-Output "QNX SDP = 7.0.0" >> ~/versions.txt -Remove "$zip"