diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-01 10:24:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-01 10:24:36 +0300 |
| commit | f813131c7b235a490399764ba75c6138e602c23e (patch) | |
| tree | 9360a0ff33952bf6f88771c4669eb18a9b438978 /win | |
| parent | f9639c2d1a5e24f1a1533b6277fe7eca3aa3c3c0 (diff) | |
| parent | 24cb76b8dd86bf54f264352be41506995b6c89c4 (diff) | |
| download | mariadb-git-f813131c7b235a490399764ba75c6138e602c23e.tar.gz | |
Merge 5.5 into 10.1bb-10.1-merge
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/heidisql.cmake | 2 | ||||
| -rw-r--r-- | win/packaging/heidisql.wxi.in | 28 |
2 files changed, 20 insertions, 10 deletions
diff --git a/win/packaging/heidisql.cmake b/win/packaging/heidisql.cmake index a3d884adb56..6290ada9704 100644 --- a/win/packaging/heidisql.cmake +++ b/win/packaging/heidisql.cmake @@ -1,4 +1,4 @@ -SET(HEIDISQL_BASE_NAME "HeidiSQL_10.2_32_Portable") +SET(HEIDISQL_BASE_NAME "HeidiSQL_11.0_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}) diff --git a/win/packaging/heidisql.wxi.in b/win/packaging/heidisql.wxi.in index 4244b47d0d8..58d95210783 100644 --- a/win/packaging/heidisql.wxi.in +++ b/win/packaging/heidisql.wxi.in @@ -33,20 +33,25 @@ <RegistryValue Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall" Name="shortcuts.heidisql" Value="1" Type="string" KeyPath="yes" /> <Shortcut Id="startmenuHeidiSQL" Directory="ShortcutFolder" Name="HeidiSQL" Target="[D.HeidiSQL]\heidisql.exe"/> </Component> + + <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_libmysql_6.1.dll" Guid="*" Win64="no"> + <File Id="heidisql.libmysql_6.1.dll" Name="libmysql-6.1.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libmysql-6.1.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 Id="component.HeidiSQL_libssl_1_1.dll" Guid="*" Win64="no"> + <File Id="heidisql.libssl_1_1.dll" Name="libssl-1_1.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libssl-1_1.dll" /> </Component> - <Component Id="component.HeidiSQL_libpq.dll" Guid="*" Win64="no"> - <File Id="heidisql.libpq.dll" Name="libpq.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libpq.dll" /> + <Component Id="component.HeidiSQL_libpq_10.dll" Guid="*" Win64="no"> + <File Id="heidisql.libpq_10.dll" Name="libpq-10.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libpq-10.dll" /> </Component> - <Component Id="component.HeidiSQL_ssleay32.dll" Guid="*" Win64="no"> - <File Id="heidisql.ssleay32.dll" Name="ssleay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\ssleay32.dll" /> + <Component Id="component.HeidiSQL_libcrypto_1_1.dll" Guid="*" Win64="no"> + <File Id="heidisql.libcrypto_1_1.dll" Name="libcrypto-1_1.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libcrypto-1_1.dll" /> </Component> <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" /> @@ -54,6 +59,9 @@ <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> + <Component Id="component.HeidiSQL_sqlite3.dll" Guid="*" Win64="no"> + <File Id="heidisql.sqlite3.dll" Name="sqlite3.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\sqlite3.dll" /> + </Component> <Directory Id="D.HeidiSQL.plugins" Name="plugins"> <?foreach dll in $(var.pluginlist) ?> @@ -76,11 +84,13 @@ <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_libssl_1_1.dll" /> + <ComponentRef Id="component.HeidiSQL_libpq_10.dll" /> + <ComponentRef Id="component.HeidiSQL_libcrypto_1_1.dll" /> <ComponentRef Id="component.HeidiSQL_libintl_8.dll" /> <ComponentRef Id="component.HeidiSQL_libiconv_2.dll" /> + <ComponentRef Id="component.HeidiSQL_sqlite3.dll" /> + <ComponentRef Id="component.HeidiSQL_libmysql_6.1.dll" /> <?foreach dll in $(var.pluginlist)?> <ComponentRef Id="component.HeidiSQL_$(var.dll)" /> <?endforeach?> |