From 6675a8f416a2745b7934740be1610210796c4297 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 24 Nov 2017 18:17:41 +0100 Subject: Add missing shbang to cmake provisioning script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was given execute permissions when renamed recently; but the bash-isms in it will only work with that if it uses bash. Change-Id: I61468257210ba586fdaf1e79531bae0492f9e8ae Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh index d7abd285..d10bc06d 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh @@ -1 +1,2 @@ +#!/usr/bin/env bash $(dirname $0)/../common/cmake_linux.sh -- cgit v1.2.3 From cdbd177b415a3826f8e85feec69757bf27f33ffa Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 27 Nov 2017 15:12:34 +0200 Subject: Provisioning: Install bluez-libs-devel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bluez-libs-devel is needed to enable Qt Bluetooth Task-number: QTBUG-64782 Change-Id: Ie668a44463307c7089bb96a087acab04c27dd3a0 Reviewed-by: Alex Blasche Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh index f7c6b694..8cdeee90 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh @@ -96,3 +96,6 @@ sudo yum -y install perl-Digest-SHA # INTEGRITY requirements sudo yum -y install glibc.i686 + +# Enable Qt Bluetooth +sudo yum -y install bluez-libs-devel -- cgit v1.2.3 From b6a1fc6aaec15310f702b3873798363f5a89bb21 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 24 Nov 2017 16:35:48 +0200 Subject: Install command line tools for osx 10.11 and macOS 10.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Command line tools is needed by homebrew when installing p7zip Task-number: QTBUG-64729 Change-Id: Ia13838e3f5845351cb682c7d25127c8f36172d3b Reviewed-by: Liang Qi Reviewed-by: Jani Heikkinen (cherry picked from commit beb73056c30445c5236c7bbb12248bfa0939cb4a) Reviewed-by: Tony Sarajärvi --- .../common/install-commandlinetools.sh | 88 ++++++++++++++++++++++ .../021-install-commandlinetools.sh | 43 +++++++++++ .../021-install-commandlinetools.sh | 43 +++++++++++ 3 files changed, 174 insertions(+) create mode 100644 coin/provisioning/common/install-commandlinetools.sh create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/install-commandlinetools.sh b/coin/provisioning/common/install-commandlinetools.sh new file mode 100644 index 00000000..f224d31d --- /dev/null +++ b/coin/provisioning/common/install-commandlinetools.sh @@ -0,0 +1,88 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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$ +## +############################################################################# +source "${BASH_SOURCE%/*}/DownloadURL.sh" +source "${BASH_SOURCE%/*}/try_catch.sh" +set -ex + +# Command line tools is need by homebrew + +function InstallCommandLineTools { + + ExceptionMount=101 + ExceptionInstall=102 + ExceptionUnmount=103 + + url=$1 + url_alt=$2 + expectedSha1=$3 + packageName=$4 + version=$5 + + try + ( + DownloadURL $url $url_alt $expectedSha1 /tmp/$packageName + echo "Mounting $packageName" + hdiutil attach /tmp/$packageName || throw $ExceptionMount + cd "/Volumes/Command Line Developer Tools" + echo "Installing" + sudo installer -verbose -pkg *.pkg -target / || throw $ExceptionInstall + cd / + # Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted + sleep 3 + echo "Unmounting" + umount /Volumes/Command\ Line\ Developer\ Tools/ || throw $ExceptionUnmount + echo "Removing $packageName" + rm /tmp/$packageName + + echo "Command Line Tools = $version" >> ~/versions.txt + ) + catch || { + case $ex_code in + $ExceptionMount) + echo "Failed to mount" + exit 1; + ;; + $ExceptionInstall) + echo "Failed to install" + exit 1; + ;; + $ExceptionUnmount) + echo "Failed to unmount" + exit 1; + + esac + } + +} diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh new file mode 100755 index 00000000..b460cc02 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh @@ -0,0 +1,43 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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$ +## +############################################################################# +source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh" + +version="8.3.2" +packageName="CommandLineToolsforXcode$version.dmg" +url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" +sha1="da74b2bbf3058a0805c2d9f41ee5cf381d0e0ebe" + +InstallCommandLineTools $url $url $sha1 $packageName $version + diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh new file mode 100755 index 00000000..9145c12a --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh @@ -0,0 +1,43 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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$ +## +############################################################################# +source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh" + +version="8.2" +packageName="Command_Line_Tools_macOS_10.11_for_Xcode_$version.dmg" +url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" +sha1="4df615ca765ac1a1e681ddcbca79fc15990e3b25" + +InstallCommandLineTools $url $url $sha1 $packageName $version + -- cgit v1.2.3 From 5d9e2c49d116f62f263adf3e9502e06c33f59152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 8 Dec 2017 14:51:01 +0200 Subject: Update ICC compiler from 2018 to 2018 update 1 Change-Id: I2e44c98114afe559e4490d9b9ec3e1d19d7f4696 Reviewed-by: Thiago Macieira Reviewed-by: Liang Qi --- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh index 4933269a..15b46aef 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh @@ -42,12 +42,12 @@ set -e mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" localMount="/mnt/storage/" -iccPackage="parallel_studio_xe_2018_composer_edition_for_cpp.tgz" +iccPackage="parallel_studio_xe_2018_update1_composer_edition_for_cpp.tgz" iccPackageSource="$localMount/intel/$iccPackage" iccInstallPath="/opt/intel" iccTmpPath="/tmp/icc" -iccLicense="l_icc.lic" +iccLicense="l_icc_2018.lic" iccLicenseSource="$localMount/semisecure/$iccLicense" iccLicenseTarget="/home/qt/$iccLicense" @@ -79,7 +79,7 @@ EOT # Export LD_LIBRARY_PATH to Coin echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc -echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.0.128/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc -echo "ICC = 18.0.0 20170811" >> ~/versions.txt +echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.1.163/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc +echo "ICC = 18.0.1 20171018" >> ~/versions.txt rm -rf "$iccTmpPath" -- cgit v1.2.3 From b12a1591c404f2f0a4b0d00c7dc11650b811ee4e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 8 Nov 2017 16:21:17 +0200 Subject: Provisioning: Install signing tools to Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signing tools are needed when signing offline installers Change-Id: I98f12e3fdf01d273dff5fda0c2e34707174c6eae Reviewed-by: Tony Sarajärvi --- .../qtci-windows-10-x86_64/signing-tools.ps1 | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 b/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 new file mode 100644 index 00000000..882bd1de --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 @@ -0,0 +1,44 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2017 Pelagicore AG +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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" + +# Signing tools are needed to sign offline installers when releasing + +$url = "http://ci-files01-hki.intra.qt.io/input/semisecure/sign/sign.zip" +$destination = "C:\Windows\temp\sign.zip" + +Download $url $url $destination +Extract-Zip "$destination" "C:\Utils" +Remove-Item "$destination" -- cgit v1.2.3 From 5089c4468f67daa2b28c710923ecfdd921f295e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Fri, 24 Nov 2017 12:36:57 +0200 Subject: Fix mesa_llvmpipe provisioning script for x64 Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This script doesn't extract the dll to System32 on a x64 system. Calling "sysnative" doesn't seem to work with the custom function being used. Change-Id: Iea734a400d8c095ea2e3fe54f38e4756fba406f9 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/mesa_llvmpipe.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/mesa_llvmpipe.ps1 b/coin/provisioning/common/mesa_llvmpipe.ps1 index 7ea0629d..82333034 100644 --- a/coin/provisioning/common/mesa_llvmpipe.ps1 +++ b/coin/provisioning/common/mesa_llvmpipe.ps1 @@ -55,7 +55,7 @@ function Extract-Mesa } if ( Test-Path C:\Windows\SysWOW64 ) { - Extract-Mesa $mesaOpenglUrl_64 $mesaOpenglSha1_64 "C:\Windows\sysnative" + Extract-Mesa $mesaOpenglUrl_64 $mesaOpenglSha1_64 "C:\Windows\System32" Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\SysWOW64" } else { Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\system32" -- cgit v1.2.3 From 77fdde0de933ef15aadad1a9e1baa50578ba6c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Wed, 29 Nov 2017 14:36:04 +0200 Subject: RHEL7.4: install packages in one yum instance MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently we are opening and closing a yum instance for every package we install during provisioning. This is a bit inefficient so it's better to install them in one go. Task-number: QTQAINFRA-1586 Change-Id: Idbf814f9023da0fe8213b2ed84cd1a27a149fc27 Reviewed-by: Tony Sarajärvi --- .../004-install-packages.sh | 89 +++++++++------------- 1 file changed, 37 insertions(+), 52 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh index 8cdeee90..7bda43e2 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh @@ -35,67 +35,52 @@ set -e -sudo yum -y update - -sudo yum -y install git -sudo yum -y install zlib-devel -sudo yum -y install glib2-devel -sudo yum -y install openssl-devel -sudo yum -y install freetype-devel -sudo yum -y install fontconfig-devel - +installPackages=() +installPackages+=(git) +installPackages+=(zlib-devel) +installPackages+=(glib2-devel) +installPackages+=(openssl-devel) +installPackages+=(freetype-devel) +installPackages+=(fontconfig-devel) # EGL support -sudo yum -y install mesa-libEGL-devel -sudo yum -y install mesa-libGL-devel - -sudo yum -y install libxkbfile-devel - +installPackages+=(mesa-libEGL-devel) +installPackages+=(mesa-libGL-devel) +installPackages+=(libxkbfile-devel) # Xinput2 -sudo yum -y install libXi-devel - -sudo yum -y install python-devel -sudo yum -y install mysql-server mysql -sudo yum -y install mysql-devel -sudo yum -y install postgresql-devel -sudo yum -y install cups-devel -sudo yum -y install dbus-devel - -# We have to downgrade to an older version of graphite2 -# to avoid a dependency version mismatch with gtk3-devel package. - -sudo yum -y downgrade graphite2-1.3.6-1.el7_2 - +installPackages+=(libXi-devel) +installPackages+=(python-devel) +installPackages+=(mysql-server) +installPackages+=(mysql) +installPackages+=(mysql-devel) +installPackages+=(postgresql-devel) +installPackages+=(cups-devel) +installPackages+=(dbus-devel) # gstreamer 1 for QtMultimedia -sudo yum -y install gstreamer1-devel gstreamer1-plugins-base-devel - +installPackages+=(gstreamer1-devel) +installPackages+=(gstreamer1-plugins-base-devel) # gtk3 style for QtGui/QStyle -sudo yum -y install gtk3-devel - +installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb -sudo yum -y install libusb-devel - +installPackages+=(libusb-devel) # speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux -sudo yum -y install speech-dispatcher-devel - +installPackages+=(speech-dispatcher-devel) # Python -sudo yum -y install python-devel python-virtualenv - +installPackages+=(python-devel python-virtualenv) # WebEngine -sudo yum -y install bison -sudo yum -y install flex -sudo yum -y install gperf -sudo yum -y install alsa-lib-devel -sudo yum -y install pulseaudio-libs-devel -sudo yum -y install libXtst-devel - +installPackages+=(bison) +installPackages+=(flex) +installPackages+=(gperf) +installPackages+=(alsa-lib-devel) +installPackages+=(pulseaudio-libs-devel) +installPackages+=(libXtst-devel) # For Android builds -sudo yum -y install java-1.8.0-openjdk-devel - +installPackages+=(java-1.8.0-openjdk-devel) # For receiving shasum -sudo yum -y install perl-Digest-SHA - +installPackages+=(perl-Digest-SHA) # INTEGRITY requirements -sudo yum -y install glibc.i686 - +installPackages+=(glibc.i686) # Enable Qt Bluetooth -sudo yum -y install bluez-libs-devel +installPackages+=(bluez-libs-devel) + +sudo yum -y update +sudo yum -y install "${installPackages[@]}" -- cgit v1.2.3 From 74dd14ae836e3432c990f6e8691d4c214bfa3f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 5 Dec 2017 09:24:50 +0200 Subject: Remove provisioning scripts from non existing platform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I01ecb0a9d4050b88fc5010f5a31baa6e776c1848 Reviewed-by: Joni Jäntti Reviewed-by: Simo Fält --- coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 | 1 - coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 | 1 - 2 files changed, 2 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 deleted file mode 100644 index 1042c846..00000000 --- a/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 deleted file mode 100644 index 1042c846..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\disable-ntp.ps1" -- cgit v1.2.3 From 828f82b6f00946c194b6909559bdce0b40d0f9a8 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 5 Dec 2017 11:14:15 +0200 Subject: Add missing name prefixes for Win7 provision scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The prefix numbers were missing for Ruby and QNX patch scripts. Change-Id: I687b244c4657e17c32f0cc8221d3fb0ad3c5578d Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 | 1 + coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 | 1 + coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 | 1 + 3 files changed, 3 insertions(+) create mode 100644 coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 new file mode 100644 index 00000000..41210dcb --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\patch_qnx.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 new file mode 100644 index 00000000..587a4c10 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 new file mode 100644 index 00000000..587a4c10 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\ruby.ps1" -- cgit v1.2.3