diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2018-01-19 10:20:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-26 13:12:47 +0000 |
| commit | dc5f851e787821733bc67c4a0328bc3db17be775 (patch) | |
| tree | 5bc2759d7497c32ed0e79ddb1f774022295326c2 /coin/provisioning/common | |
| parent | c4cf4fa07fc435595bfeb5004568d0709cf43bac (diff) | |
Provisioning: Add common shared folder
Common shared folder includes scripts of files which are common for all
operating system families. Changes under shared folder will trigger
provisioning for all platforms
Change-Id: I0789f87b76876d5f92673fe2f0e72d770e5f5ea4
Task-number: QTQAINFRA-1451
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin/provisioning/common')
| -rw-r--r-- | coin/provisioning/common/shared/network_test_server_ip.txt (renamed from coin/provisioning/common/network_test_server_ip.txt) | 0 | ||||
| -rw-r--r-- | coin/provisioning/common/shared/sw_versions.txt (renamed from coin/provisioning/common/sw_versions.txt) | 0 | ||||
| -rwxr-xr-x | coin/provisioning/common/unix/libclang.sh | 2 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/libclang.ps1 | 2 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/set-network-test-server.ps1 | 2 |
5 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/common/network_test_server_ip.txt b/coin/provisioning/common/shared/network_test_server_ip.txt index ec3d058a..ec3d058a 100644 --- a/coin/provisioning/common/network_test_server_ip.txt +++ b/coin/provisioning/common/shared/network_test_server_ip.txt diff --git a/coin/provisioning/common/sw_versions.txt b/coin/provisioning/common/shared/sw_versions.txt index cc165dd5..cc165dd5 100644 --- a/coin/provisioning/common/sw_versions.txt +++ b/coin/provisioning/common/shared/sw_versions.txt diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 69d9ff96..d59c9fa2 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -43,7 +43,7 @@ set -e source "${BASH_SOURCE%/*}/check_and_set_proxy.sh" BASEDIR=$(dirname "$0") -. $BASEDIR/../sw_versions.txt +. $BASEDIR/../shared/sw_versions.txt url=$1 sha1=$2 version=$3 diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 9d857051..208d1ed4 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -4,7 +4,7 @@ param([Int32]$archVer=32) # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). # The Clang library (C-bindings), version 3.9 or higher is required for building. -Get-Content "$PSScriptRoot\..\sw_versions.txt" | Foreach-Object { +Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object { $var = $_.Split('=') New-Variable -Name $var[0] -Value $var[1] $libclang_version = $libclang_version -replace '["."]' diff --git a/coin/provisioning/common/windows/set-network-test-server.ps1 b/coin/provisioning/common/windows/set-network-test-server.ps1 index 69059a2a..e6e92d48 100644 --- a/coin/provisioning/common/windows/set-network-test-server.ps1 +++ b/coin/provisioning/common/windows/set-network-test-server.ps1 @@ -35,7 +35,7 @@ # This script will set the network test server IP in to hosts file -$n = Get-Content "$PSScriptRoot\..\network_test_server_ip.txt" +$n = Get-Content "$PSScriptRoot\..\shared\network_test_server_ip.txt" $n = $n.Split('=') New-Variable -Name $n[0] -Value $n[1] |