summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2017-04-13 21:54:47 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-04-13 21:54:47 +0200
commitfa903eba4bcb4d2adefba277158a793f5a704b0a (patch)
treeb078b59c014f27bd44de7e4087448c86275fc054
parentbac199faa3c7bbaa3e51400b72de4171b4dcbd63 (diff)
parente48d65315076311b0e371efc4533aacb839b9418 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Change-Id: Icee114ea6bd025a54db7ce34d6a0bd0dc16e767c
-rw-r--r--coin/platform_configs/default.txt10
-rw-r--r--coin/platform_configs/qt5.txt2
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps158
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps149
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps12
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps149
-rw-r--r--coin/provisioning/common/DownloadURL.sh4
7 files changed, 167 insertions, 7 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index 71cfe22b..5f9aba51 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -1,14 +1,14 @@
Template Target OS Target arch Compiler Features
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release BuildExamples
-qtci-windows-10-x86_64-3 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix
+qtci-windows-10-x86_64-5 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix
qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86-3 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-3 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-3 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-3 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86-4 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-5 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-5 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-5 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-Ubuntu-16.04-x86_64 GCC NoWidgets ForceDebugInfo
qtci-linux-Ubuntu-16.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace
qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 738416d7..e6e5dfee 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,6 +1,6 @@
Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-3 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests
+qtci-windows-10-x86_64-5 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests
qtci-linux-RHEL-7.2-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-7-x86-2 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-2 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2
diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1
new file mode 100644
index 00000000..fb6a6594
--- /dev/null
+++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1
@@ -0,0 +1,58 @@
+#############################################################################
+##
+## 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\..\..\provisioning\common\helpers.ps1"
+
+# Install Visual Studio $version with $update_version
+# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs
+$version = "2015"
+$update_version = "3"
+
+# Only way to install specific Visual studio release is to use feed.xml.
+# Visual Studio $version setup will use the feed.xml that was available when $update_version released -> 'https://msdn.microsoft.com/en-us/library/mt653628.aspx'
+# These parameters will install Visual Studio Enterprise Update $update_version (the original Update $update_version without any further Update $update_version-era updates)
+$parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BBD3561-D764-4F39-AB8E-05356A122545/20160628.2/enu/feed.xml"
+
+$msvc_web_installer = "vs" + $version + "_" + $update_version
+$package = "C:\Windows\temp\$msvc_web_installer.exe"
+$url_cache = "http://ci-files01-hki.ci.local/input/windows/$msvc_web_installer.exe"
+$url_official = "https://go.microsoft.com/fwlink/?LinkId=691129"
+$sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266"
+
+echo "Fetching Visual Studio $version update $update_version..."
+Download $url_official $url_cache $package
+Verify-Checksum $package $sha1
+echo "Installing Visual studio $version update $update_version..."
+cmd /c "$package $parameters /norestart /Quiet"
+remove-item $package
+
+echo "Visual Studio = $version update $update_version" >> ~\versions.txt
diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
new file mode 100644
index 00000000..46675c23
--- /dev/null
+++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
@@ -0,0 +1,49 @@
+############################################################################
+##
+## 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"
+
+# This script will install Visual Studio 2017
+
+$version = "2017"
+$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe"
+$sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae"
+$msvcPackage = "C:\Windows\Temp\$version.exe"
+
+
+Download $url_cache $url_cache $msvcPackage
+Verify-Checksum $msvcPackage $sha1
+cmd /c "$msvcPackage --all --norestart --quiet --wait"
+echo "Cleaning $msvcPackage.."
+Remove-Item -Recurse -Force "$msvcPackage"
+echo "Visual Studio = $version" >> ~\versions.txt
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
index 618c87c4..fb6a6594 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
@@ -30,7 +30,7 @@
## $QT_END_LICENSE$
##
#############################################################################
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1"
# Install Visual Studio $version with $update_version
# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
new file mode 100644
index 00000000..46675c23
--- /dev/null
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
@@ -0,0 +1,49 @@
+############################################################################
+##
+## 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"
+
+# This script will install Visual Studio 2017
+
+$version = "2017"
+$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe"
+$sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae"
+$msvcPackage = "C:\Windows\Temp\$version.exe"
+
+
+Download $url_cache $url_cache $msvcPackage
+Verify-Checksum $msvcPackage $sha1
+cmd /c "$msvcPackage --all --norestart --quiet --wait"
+echo "Cleaning $msvcPackage.."
+Remove-Item -Recurse -Force "$msvcPackage"
+echo "Visual Studio = $version" >> ~\versions.txt
diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/DownloadURL.sh
index 9bf7fdb7..305f2675 100644
--- a/coin/provisioning/common/DownloadURL.sh
+++ b/coin/provisioning/common/DownloadURL.sh
@@ -79,6 +79,10 @@ function DownloadURL {
echo "Failed downloading PKG from primary and alternative URLs"
exit 1;
;;
+ $ExceptionSHA1)
+ echo "Failed checksum on $targetFile."
+ exit 1;
+ ;;
esac
}
}