From eb63604bc9fd12939764d326f0341b013b34ed76 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 6 Sep 2021 09:38:08 +0300 Subject: Include VCToolsVersion and WindowsSDKVersion to versions.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's include these needed versions to versions.txt and set Visual studio versions as a last items in the versions list. Task-number: QTQAINFRA-4542 Change-Id: Ic4c4c9f092925b0e4dc05a1874fa2ee651b24b7d Reviewed-by: Tony Sarajärvi --- .../common/windows/update-msvc2019.ps1 | 3 ++ .../qtci-windows-10-x86_64/05-msvc2015.ps1 | 40 ---------------------- .../qtci-windows-10-x86_64/05-msvc2019.ps1 | 36 ------------------- .../qtci-windows-10-x86_64/99-msvc2015.ps1 | 40 ++++++++++++++++++++++ .../qtci-windows-10-x86_64/99-msvc2019.ps1 | 36 +++++++++++++++++++ .../qtci-windows-10_21H1-x86_64/05-msvc2015.ps1 | 40 ---------------------- .../qtci-windows-10_21H1-x86_64/05-msvc2019.ps1 | 36 ------------------- .../qtci-windows-10_21H1-x86_64/99-msvc2015.ps1 | 40 ++++++++++++++++++++++ .../qtci-windows-10_21H1-x86_64/99-msvc2019.ps1 | 36 +++++++++++++++++++ 9 files changed, 155 insertions(+), 152 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/05-msvc2015.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/05-msvc2019.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/99-msvc2015.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/99-msvc2019.ps1 delete mode 100644 coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2015.ps1 delete mode 100644 coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2019.ps1 create mode 100644 coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2015.ps1 create mode 100644 coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2019.ps1 diff --git a/coin/provisioning/common/windows/update-msvc2019.ps1 b/coin/provisioning/common/windows/update-msvc2019.ps1 index b7db04d1..733b5ed7 100644 --- a/coin/provisioning/common/windows/update-msvc2019.ps1 +++ b/coin/provisioning/common/windows/update-msvc2019.ps1 @@ -70,3 +70,6 @@ $msvc2019Version = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Insta Write-Output "Visual Studio 2019 = $msvc2019Version" >> ~\versions.txt Write-Output "Visual Studio 2019 Build Tools = $version" >> ~\versions.txt + +# Add Windows SDK Version and VCTools Version to versions.txt +cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat" amd64 & set' |Select-String -Pattern '(WindowsSDKVersion)|(VCToolsVersion)' >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-msvc2015.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-msvc2015.ps1 deleted file mode 100644 index ae66d464..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/05-msvc2015.ps1 +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################# -## -## Copyright (C) 2020 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$ -## -############################################################################# - -# Visual Studios are pre-provisioned to tier1 images - -# MSVC 2015 Update 3 -Write-Output "Visual Studio 2015 = Version 14.0.25420.1 Update 3" >> ~\versions.txt - -# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" - diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-msvc2019.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-msvc2019.ps1 deleted file mode 100644 index c65290df..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/05-msvc2019.ps1 +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################# -## -## Copyright (C) 2020 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$ -## -############################################################################# - -# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with: -. "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" - diff --git a/coin/provisioning/qtci-windows-10-x86_64/99-msvc2015.ps1 b/coin/provisioning/qtci-windows-10-x86_64/99-msvc2015.ps1 new file mode 100644 index 00000000..ae66d464 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/99-msvc2015.ps1 @@ -0,0 +1,40 @@ +############################################################################# +## +## Copyright (C) 2020 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$ +## +############################################################################# + +# Visual Studios are pre-provisioned to tier1 images + +# MSVC 2015 Update 3 +Write-Output "Visual Studio 2015 = Version 14.0.25420.1 Update 3" >> ~\versions.txt + +# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" + diff --git a/coin/provisioning/qtci-windows-10-x86_64/99-msvc2019.ps1 b/coin/provisioning/qtci-windows-10-x86_64/99-msvc2019.ps1 new file mode 100644 index 00000000..c65290df --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/99-msvc2019.ps1 @@ -0,0 +1,36 @@ +############################################################################# +## +## Copyright (C) 2020 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$ +## +############################################################################# + +# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with: +. "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" + diff --git a/coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2015.ps1 b/coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2015.ps1 deleted file mode 100644 index 1a52d747..00000000 --- a/coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2015.ps1 +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################# -## -## Copyright (C) 2021 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$ -## -############################################################################# - -# Visual Studios are pre-provisioned to tier1 images - -# MSVC 2015 Update 3 -Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt - -# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" - diff --git a/coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2019.ps1 b/coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2019.ps1 deleted file mode 100644 index c65290df..00000000 --- a/coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2019.ps1 +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################# -## -## Copyright (C) 2020 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$ -## -############################################################################# - -# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with: -. "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" - diff --git a/coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2015.ps1 b/coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2015.ps1 new file mode 100644 index 00000000..1a52d747 --- /dev/null +++ b/coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2015.ps1 @@ -0,0 +1,40 @@ +############################################################################# +## +## Copyright (C) 2021 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$ +## +############################################################################# + +# Visual Studios are pre-provisioned to tier1 images + +# MSVC 2015 Update 3 +Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt + +# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" + diff --git a/coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2019.ps1 b/coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2019.ps1 new file mode 100644 index 00000000..c65290df --- /dev/null +++ b/coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2019.ps1 @@ -0,0 +1,36 @@ +############################################################################# +## +## Copyright (C) 2020 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$ +## +############################################################################# + +# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with: +. "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" + -- cgit v1.2.3