diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-06-08 13:34:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-06-12 04:43:24 +0000 |
| commit | 5bc43f0cc3cfe047dcdbe2a293f4ed6885d8a637 (patch) | |
| tree | b627df0317136e4b622f6d57d4cf6873924620fc /coin | |
| parent | 0358b6d28c6a9a23d4faf7d59a7a1f0f1e2732e1 (diff) | |
Fix Postgresql and Mysql environment variables
The correct paths to the headers are
c:\utils\postgresql[x86]\pgsql\include
not
c:\utils\postgresql[x86]\pgsql\pgsql\include
Same for libs.
Regression introduced by commit ce47238ed94f3a989c13fef93b037904589910cf
but only noticed in the 5.9 branch.
Change-Id: Ib16072c0cc1c52f743f5500bc9732c8b04e962c7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 | 8 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 index ce1d2be0..56b78f47 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 @@ -70,8 +70,8 @@ $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-wi DownloadAndInstall $internalUrl $packagex64 $installFolder echo "Set environment variables ..." -[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\my_sql\include", "Machine") -[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\my_sql\lib", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine") # Install x86 bit version $architecture = "x86" @@ -81,8 +81,8 @@ $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-wi DownloadAndInstall $internalUrl $packagex86 $installFolder echo "Set environment variables ..." -[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\my_sql\include", "Machine") -[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\my_sql\lib", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\lib", "Machine") # Store version information to ~/versions.txt, which is used to print version information to provision log. echo "MySQL = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 index e2edadf0..b73c3778 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 @@ -62,8 +62,8 @@ echo "Remove downloaded $packagex64 ..." Remove-Item $packagex64 echo "Set $architecture environment variables ..." -[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\pgsql\include", "Machine") -[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\pgsql\lib", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\lib", "Machine") # Install x86 bit version $architecture = "x86" @@ -82,8 +82,8 @@ echo "Remove downloaded $packagex86 ..." Remove-Item $packagex86 echo "Set $architecture environment variables ..." -[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\pgsql\include", "Machine") -[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\pgsql\lib", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\lib", "Machine") # Store version information to ~/versions.txt, which is used to print version information to provision log. echo "PostgreSQL = $version" >> ~/versions.txt |