From 19f8a741f3556271dc4ef598bbf725f89b733b6a Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 27 Dec 2017 11:12:09 +0200 Subject: Make provisioning script prefix style match across platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently we are using different styles and amount of digits for the provisioning script prefixes. This change will unify them across the platforms. Also removes a couple of duplicate files. Task-number: QTQAINFRA-1668 Change-Id: I039777e7616bccc29c6a4ac55db13326ae8dc87c Reviewed-by: Joni Jäntti Reviewed-by: Simo Fält --- .../qtci-windows-8.1-x86/001-disable-uac.ps1 | 1 - .../004-disable-windows-updates.ps1 | 1 - .../009-set-network-test-server.ps1 | 1 - .../qtci-windows-8.1-x86/01-disable-uac.ps1 | 1 + .../qtci-windows-8.1-x86/02-install-notepad++.ps1 | 1 - .../qtci-windows-8.1-x86/02-python.ps1 | 1 + .../04-disable-windows-updates.ps1 | 1 + .../qtci-windows-8.1-x86/06-python.ps1 | 1 - .../qtci-windows-8.1-x86/08-python3.ps1 | 1 + .../qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 | 51 ++++++++++++++++++++++ .../qtci-windows-8.1-x86/09-openssl.ps1 | 1 + .../09-set-network-test-server.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 | 1 + .../provisioning/qtci-windows-8.1-x86/60-cmake.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 | 1 + .../qtci-windows-8.1-x86/90-install-notepad++.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 | 1 - coin/provisioning/qtci-windows-8.1-x86/icu.ps1 | 1 - coin/provisioning/qtci-windows-8.1-x86/jom.ps1 | 1 - .../qtci-windows-8.1-x86/msvc-2013-update5.ps1 | 51 ---------------------- coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 | 1 - coin/provisioning/qtci-windows-8.1-x86/python3.ps1 | 1 - 22 files changed, 61 insertions(+), 61 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86/icu.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86/jom.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86/python3.ps1 (limited to 'coin/provisioning/qtci-windows-8.1-x86') diff --git a/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 deleted file mode 100644 index 2303699c..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\disable-uac.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 deleted file mode 100644 index c19bf6cd..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 deleted file mode 100644 index 16d2e180..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\set-network-test-server.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 new file mode 100644 index 00000000..2303699c --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-uac.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 deleted file mode 100644 index 1f26c731..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\install-notepad++.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 new file mode 100644 index 00000000..44c1c5ff --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 new file mode 100644 index 00000000..c19bf6cd --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 deleted file mode 100644 index 44c1c5ff..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 new file mode 100644 index 00000000..164fbe43 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 new file mode 100644 index 00000000..8540c67d --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 @@ -0,0 +1,51 @@ +############################################################################# +## +## 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/09-openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 new file mode 100644 index 00000000..f3906f78 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\openssl.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 new file mode 100644 index 00000000..16d2e180 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\set-network-test-server.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 new file mode 100644 index 00000000..325be36a --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\icu.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 new file mode 100644 index 00000000..842c65dd --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\jom.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 new file mode 100644 index 00000000..1f26c731 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-notepad++.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 deleted file mode 100644 index 8dbe0372..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86/icu.ps1 deleted file mode 100644 index 325be36a..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/icu.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\icu.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86/jom.ps1 deleted file mode 100644 index 842c65dd..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/jom.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\jom.ps1" 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/openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 deleted file mode 100644 index f3906f78..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\openssl.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 deleted file mode 100644 index 164fbe43..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python3.ps1" 32 -- cgit v1.2.3