diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-05-26 17:36:07 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-16 08:40:11 +0000 |
commit | 8ddc3c1254149920b8ad9e691ea65c88fd149ee2 (patch) | |
tree | a5687bfddabe30784bfa87671721a18e359accc8 /coin/provisioning | |
parent | bbe0a01fdee4a146d6b143e7ce3667bf778e4f15 (diff) |
Add script to patch QNX SDK headers for Qt atomics
Applies http://www.qnx.com/download/feature.html?programid=27555
to the QNX SDK on our continuous integration machines.
Change-Id: I6d24b5024b3e5981c30bbf9a26a1bb4dfaca4e80
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Diffstat (limited to 'coin/provisioning')
-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-7-x86/patch_qnx.ps1 | 1 |
3 files changed, 116 insertions, 0 deletions
diff --git a/coin/provisioning/common/patch_qnx.ps1 b/coin/provisioning/common/patch_qnx.ps1 new file mode 100644 index 00000000..2fca7b67 --- /dev/null +++ b/coin/provisioning/common/patch_qnx.ps1 @@ -0,0 +1,51 @@ +############################################################################# +## +## 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://${Env:COIN_WEBSERVER_ADDRESS}/coin/provisioning/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 new file mode 100644 index 00000000..19993ecc --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh @@ -0,0 +1,64 @@ +#!/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 -e +sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565" + +function InstallZipPackageFromURL { + url=$1 + expectedSha1=$2 + targetDirectory=$3 + + targetFile=`mktemp` || echo "Failed to create temporary file" + wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times" + echo "$expectedSha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" + + tempDir=`mktemp -d` || echo "Failed to create temporary directory" + /usr/bin/unzip -o -d $tempDir $targetFile || echo "Failed to unzip $url archive" + trap "sudo rm -fr $targetFile $tempDir" EXIT + + sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/ +} + +echo "Patching QNX" + +baseBinaryPackageURL="http://${COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip" +InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/" diff --git a/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 new file mode 100644 index 00000000..41210dcb --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\patch_qnx.ps1" |