From 80b739b1e89cdc86d468a5707fa3951e8a307862 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 17 Mar 2017 13:34:17 +0200 Subject: Provisioning: Move Visual Studio installation to pre-provisioning Visual Studios will be pre-provisioned to tier1/vanilla os when visual studio update is needed. Even if using pre-configured offline installer with specific workload and components the installation is still taking too long. This way we'll reduce provisioning time significantly Change-Id: I1f831aef648716dc640ce9cbfb4e63aa54e7afd0 Reviewed-by: Akseli Salovaara --- .../qtci-windows-10-x86/06-msvc2015_update.ps1 | 33 ---------------------- 1 file changed, 33 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86') diff --git a/coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 b/coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 deleted file mode 100644 index 83ff3f48..00000000 --- a/coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 +++ /dev/null @@ -1,33 +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\msvc2015_update.ps1" -- cgit v1.2.3 From 8b59bbc2a4012214e496bbd96d91ba8715ed6ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 27 Feb 2017 15:04:41 +0200 Subject: Coin provisioning: Use arg instead of autodetecting architecture When provisioning windows machine, it seems that detecting architecture by checking [System.Environment]::Is64BitProcess doesn't work properly. Instead pass 32 or 64 as an argument when calling powershell script. Change-Id: I890ad141b8ef194275848d0e656431753463cd2b Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-windows-10-x86/07-python.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/python.ps1 | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 coin/provisioning/qtci-windows-10-x86/07-python.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/python.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86') diff --git a/coin/provisioning/qtci-windows-10-x86/07-python.ps1 b/coin/provisioning/qtci-windows-10-x86/07-python.ps1 new file mode 100644 index 00000000..27c618e1 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/07-python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" 32 diff --git a/coin/provisioning/qtci-windows-10-x86/python.ps1 b/coin/provisioning/qtci-windows-10-x86/python.ps1 deleted file mode 100644 index 5f8aa2f8..00000000 --- a/coin/provisioning/qtci-windows-10-x86/python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python.ps1" -- cgit v1.2.3 From e00cb3ac596db7200108174cd85c66f4e3c1107a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 30 Mar 2017 14:05:16 +0300 Subject: Provisioning: Bug fix patch for msvc 2015 update 3 This bug fix patch is needed for QtWebEngine Change-Id: Id2c624461fbe27d9fd12a149281cae324bf8b14e Reviewed-by: Jani Heikkinen --- .../msvc_2015_update3_patch.ps1 | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86') diff --git a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 new file mode 100644 index 00000000..f16b5ef4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 @@ -0,0 +1,50 @@ +############################################################################# +## +## 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 Cumulative Servicing Release Visual Studio 2015 update 3 +# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx +# http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe + +$version = "2015 update3 (KB3165756)" +$package = "C:\Windows\Temp\vs14-kb3165756.exe" +$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe" +$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878" +$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02" + +echo "Fetching patch for Visual Studio $version..." +Download $url_official $url_cache $package +Verify-Checksum $package $sha1 +echo "Installing patch for Visual Studio $version..." +cmd /c "$package /norestart /Quiet" +remove-item $package -- cgit v1.2.3