From 6e4f2f84330dfaf272449a3e58810216385bd32a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 12 Jan 2018 14:06:32 +0200 Subject: Fix common folder paths for common split change Change-Id: I9d3f1ce71d7995c88005b81f7f9dc9db892e9de7 Reviewed-by: Oliver Wolff Reviewed-by: Liang Qi --- coin/provisioning/common/linux/open62541.sh | 51 ++++++++++++++++++++++ coin/provisioning/common/open62541.sh | 51 ---------------------- coin/provisioning/common/win10-enable-devmode.ps1 | 5 --- .../common/windows/win10-enable-devmode.ps1 | 5 +++ .../qtci-linux-RHEL-7.4-x86_64/50-open62541.sh | 2 +- .../qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh | 2 +- .../50-open62541.sh | 2 +- .../qtci-windows-10-x86/05-enable-devmode.ps1 | 1 + .../qtci-windows-10-x86/enable-devmode.ps1 | 1 - .../qtci-windows-10-x86_64/05-enable-devmode.ps1 | 1 + .../qtci-windows-10-x86_64/enable-devmode.ps1 | 1 - 11 files changed, 61 insertions(+), 61 deletions(-) create mode 100755 coin/provisioning/common/linux/open62541.sh delete mode 100644 coin/provisioning/common/open62541.sh delete mode 100644 coin/provisioning/common/win10-enable-devmode.ps1 create mode 100644 coin/provisioning/common/windows/win10-enable-devmode.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/05-enable-devmode.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/enable-devmode.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/05-enable-devmode.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/enable-devmode.ps1 diff --git a/coin/provisioning/common/linux/open62541.sh b/coin/provisioning/common/linux/open62541.sh new file mode 100755 index 00000000..bde5b0de --- /dev/null +++ b/coin/provisioning/common/linux/open62541.sh @@ -0,0 +1,51 @@ +#!/bin/env 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$ +## +############################################################################# + +TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory" +trap "sudo rm -fr $TEMPDIR" EXIT +cd $TEMPDIR + +pip install six + +git clone https://github.com/open62541/open62541.git open62541 +cd open62541 +git checkout 302003d2448946fa4d8a02cc209b8931d31e975b +mkdir build +cd build +cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib .. +make + +sudo make install +sudo /sbin/ldconfig diff --git a/coin/provisioning/common/open62541.sh b/coin/provisioning/common/open62541.sh deleted file mode 100644 index bde5b0de..00000000 --- a/coin/provisioning/common/open62541.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/env 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$ -## -############################################################################# - -TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory" -trap "sudo rm -fr $TEMPDIR" EXIT -cd $TEMPDIR - -pip install six - -git clone https://github.com/open62541/open62541.git open62541 -cd open62541 -git checkout 302003d2448946fa4d8a02cc209b8931d31e975b -mkdir build -cd build -cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib .. -make - -sudo make install -sudo /sbin/ldconfig diff --git a/coin/provisioning/common/win10-enable-devmode.ps1 b/coin/provisioning/common/win10-enable-devmode.ps1 deleted file mode 100644 index 022adc52..00000000 --- a/coin/provisioning/common/win10-enable-devmode.ps1 +++ /dev/null @@ -1,5 +0,0 @@ -# Turning on developer mode. -# -# In order to run auto tests for UWP, we have to enable developer mode on Windows 10 machines. -# https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development -REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" /V AllowDevelopmentWithoutDevLicense /T REG_DWORD /D 1 /F diff --git a/coin/provisioning/common/windows/win10-enable-devmode.ps1 b/coin/provisioning/common/windows/win10-enable-devmode.ps1 new file mode 100644 index 00000000..022adc52 --- /dev/null +++ b/coin/provisioning/common/windows/win10-enable-devmode.ps1 @@ -0,0 +1,5 @@ +# Turning on developer mode. +# +# In order to run auto tests for UWP, we have to enable developer mode on Windows 10 machines. +# https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development +REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" /V AllowDevelopmentWithoutDevLicense /T REG_DWORD /D 1 /F diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh index 2871ba93..6cc2b44f 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh @@ -33,4 +33,4 @@ ## ############################################################################# -source "${BASH_SOURCE%/*}/../common/open62541.sh" +source "${BASH_SOURCE%/*}/../common/linux/open62541.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh index 2871ba93..6cc2b44f 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh @@ -33,4 +33,4 @@ ## ############################################################################# -source "${BASH_SOURCE%/*}/../common/open62541.sh" +source "${BASH_SOURCE%/*}/../common/linux/open62541.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh index 2871ba93..6cc2b44f 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh @@ -33,4 +33,4 @@ ## ############################################################################# -source "${BASH_SOURCE%/*}/../common/open62541.sh" +source "${BASH_SOURCE%/*}/../common/linux/open62541.sh" diff --git a/coin/provisioning/qtci-windows-10-x86/05-enable-devmode.ps1 b/coin/provisioning/qtci-windows-10-x86/05-enable-devmode.ps1 new file mode 100644 index 00000000..01e6f8b0 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/05-enable-devmode.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\win10-enable-devmode.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/enable-devmode.ps1 b/coin/provisioning/qtci-windows-10-x86/enable-devmode.ps1 deleted file mode 100644 index 88f6047b..00000000 --- a/coin/provisioning/qtci-windows-10-x86/enable-devmode.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\win10-enable-devmode.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-enable-devmode.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-enable-devmode.ps1 new file mode 100644 index 00000000..01e6f8b0 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/05-enable-devmode.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\win10-enable-devmode.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/enable-devmode.ps1 b/coin/provisioning/qtci-windows-10-x86_64/enable-devmode.ps1 deleted file mode 100644 index 88f6047b..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/enable-devmode.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\win10-enable-devmode.ps1" -- cgit v1.2.3