diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/heidisql.cmake | 4 | ||||
| -rw-r--r-- | win/packaging/heidisql.wxi.in | 36 |
2 files changed, 33 insertions, 7 deletions
diff --git a/win/packaging/heidisql.cmake b/win/packaging/heidisql.cmake index 7893fb1f54e..dfde0cc53b3 100644 --- a/win/packaging/heidisql.cmake +++ b/win/packaging/heidisql.cmake @@ -1,10 +1,10 @@ -SET(HEIDISQL_BASE_NAME "HeidiSQL_8.3_Portable") +SET(HEIDISQL_BASE_NAME "HeidiSQL_9.1_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}) IF(NOT EXISTS ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}) - MAKE_DIRECTORY(${HEIDISQL_DOWNLOAD_DIR}) + MAKE_DIRECTORY(${HEIDISQL_DOWNLOAD_DIR}) MESSAGE(STATUS "Downloading ${HEIDISQL_URL} to ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}") FILE(DOWNLOAD ${HEIDISQL_URL} ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP} TIMEOUT 60) EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E chdir ${HEIDISQL_DOWNLOAD_DIR} diff --git a/win/packaging/heidisql.wxi.in b/win/packaging/heidisql.wxi.in index 4df8d7cc914..ce9f668e291 100644 --- a/win/packaging/heidisql.wxi.in +++ b/win/packaging/heidisql.wxi.in @@ -10,22 +10,23 @@ </Property> <DirectoryRef Id="MariaDBShared"> <Directory Id="D.HeidiSQL" Name="HeidiSQL"> - <Component Id="component.HeidiSQL" Guid="96ea3879-5320-4098-8f26-2f655d2f716c" Win64="no"> + <Component Id="component.HeidiSQL" Guid="96ea3879-5320-4098-8f26-2f655d2f716c" Win64="no"> <File Id="heidisql.gpl.txt" Name="gpl.txt" Source="${HEIDISQL_DOWNLOAD_DIR}\gpl.txt" /> <File Id="heidisql.heidisql.exe" Name="heidisql.exe" Source="${HEIDISQL_DOWNLOAD_DIR}\heidisql.exe" KeyPath="yes"> <Shortcut Id="desktopHeidiSQL" Directory="DesktopFolder" Name="HeidiSQL" Advertise="yes"/> </File> - <!-- - Forced file removal for heidisql.exe might be required. + <!-- + Forced file removal for heidisql.exe might be required. HeidiSQL is self-updating, thus the version that was installed by MSI not necessarily matches - the version of the file on uninstall. MSI would not touch such file by default and leave it after + the version of the file on uninstall. MSI would not touch such file by default and leave it after uninstallation. We use RemoveFile to force delete in any case. --> <RemoveFile Id="Remove_HeidiSQL_exe" Name="heidisql.exe" On="uninstall" /> + <!-- remove readme.txt too, it's not included in HeidiSQL-9.1-Portable.zip --> + <RemoveFile Id="Remove_readme_txt" Name="readme.txt" On="uninstall" /> <File Id="heidisql.license.txt" Name="license.txt" Source="${HEIDISQL_DOWNLOAD_DIR}\license.txt" /> - <File Id="heidisql.readme.txt" Name="readme.txt" Source="${HEIDISQL_DOWNLOAD_DIR}\readme.txt" /> </Component> <Component Id="component.HeidiSQL_MenuShortcut" Guid="*" Win64="no"> <RegistryValue Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall" Name="shortcuts.heidisql" Value="1" Type="string" KeyPath="yes" /> @@ -34,6 +35,26 @@ <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_libeay32.dll" Guid="*" Win64="no"> + <File Id="heidisql.libeay32.dll" Name="libeay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libeay32.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> + <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> + + <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> + </Directory> + <Component Id="component.HeidiSQL_CleanupSettings" Guid="*" Win64="no"> <Condition>HEIDISQLINSTALLED</Condition> <RegistryValue Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\UninstallCleanupHeidiSQLSettings" Name="cleanup.heidisql" Value="1" Type="string" KeyPath="yes" /> @@ -46,6 +67,11 @@ <ComponentRef Id="component.HeidiSQL"/> <ComponentRef Id="component.HeidiSQL_MenuShortcut"/> <ComponentRef Id="component.HeidiSQL_libmysql.dll"/> + <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_dialog.dll" /> <ComponentRef Id="component.HeidiSQL_CleanupSettings"/> </ComponentGroup> </Include> |