aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common/mysql.ps1
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-09-22 21:15:52 +0200
committerLiang Qi <liang.qi@qt.io>2017-09-22 21:15:52 +0200
commit04ccf0e8dbdb9620ea2e850e5f1cc35a96cf95b6 (patch)
treead43c2b5c1f89c763854f72dc14e72d18b97faac /coin/provisioning/common/mysql.ps1
parent6c4eb77aa0f8b07bb48d74ede633c6bc56d1a75c (diff)
parente7472f43087921c3d83ff4452bbdb67ed27ed604 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.9
42b502f is not needed for branches >= 5.8, configure.exe does not exist anymore. 30660bf was not applied to 5.9 branch, the scripts were not adapted to new template. Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Change-Id: Ie3681d5f641e99a074368f21b7f85fe31beacc17
Diffstat (limited to 'coin/provisioning/common/mysql.ps1')
-rw-r--r--coin/provisioning/common/mysql.ps125
1 files changed, 16 insertions, 9 deletions
diff --git a/coin/provisioning/common/mysql.ps1 b/coin/provisioning/common/mysql.ps1
index 9bd9929b..e300566e 100644
--- a/coin/provisioning/common/mysql.ps1
+++ b/coin/provisioning/common/mysql.ps1
@@ -62,21 +62,28 @@ try {
Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted
} catch {}
-# Install x64 bit version
-$architecture = "x64"
-$installFolder = "C:\Utils\my_sql\my_sql"
-$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-winx64.zip"
+if( (is64bitWinHost) -eq 1 ) {
+ # Install x64 bit version
+ $architecture = "x64"
+ $installFolder = "C:\Utils\my_sql\my_sql"
+ $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-winx64.zip"
-DownloadAndInstall $internalUrl $packagex64 $installFolder
+ DownloadAndInstall $internalUrl $packagex64 $installFolder
-echo "Set environment variables ..."
-[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine")
-[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine")
+ echo "Set environment variables ..."
+ [Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine")
+ [Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine")
+}
# Install x86 bit version
$architecture = "x86"
-$installFolder = "C:\Utils\my_sql\my_sql$architecture"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-win32.zip"
+if( (is64bitWinHost) -eq 1 ) {
+ $installFolder = "C:\Utils\my_sql\my_sql$architecture"
+}
+else {
+ $installFolder = "C:\Utils\my_sql\my_sql"
+}
DownloadAndInstall $internalUrl $packagex86 $installFolder