From 1dee4e9fcaba0cce26a1054530b3ab5958cf2434 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Thu, 7 Dec 2017 12:52:19 +0200 Subject: Fix broken and duplicate Ruby provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ruby is being installed twice on certain Windows platforms and the 32 bit versions of these don't have a working PATH addition. Task-number: QTQAINFRA-1632 Change-Id: Id7fd269854d17c32df7d0b82ac9e750e645af564 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/ruby.ps1 | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/ruby.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86') diff --git a/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 new file mode 100644 index 00000000..0d28ea1e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/ruby.ps1 deleted file mode 100644 index 587a4c10..00000000 --- a/coin/provisioning/qtci-windows-10-x86/ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\ruby.ps1" -- cgit v1.2.3 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 --- .../004-disable-windefender.ps1 | 1 - .../qtci-windows-10-x86/005-wsearch-off.ps1 | 1 - .../qtci-windows-10-x86/04-disable-windefender.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 | 43 ++++++++++++++++++++++ .../qtci-windows-10-x86/05-wsearch-off.ps1 | 1 + .../qtci-windows-10-x86/08-python3.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/10-icu.ps1 | 1 + .../10-msvc_2015_update3_patch.ps1 | 34 +++++++++++++++++ coin/provisioning/qtci-windows-10-x86/60-jom.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 | 1 + .../provisioning/qtci-windows-10-x86/90-libusb.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/cmake.ps1 | 1 - coin/provisioning/qtci-windows-10-x86/icu.ps1 | 1 - coin/provisioning/qtci-windows-10-x86/jom.ps1 | 1 - coin/provisioning/qtci-windows-10-x86/libusb.ps1 | 1 - coin/provisioning/qtci-windows-10-x86/msvc.ps1 | 43 ---------------------- .../msvc_2015_update3_patch.ps1 | 34 ----------------- coin/provisioning/qtci-windows-10-x86/python3.ps1 | 1 - 18 files changed, 84 insertions(+), 84 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/08-python3.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/10-icu.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/60-jom.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/cmake.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/icu.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/jom.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/libusb.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/msvc.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/python3.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86') diff --git a/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 deleted file mode 100644 index f92acd91..00000000 --- a/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 deleted file mode 100644 index 167cfd35..00000000 --- a/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 new file mode 100644 index 00000000..f92acd91 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 b/coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 new file mode 100644 index 00000000..1de57a66 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 @@ -0,0 +1,43 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +# Visual Studios are pre-provisioned to tier1 images + +# MSVC 2015 Update 3 +echo "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt + +# MSVC 2017 +echo "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt + +# MSVC 2017 Build Tools +echo "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 new file mode 100644 index 00000000..167cfd35 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 new file mode 100644 index 00000000..164fbe43 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 new file mode 100644 index 00000000..325be36a --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\icu.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 new file mode 100644 index 00000000..37af7119 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 @@ -0,0 +1,34 @@ +############################################################################# +## +## 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\msvc_2015_update3_patch.ps1" + diff --git a/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 new file mode 100644 index 00000000..842c65dd --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\jom.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 new file mode 100644 index 00000000..a853ffef --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\libusb.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/cmake.ps1 deleted file mode 100644 index 8dbe0372..00000000 --- a/coin/provisioning/qtci-windows-10-x86/cmake.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/icu.ps1 b/coin/provisioning/qtci-windows-10-x86/icu.ps1 deleted file mode 100644 index 325be36a..00000000 --- a/coin/provisioning/qtci-windows-10-x86/icu.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\icu.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/jom.ps1 b/coin/provisioning/qtci-windows-10-x86/jom.ps1 deleted file mode 100644 index 842c65dd..00000000 --- a/coin/provisioning/qtci-windows-10-x86/jom.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\jom.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/libusb.ps1 b/coin/provisioning/qtci-windows-10-x86/libusb.ps1 deleted file mode 100644 index a853ffef..00000000 --- a/coin/provisioning/qtci-windows-10-x86/libusb.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\libusb.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86/msvc.ps1 deleted file mode 100644 index 1de57a66..00000000 --- a/coin/provisioning/qtci-windows-10-x86/msvc.ps1 +++ /dev/null @@ -1,43 +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$ -## -############################################################################# - -# Visual Studios are pre-provisioned to tier1 images - -# MSVC 2015 Update 3 -echo "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt - -# MSVC 2017 -echo "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt - -# MSVC 2017 Build Tools -echo "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt 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 deleted file mode 100644 index 37af7119..00000000 --- a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 +++ /dev/null @@ -1,34 +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\msvc_2015_update3_patch.ps1" - diff --git a/coin/provisioning/qtci-windows-10-x86/python3.ps1 b/coin/provisioning/qtci-windows-10-x86/python3.ps1 deleted file mode 100644 index 164fbe43..00000000 --- a/coin/provisioning/qtci-windows-10-x86/python3.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python3.ps1" 32 -- cgit v1.2.3 From 84899eca4c6dcc6def56abae781e5489c4f950a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 3 Jan 2018 08:13:36 +0200 Subject: Consolidate prefixes of provisioning scripts Change-Id: I75a4bcb049a2c4d034a74b6838ffe7ddf2c3015e Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 | 1 - coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1 | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86') diff --git a/coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1 new file mode 100644 index 00000000..4de520b2 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\winrtrunner.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 deleted file mode 100644 index df466d52..00000000 --- a/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1 deleted file mode 100644 index 4de520b2..00000000 --- a/coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\winrtrunner.ps1" -- cgit v1.2.3 From 2a28ce864bed677e4ac2477eedf6bee498075d94 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 2 Nov 2017 16:09:11 +0200 Subject: Split Common folder based on operating system families MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change will split common folder to four different folders: Linux, Unix, Windows and MacOS. Each of these folders includes scripts which are common for their operating system familes Task-number: QTQAINFRA-1451 Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474 Reviewed-by: Jędrzej Nowacki --- coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/02-python.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/03-conan.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/06-ninja.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/08-python3.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/10-icu.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/60-jom.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) (limited to 'coin/provisioning/qtci-windows-10-x86') diff --git a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 index 1042c846..ee3b3b7d 100644 --- a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-ntp.ps1" +. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/02-python.ps1 b/coin/provisioning/qtci-windows-10-x86/02-python.ps1 index 27c618e1..19e64a94 100644 --- a/coin/provisioning/qtci-windows-10-x86/02-python.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/02-python.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python.ps1" 32 +. "$PSScriptRoot\..\common\windows\python.ps1" 32 diff --git a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 index 2fc36311..75c6a232 100644 --- a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\03-conan.ps1" +. "$PSScriptRoot\..\common\windows\03-conan.ps1" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 index f92acd91..8f94b3d5 100644 --- a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-windefender.ps1" +. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 index 167cfd35..eed6b734 100644 --- a/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\wsearch-off.ps1" +. "$PSScriptRoot\..\common\windows\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 index b405191e..1b1a07e9 100644 --- a/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" +. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1 b/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1 index e46361a0..ba571a1e 100644 --- a/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\ninja.ps1" +. "$PSScriptRoot\..\common\windows\ninja.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 index cc8be923..3ad5b9fd 100644 --- a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\libclang.ps1" 32 +. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 diff --git a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 index 164fbe43..28299307 100644 --- a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python3.ps1" 32 +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 index 0d28ea1e..875b426f 100644 --- a/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-ruby.ps1" +. "$PSScriptRoot\..\common\windows\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 index 325be36a..074a7a6d 100644 --- a/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\icu.ps1" +. "$PSScriptRoot\..\common\windows\icu.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 index 37af7119..fe1aec7d 100644 --- a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 @@ -30,5 +30,5 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1" +. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 index 842c65dd..b246ce25 100644 --- a/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\jom.ps1" +. "$PSScriptRoot\..\common\windows\jom.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 index 8dbe0372..73dc7bc2 100644 --- a/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\cmake.ps1" +. "$PSScriptRoot\..\common\windows\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 index a853ffef..29a1cfa4 100644 --- a/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\libusb.ps1" +. "$PSScriptRoot\..\common\windows\libusb.ps1" -- cgit v1.2.3