diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-25 08:57:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-25 08:57:06 +0200 |
| commit | 892b1977c586c2364f54866115a665df2193d6e8 (patch) | |
| tree | 931adafe9b4117463b2b0c52feaa25e4c18a2a40 /coin/provisioning/common/mysql.ps1 | |
| parent | 90ddfaf35f293e0ec6f27f78b9a50509b24066f8 (diff) | |
| parent | 51c26733040d94cb62b6f1d2df32da7ebe80d842 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I623539ff0e95642bdd58fa3bbac4d1c88afbe519
Diffstat (limited to 'coin/provisioning/common/mysql.ps1')
| -rw-r--r-- | coin/provisioning/common/mysql.ps1 | 25 |
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 |