From 6e4f2f84330dfaf272449a3e58810216385bd32a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 12 Jan 2018 14:06:32 +0200 Subject: [PATCH] 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 | 0 coin/provisioning/common/{ => windows}/win10-enable-devmode.ps1 | 0 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh | 2 +- .../provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh | 2 +- coin/provisioning/qtci-windows-10-x86/05-enable-devmode.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/enable-devmode.ps1 | 1 - coin/provisioning/qtci-windows-10-x86_64/05-enable-devmode.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/enable-devmode.ps1 | 1 - 9 files changed, 5 insertions(+), 5 deletions(-) rename coin/provisioning/common/{ => linux}/open62541.sh (100%) mode change 100644 => 100755 rename coin/provisioning/common/{ => windows}/win10-enable-devmode.ps1 (100%) 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/open62541.sh b/coin/provisioning/common/linux/open62541.sh old mode 100644 new mode 100755 similarity index 100% rename from coin/provisioning/common/open62541.sh rename to coin/provisioning/common/linux/open62541.sh diff --git a/coin/provisioning/common/win10-enable-devmode.ps1 b/coin/provisioning/common/windows/win10-enable-devmode.ps1 similarity index 100% rename from coin/provisioning/common/win10-enable-devmode.ps1 rename to coin/provisioning/common/windows/win10-enable-devmode.ps1 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"