summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2017-09-13 09:00:31 +0300
committerTony Sarajärvi <tony.sarajarvi@qt.io>2018-01-05 20:43:53 +0000
commit7a37b9070229c03ec8662e9c0286f44c277566d2 (patch)
tree660a572129fc839e3068433395cb3052ecaffc5f
parentf51fd755b5b1594744b6e68f630dd4d6c8167b6b (diff)
Drop builds done with VS2013
Task-number: QTQAINFRA-1390 Change-Id: Id3de3706466508cdbfc586b2a39d96083e8434e5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r--coin/platform_configs/default.txt1
-rw-r--r--coin/platform_configs/qt5.txt2
-rw-r--r--coin/provisioning/common/icu.ps136
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps151
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps151
5 files changed, 0 insertions, 141 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index 03057f86..ded7b8b3 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -1,6 +1,5 @@
Template Target OS Target arch Compiler Features
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release DisableTests
qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
qtci-windows-7-x86-3 Mingw53 DeveloperBuild Release OpenGLDynamic
qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index ef3e1266..f78bd898 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,7 +1,5 @@
Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-8.1-x86_64 x86 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
-qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
diff --git a/coin/provisioning/common/icu.ps1 b/coin/provisioning/common/icu.ps1
index 16dd8a6f..196ca5bc 100644
--- a/coin/provisioning/common/icu.ps1
+++ b/coin/provisioning/common/icu.ps1
@@ -43,12 +43,7 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e
$url_cache_2012 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_64_devel.7z"
$sha1_2012 = "8A8C371F3ED58E81BBCF58CF5F8388CEF51FA9AC"
- $url_official_2013 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_64_devel.7z"
- $url_cache_2013 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_64_devel.7z"
- $sha1_2013 = "7267CF8C5BD39C4218F2CCFE31ECA81B7644ED6F"
-
$icuPackage_msvc2012_64 = "C:\Windows\Temp\icu-$version-msvc2012_64.7z"
- $icuPackage_msvc2013_64 = "C:\Windows\Temp\icu-$version-msvc2013_64.7z"
if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_64_devel\)) {
echo "Fetching from URL ..."
@@ -62,21 +57,8 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e
echo "ICU MSVC2012 = $version" >> ~\versions.txt
}
- if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_64_devel\)) {
- echo "Fetching from URL ..."
- Download $url_official_2013 $url_cache_2013 $icuPackage_msvc2013_64
- Verify-Checksum $icuPackage_msvc2013_64 $sha1_2013
- Get-ChildItem $icuPackage_msvc2013_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_64_devel\""}
-
- echo "Cleaning $icuPackage_msvc2013_64..."
- Remove-Item -Recurse -Force $icuPackage_msvc2013_64
-
- echo "ICU MSVC2013 = $version" >> ~\versions.txt
- }
-
# FIXME: do we really want to have it per MSVC version? What about MSVC2015?
[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_64_devel\\icu53_1", "Machine")
-[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine")
# FIXME: do we really want to use the 4.8.2 ICU build?
[Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine")
@@ -87,12 +69,7 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e
$url_cache_2012_32 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_32_devel.7z"
$sha1_2012_32 = "F2FF287EEB0163B015D37AE08871165FBA87BCF0"
- $url_official_2013_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_32_devel.7z"
- $url_cache_2013_32 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_32_devel.7z"
- $sha1_2013_32 = "D745A5F0F6A3817AE989501A01A5A0BA53FDB800"
-
$icuPackage_msvc2012_32 = "C:\Windows\Temp\icu-$version-msvc2012_32.7z"
- $icuPackage_msvc2013_32 = "C:\Windows\Temp\icu-$version-msvc2013_32.7z"
if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_32_devel\)) {
echo "Fetching from URL ..."
@@ -106,20 +83,7 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e
echo "ICU MSVC2012 = $version" >> ~\versions.txt
}
- if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_32_devel\)) {
- echo "Fetching from URL ..."
- Download $url_official_2013_32 $url_cache_2013_32 $icuPackage_msvc2013_32
- Verify-Checksum $icuPackage_msvc2013_32 $sha1_2013_32
- Get-ChildItem $icuPackage_msvc2013_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_32_devel\""}
-
- echo "Cleaning $icuPackage_msvc2013_32..."
- Remove-Item -Recurse -Force $icuPackage_msvc2013_32
-
- echo "ICU MSVC2013 = $version" >> ~\versions.txt
- }
-
# FIXME: do we really want to have it per MSVC version? What about MSVC2015?
[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_32_devel\\icu53_1", "Machine")
-[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_32_devel\\icu53_1", "Machine")
}
diff --git a/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1
deleted file mode 100644
index 8540c67d..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1
+++ /dev/null
@@ -1,51 +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"
-
-# Install Visual Studio 2013 update 5
-
-$version = "2013 Update 5 (KB2829760)"
-$package = "C:\Windows\Temp\vs12-kb2829760.exe"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VS2013.5.exe"
-
-echo "Fetching patch for Visual Studio $version..."
-Copy-Item $url_cache $package
-$commandLine = $package
-
-echo "Installing Update 5 for Visual Studio $version..."
-. $commandLine /norestart /passive
-
-echo "Removing $package ..."
-remove-item $package
-
-echo "Visual Studio = $version" >> ~\versions.txt
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1
deleted file mode 100644
index 8540c67d..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1
+++ /dev/null
@@ -1,51 +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"
-
-# Install Visual Studio 2013 update 5
-
-$version = "2013 Update 5 (KB2829760)"
-$package = "C:\Windows\Temp\vs12-kb2829760.exe"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VS2013.5.exe"
-
-echo "Fetching patch for Visual Studio $version..."
-Copy-Item $url_cache $package
-$commandLine = $package
-
-echo "Installing Update 5 for Visual Studio $version..."
-. $commandLine /norestart /passive
-
-echo "Removing $package ..."
-remove-item $package
-
-echo "Visual Studio = $version" >> ~\versions.txt