aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-7-x86
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-12 12:51:53 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-12 21:13:56 +0100
commitc2d188f225a96ccf409f4dbebd19f6e59caf7da6 (patch)
tree35d0320171ad60a4e25c41f0718d02016dfd4242 /coin/provisioning/qtci-windows-7-x86
parentab25cb7af6602a558c84e3d30e8ce1c6e7ca6e73 (diff)
parent19872ea84352182ee974ff84d2e3872a21427117 (diff)
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Task-number: QTBUG-65688 Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86')
-rw-r--r--coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/02-python.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/03-conan.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/04-msys.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/08-install-git.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/08-ninja.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/08-python3.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-cmake.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-jom.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-mysql.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-openssl.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-postgresql.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/10-icu.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/12-icu.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/25-python.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/25-python3.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/30-android.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/33-ruby.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/ruby.ps11
41 files changed, 34 insertions, 37 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1
index e8e24995..af05e838 100644
--- a/coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"
+. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1
index 2303699c..51eb0b2b 100644
--- a/coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-uac.ps1"
+. "$PSScriptRoot\..\common\windows\disable-uac.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1
index 1042c846..ee3b3b7d 100644
--- a/coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1
+++ b/coin/provisioning/qtci-windows-7-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-7-x86/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps1
index ae3f327d..5bf811ef 100644
--- a/coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-sleep.ps1"
+. "$PSScriptRoot\..\common\windows\disable-sleep.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1
deleted file mode 100644
index 1f26c731..00000000
--- a/coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\install-notepad++.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps1 b/coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps1
index ba24f9d7..e9a9c438 100644
--- a/coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\memorypershell.ps1"
+. "$PSScriptRoot\..\common\windows\memorypershell.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/02-python.ps1 b/coin/provisioning/qtci-windows-7-x86/02-python.ps1
index 27c618e1..19e64a94 100644
--- a/coin/provisioning/qtci-windows-7-x86/02-python.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/02-python.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python.ps1" 32
+. "$PSScriptRoot\..\common\windows\python.ps1" 32
diff --git a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1
index 163739fa..807e5480 100644
--- a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1
+++ b/coin/provisioning/qtci-windows-7-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-7-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1
index ee3f36a9..a9044256 100644
--- a/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-sevenzip.ps1"
+. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1
index f92acd91..8f94b3d5 100644
--- a/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1
+++ b/coin/provisioning/qtci-windows-7-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-7-x86/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps1
index c19bf6cd..57428310 100644
--- a/coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-windows-updates.ps1"
+. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
index 9c1d90d4..8bfcdbae 100644
--- a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
# This script will install msys which is needed for configuring openssl for Android
diff --git a/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1
index 167cfd35..eed6b734 100644
--- a/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1
+++ b/coin/provisioning/qtci-windows-7-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-7-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1
index ad3d5950..b9d8153e 100644
--- a/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\vc_redist.ps1" 32
+. "$PSScriptRoot\..\common\windows\vc_redist.ps1" 32
diff --git a/coin/provisioning/qtci-windows-7-x86/08-install-git.ps1 b/coin/provisioning/qtci-windows-7-x86/08-install-git.ps1
index f9129cff..38106de7 100644
--- a/coin/provisioning/qtci-windows-7-x86/08-install-git.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/08-install-git.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-git.ps1"
+. "$PSScriptRoot\..\common\windows\install-git.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1
index 3b64ffec..15065b55 100644
--- a/coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-jdk.ps1"
+. "$PSScriptRoot\..\common\windows\install-jdk.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1
index b405191e..1b1a07e9 100644
--- a/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"
+. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/08-ninja.ps1 b/coin/provisioning/qtci-windows-7-x86/08-ninja.ps1
index e46361a0..ba571a1e 100644
--- a/coin/provisioning/qtci-windows-7-x86/08-ninja.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/08-ninja.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\ninja.ps1"
+. "$PSScriptRoot\..\common\windows\ninja.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-7-x86/08-python3.ps1
new file mode 100644
index 00000000..28299307
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/08-python3.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\python3.ps1" 32
diff --git a/coin/provisioning/qtci-windows-7-x86/09-cmake.ps1 b/coin/provisioning/qtci-windows-7-x86/09-cmake.ps1
index 8dbe0372..73dc7bc2 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-cmake.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-cmake.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
+. "$PSScriptRoot\..\common\windows\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1
index 8d549455..331de489 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-dependencywalker.ps1"
+. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1
index 7c4cd8ac..684816f0 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\install-mingw.ps1"
+. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
# This script will install MinGW 5.3.0
diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps1
index 0d28ea1e..875b426f 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps1
+++ b/coin/provisioning/qtci-windows-7-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-7-x86/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps1
index 18109622..2b5756be 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-strawberry-perl.ps1"
+. "$PSScriptRoot\..\common\windows\install-strawberry-perl.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-jom.ps1 b/coin/provisioning/qtci-windows-7-x86/09-jom.ps1
index 842c65dd..b246ce25 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-jom.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-jom.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\jom.ps1"
+. "$PSScriptRoot\..\common\windows\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1 b/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1
index a41035da..eca19011 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\mysql.ps1"
+. "$PSScriptRoot\..\common\windows\mysql.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1
index f3906f78..d57ad1cd 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\openssl.ps1"
+. "$PSScriptRoot\..\common\windows\openssl.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1 b/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1
index 92339a45..451d2452 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\postgresql.ps1"
+. "$PSScriptRoot\..\common\windows\postgresql.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1
index 16d2e180..7918fabf 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\set-network-test-server.ps1"
+. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 b/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1
index ba194de6..6fea9693 100644
--- a/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
# This script installs DirectX SDK
diff --git a/coin/provisioning/qtci-windows-7-x86/10-icu.ps1 b/coin/provisioning/qtci-windows-7-x86/10-icu.ps1
new file mode 100644
index 00000000..074a7a6d
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/10-icu.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/12-icu.ps1 b/coin/provisioning/qtci-windows-7-x86/12-icu.ps1
deleted file mode 100644
index 325be36a..00000000
--- a/coin/provisioning/qtci-windows-7-x86/12-icu.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps1 b/coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps1
new file mode 100644
index 00000000..71deb0d4
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/25-python.ps1 b/coin/provisioning/qtci-windows-7-x86/25-python.ps1
deleted file mode 100644
index 5f8aa2f8..00000000
--- a/coin/provisioning/qtci-windows-7-x86/25-python.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\python.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/25-python3.ps1 b/coin/provisioning/qtci-windows-7-x86/25-python3.ps1
deleted file mode 100644
index 164fbe43..00000000
--- a/coin/provisioning/qtci-windows-7-x86/25-python3.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\python3.ps1" 32
diff --git a/coin/provisioning/qtci-windows-7-x86/30-android.ps1 b/coin/provisioning/qtci-windows-7-x86/30-android.ps1
index f355a5de..3568c681 100644
--- a/coin/provisioning/qtci-windows-7-x86/30-android.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/30-android.ps1
@@ -31,7 +31,7 @@
##
#############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
# This script installs Android sdk and ndk
# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version $sdkBuildToolsVersion
diff --git a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1
index 4f2b74eb..a38272a6 100644
--- a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1
@@ -33,7 +33,7 @@
# Requires: 7z, perl and msys
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
# OpenSSL need to be configured from sources for Android build in windows 7
# Msys need to be installed to target machine
diff --git a/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1
deleted file mode 100644
index 587a4c10..00000000
--- a/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1
new file mode 100644
index 00000000..455d92bf
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-notepad++.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1
deleted file mode 100644
index df466d52..00000000
--- a/coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\mqtt_broker.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/ruby.ps1
deleted file mode 100644
index 587a4c10..00000000
--- a/coin/provisioning/qtci-windows-7-x86/ruby.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\ruby.ps1"