MDEV-19922 Old version of heidisql in mariadb installer

Upgrade HeidiSQL to 10.2
MariaDB · Jul 5, 2019 · 399d012 · 399d012
1 parent ecd8f44
commit 399d012
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/win/packaging/heidisql.cmake b/win/packaging/heidisql.cmake
@@ -1,4 +1,4 @@
-SET(HEIDISQL_BASE_NAME "HeidiSQL_9.5_Portable")
+SET(HEIDISQL_BASE_NAME "HeidiSQL_10.2_32_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})
@@ -12,12 +12,5 @@ IF(NOT EXISTS ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP})
   )
 ENDIF()
 
-SET(LIBMYSQLDLL_SOURCE ${HEIDISQL_DOWNLOAD_DIR}/libmysql.dll)
-IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
-  # Use our libmysql if it is 32 bit.
-  IF(LIBMYSQL_LOCATION)
-    SET(LIBMYSQLDLL_SOURCE "${LIBMYSQL_LOCATION}")
-  ENDIF()
-ENDIF()
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql.wxi)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql_feature.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql_feature.wxi)
diff --git a/win/packaging/heidisql.wxi.in b/win/packaging/heidisql.wxi.in
@@ -8,6 +8,7 @@
           Win64="no"
 />
 </Property>
+<?define pluginlist=auth_gssapi_client.dll;mysql_clear_password.dll;sha256_password.dll;caching_sha2_password.dll;pvio_npipe.dll;dialog.dll;pvio_shmem.dll?>
 <DirectoryRef Id="MariaDBShared">
   <Directory Id="D.HeidiSQL" Name="HeidiSQL">
    <Component Id="component.HeidiSQL" Guid="96ea3879-5320-4098-8f26-2f655d2f716c"  Win64="no"> 
@@ -35,7 +36,9 @@
     <Component Id="component.HeidiSQL_libmysql.dll" Guid="*" Win64="no">
       <File Id="heidisql.libmysql.dll" Name="libmysql.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libmysql.dll" />
     </Component>
-
+    <Component Id="component.HeidiSQL_libmariadb.dll" Guid="*" Win64="no">
+      <File Id="heidisql.libmariadb.dll" Name="libmariadb.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libmariadb.dll" />
+    </Component>
     <Component Id="component.HeidiSQL_libeay32.dll" Guid="*" Win64="no">
       <File Id="heidisql.libeay32.dll" Name="libeay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libeay32.dll" />
     </Component>
@@ -53,12 +56,11 @@
     </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" />
+      <?foreach dll in $(var.pluginlist) ?>
+      <Component Id="component.HeidiSQL_$(var.dll)" Guid="*" Win64="no">
+        <File Id="heidisql.$(var.dll)" Name="$(var.dll)" Source="${HEIDISQL_DOWNLOAD_DIR}\plugins\$(var.dll)" />
       </Component>
+      <?endforeach?>
     </Directory>
 
     <Component Id="component.HeidiSQL_CleanupSettings" Guid="*" Win64="no">
@@ -73,13 +75,15 @@
   <ComponentRef Id="component.HeidiSQL"/>
   <ComponentRef Id="component.HeidiSQL_MenuShortcut"/>
   <ComponentRef Id="component.HeidiSQL_libmysql.dll"/>
+  <ComponentRef Id="component.HeidiSQL_libmariadb.dll"/>
   <ComponentRef Id="component.HeidiSQL_libeay32.dll" />
   <ComponentRef Id="component.HeidiSQL_libpq.dll" />
   <ComponentRef Id="component.HeidiSQL_ssleay32.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" />
+  <?foreach dll in $(var.pluginlist)?>
+    <ComponentRef Id="component.HeidiSQL_$(var.dll)" />
+  <?endforeach?>
   <ComponentRef Id="component.HeidiSQL_CleanupSettings"/>
 </ComponentGroup>
 </Include>