diff options
author | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
commit | def11da274cc4af1ba15bdc43fe7aac74bb40d49 (patch) | |
tree | 65523361f6e2371f135abb0c0b7c40a9f808b05f /coin/provisioning/qtci-windows-10-x86_64 | |
parent | 44eaaf374a2c4cc0e370f84c561a7aaaa23f4096 (diff) | |
parent | eccfaf1f506ceb46016e385c1a2707461811def2 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
coin/platform_configs/qt5.txt
Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 | 2 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt | 6 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 | 52 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1) | 20 |
10 files changed, 16 insertions, 70 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 deleted file mode 100644 index dfca166f..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 new file mode 100644 index 00000000..1042c846 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 new file mode 100644 index 00000000..82cee080 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\fbx_windows.ps1" 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 index cc00fe0d..3ffe1a06 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -37,7 +37,7 @@ $zip = "c:\users\qt\downloads\qnx700.7z" -Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.ci.local/input/qnx/qnx700.7z -OutFile $zip +Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z -OutFile $zip Verify-Checksum $zip "2eab8bcf993056f79c9e2585c9c05e05658ba8bb" Extract-7Zip $zip C:\ diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 deleted file mode 100644 index 07c4f487..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\install-java.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 new file mode 100644 index 00000000..3b64ffec --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt index 30979954..a7ced8ae 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -13,8 +13,8 @@ libxml2:shared=True libxslt:shared=True [imports] -bin, icudt57.dll -> ./bin -bin, icuin57.dll -> ./bin -bin, icuuc57.dll -> ./bin +bin, icudt59.dll -> ./bin +bin, icuin59.dll -> ./bin +bin, icuuc59.dll -> ./bin bin, libxml2.dll -> ./bin bin, libxslt.dll -> ./bin diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 deleted file mode 100644 index ee101fa5..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 +++ /dev/null @@ -1,52 +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\helpers.ps1" - -$version = "11_2_2" -$openglPackage = "C:\Windows\SysWOW64\opengl32.dll" - -$openglUrl = "\\ci-files01-hki.intra.qt.io\provisioning\mesa3d\windows\32bit\opengl32.dll" -$openglSha1 = "690730f973aa39bd80648e026248394fde07a753" - -echo "Take ownership of existing opengl32.dll from SysWOW64" -takeown /f $openglPackage -icacls $openglPackage /grant Administrators:F -echo "Remove existing opengl32.dll from SysWOW64" -Remove-Item -Recurse -Force $openglPackage -echo "Add new opengl32.dll to SysWOW64" -Invoke-WebRequest -UseBasicParsing $openglUrl -OutFile $openglPackage -Verify-Checksum $openglPackage $openglSha1 - -# Store version information to ~/versions.txt -echo "OpenGL x86 = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 new file mode 100644 index 00000000..41210dcb --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\patch_qnx.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1 b/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 index d4439856..882bd1de 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 @@ -1,9 +1,10 @@ ############################################################################# ## ## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2017 Pelagicore AG ## Contact: http://www.qt.io/licensing/ ## -## This file is part of the provisioning scripts of the Qt Toolkit. +## This file is part of the test suite of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage @@ -33,16 +34,11 @@ . "$PSScriptRoot\..\common\helpers.ps1" -# This script installs MinGW 5.3 +# Signing tools are needed to sign offline installers when releasing +$url = "http://ci-files01-hki.intra.qt.io/input/semisecure/sign/sign.zip" +$destination = "C:\Windows\temp\sign.zip" -$zip = "c:\users\qt\downloads\i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z" - -Invoke-WebRequest -UseBasicParsing http://download.qt.io/development_releases/prebuilt/mingw_32/i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z -OutFile $zip -Verify-Checksum $zip "d4f21d25f3454f8efdada50e5ad799a0a9e07c6a" -Extract-7Zip $zip C:\ -Rename-Item -path C:\mingw32 -newName C:\MinGW530 - -[Environment]::SetEnvironmentVariable("MINGW530", "C:\MinGW530", "Machine") -echo "MinGW = 5.3.0" >> ~/versions.txt -del $zip +Download $url $url $destination +Extract-Zip "$destination" "C:\Utils" +Remove-Item "$destination" |