diff options
-rw-r--r-- | coin/platform_configs/default.txt | 1 | ||||
-rw-r--r-- | coin/platform_configs/qt5.txt | 3 | ||||
-rw-r--r-- | coin/provisioning/common/install-qnx660.ps1 | 46 | ||||
-rw-r--r-- | coin/provisioning/common/patch_qnx.ps1 | 51 | ||||
-rw-r--r-- | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh | 64 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 | 1 |
9 files changed, 0 insertions, 169 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 39f0373d..03057f86 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -21,5 +21,4 @@ qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck -qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 38dbd1c1..ef3e1266 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -14,14 +14,11 @@ qtci-windows-7-x86-3 Android_ANY armv7 Mingw53 Packagin qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/provisioning/common/install-qnx660.ps1 b/coin/provisioning/common/install-qnx660.ps1 deleted file mode 100644 index bf9c9d09..00000000 --- a/coin/provisioning/common/install-qnx660.ps1 +++ /dev/null @@ -1,46 +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\helpers.ps1" - -# This script will install QNX 6.6.0 - -$version = "6.6.0" -$nondottedversion = $version -replace '[.]','' -$targetFolder = "c:" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\qnx" + $nondottedversion + ".zip" - -Get-ChildItem $url_cache | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o"C:\"} - -[Environment]::SetEnvironmentVariable("QNX_660", "$targetFolder", "Machine") -echo "QNX = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/patch_qnx.ps1 b/coin/provisioning/common/patch_qnx.ps1 deleted file mode 100644 index 632859a0..00000000 --- a/coin/provisioning/common/patch_qnx.ps1 +++ /dev/null @@ -1,51 +0,0 @@ -############################################################################# -## -## Copyright (C) 2016 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$ -## -############################################################################# - -# Patch QNX SDK due to issues in the standard library. -# The patches are available here: -# http://www.qnx.com/download/feature.html?programid=27555 -# A copy of the patch must be in the root of the Coin path in -# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip - - -. "$PSScriptRoot\helpers.ps1" - -$zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip" -$sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565" -$tempDir = "C:\temp\qnx_path" - -Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip -Verify-Checksum $zip $sha1 -Extract-Zip $zip $tempDir -Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force -Remove-Item $tempDir -recurse diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh deleted file mode 100644 index 27c7137b..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## Copyright (C) 2016 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$ -## -############################################################################# - -# Patch QNX SDK due to issues in the standard library. -# The patches are available here: -# http://www.qnx.com/download/feature.html?programid=27555 -# A copy of the patch must be in the root of the Coin path in -# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip - -set -ex -sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565" - -function InstallZipPackageFromURL { - url=$1 - expectedSha1=$2 - targetDirectory=$3 - - targetFile=`mktemp` - wget --tries=5 --waitretry=5 --output-document=$targetFile $url - echo "$expectedSha1 $targetFile" | sha1sum --check - - tempDir=`mktemp -d` - /usr/bin/unzip -o -d $tempDir $targetFile - trap "sudo rm -fr $targetFile $tempDir" EXIT - - sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/ -} - -echo "Patching QNX" - -baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip" -InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/" diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 b/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 deleted file mode 100644 index 39627626..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\install-qnx660.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 deleted file mode 100644 index 41210dcb..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\patch_qnx.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 deleted file mode 100644 index 41210dcb..00000000 --- a/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\patch_qnx.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 deleted file mode 100644 index 41210dcb..00000000 --- a/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\patch_qnx.ps1" |