From 2a2e79b702b28149c8f9984d24367fe3ad7afa13 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Thu, 27 Oct 2016 13:03:49 +0000
Subject: MDEV-11157 Windows - Upgrade installer to use HeidiSQL 9.4

---
 win/packaging/heidisql.cmake  |  2 +-
 win/packaging/heidisql.wxi.in | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/win/packaging/heidisql.cmake b/win/packaging/heidisql.cmake
index e2636eb4af8..772834e7c7d 100644
--- a/win/packaging/heidisql.cmake
+++ b/win/packaging/heidisql.cmake
@@ -1,4 +1,4 @@
-SET(HEIDISQL_BASE_NAME "HeidiSQL_9.3_Portable")
+SET(HEIDISQL_BASE_NAME "HeidiSQL_9.4_Portable")
 SET(HEIDISQL_ZIP "${HEIDISQL_BASE_NAME}.zip")
 SET(HEIDISQL_URL "http://www.heidisql.com/downloads/releases/${HEIDISQL_ZIP}")
 SET(HEIDISQL_DOWNLOAD_DIR ${THIRD_PARTY_DOWNLOAD_LOCATION}/${HEIDISQL_BASE_NAME})
diff --git a/win/packaging/heidisql.wxi.in b/win/packaging/heidisql.wxi.in
index 4f07a07627c..1d5c4430cd2 100644
--- a/win/packaging/heidisql.wxi.in
+++ b/win/packaging/heidisql.wxi.in
@@ -45,14 +45,20 @@
     <Component Id="component.HeidiSQL_ssleay32.dll" Guid="*" Win64="no">
       <File Id="heidisql.ssleay32.dll" Name="ssleay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\ssleay32.dll" />
     </Component>
-    <Component Id="component.HeidiSQL_libintl.dll" Guid="*" Win64="no">
-      <File Id="heidisql.libintl.dll" Name="libintl.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libintl.dll" />
+    <Component Id="component.HeidiSQL_libintl_8.dll" Guid="*" Win64="no">
+      <File Id="heidisql.libintl_8.dll" Name="libintl-8.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libintl-8.dll" />
+    </Component>
+    <Component Id="component.HeidiSQL_libiconv_2.dll" Guid="*" Win64="no">
+      <File Id="heidisql.libiconv_2.dll" Name="libiconv-2.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libiconv-2.dll" />
     </Component>
 
     <Directory Id="D.HeidiSQL.plugins" Name="plugins">
       <Component Id="component.HeidiSQL_dialog.dll" Guid="*" Win64="no">
         <File Id="heidisql.dialog.dll" Name="dialog.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\plugins\dialog.dll" />
       </Component>
+      <Component Id="component.HeidiSQL_auth_gssapi_client.dll" Guid="*" Win64="no">
+        <File Id="heidisql.auth_gssapi_client.dll" Name="auth_gssapi_client.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\plugins\auth_gssapi_client.dll" />
+      </Component>
     </Directory>
 
     <Component Id="component.HeidiSQL_CleanupSettings" Guid="*" Win64="no">
@@ -70,8 +76,10 @@
   <ComponentRef Id="component.HeidiSQL_libeay32.dll" />
   <ComponentRef Id="component.HeidiSQL_libpq.dll" />
   <ComponentRef Id="component.HeidiSQL_ssleay32.dll" />
-  <ComponentRef Id="component.HeidiSQL_libintl.dll" />
+  <ComponentRef Id="component.HeidiSQL_libintl_8.dll" />
+  <ComponentRef Id="component.HeidiSQL_libiconv_2.dll" />
   <ComponentRef Id="component.HeidiSQL_dialog.dll" />
+  <ComponentRef Id="component.HeidiSQL_auth_gssapi_client.dll" />
   <ComponentRef Id="component.HeidiSQL_CleanupSettings"/>
 </ComponentGroup>
 </Include>
-- 
cgit v1.2.1