Skip to content

Commit c387e7d

Browse files
BuggynoursBuggynours
committed
Heidi stuff
1 parent 3a889b1 commit c387e7d

File tree

2 files changed

+100
-100
lines changed

2 files changed

+100
-100
lines changed

‎win/packaging/heidisql.cmake

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
SET(HEIDISQL_BASE_NAME "HeidiSQL_9.1_Portable")
2-
SET(HEIDISQL_ZIP "${HEIDISQL_BASE_NAME}.zip")
3-
SET(HEIDISQL_URL "http://www.heidisql.com/downloads/releases/${HEIDISQL_ZIP}")
4-
SET(HEIDISQL_DOWNLOAD_DIR ${THIRD_PARTY_DOWNLOAD_LOCATION}/${HEIDISQL_BASE_NAME})
5-
6-
IF(NOT EXISTS ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP})
7-
MAKE_DIRECTORY(${HEIDISQL_DOWNLOAD_DIR})
8-
MESSAGE(STATUS "Downloading ${HEIDISQL_URL} to ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}")
9-
FILE(DOWNLOAD ${HEIDISQL_URL} ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP} TIMEOUT 60)
10-
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E chdir ${HEIDISQL_DOWNLOAD_DIR}
11-
${CMAKE_COMMAND} -E tar xfz ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}
12-
)
13-
ENDIF()
14-
15-
SET(LIBMYSQLDLL_SOURCE ${HEIDISQL_DOWNLOAD_DIR}/libmysql.dll)
16-
IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
17-
# Use our libmysql if it is 32 bit.
18-
IF(LIBMYSQL_LOCATION)
19-
SET(LIBMYSQLDLL_SOURCE "${LIBMYSQL_LOCATION}")
20-
ENDIF()
21-
ENDIF()
22-
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql.wxi)
23-
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql_feature.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql_feature.wxi)
1+
SET(HEIDISQL_BASE_NAME "HeidiSQL_9.1_Portable")
2+
SET(HEIDISQL_ZIP "${HEIDISQL_BASE_NAME}.zip")
3+
SET(HEIDISQL_URL "http://www.heidisql.com/downloads/releases/${HEIDISQL_ZIP}")
4+
SET(HEIDISQL_DOWNLOAD_DIR ${THIRD_PARTY_DOWNLOAD_LOCATION}/${HEIDISQL_BASE_NAME})
5+
6+
IF(NOT EXISTS ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP})
7+
MAKE_DIRECTORY(${HEIDISQL_DOWNLOAD_DIR})
8+
MESSAGE(STATUS "Downloading ${HEIDISQL_URL} to ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}")
9+
FILE(DOWNLOAD ${HEIDISQL_URL} ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP} TIMEOUT 60)
10+
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E chdir ${HEIDISQL_DOWNLOAD_DIR}
11+
${CMAKE_COMMAND} -E tar xfz ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}
12+
)
13+
ENDIF()
14+
15+
SET(LIBMYSQLDLL_SOURCE ${HEIDISQL_DOWNLOAD_DIR}/libmysql.dll)
16+
IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
17+
# Use our libmysql if it is 32 bit.
18+
IF(LIBMYSQL_LOCATION)
19+
SET(LIBMYSQLDLL_SOURCE "${LIBMYSQL_LOCATION}")
20+
ENDIF()
21+
ENDIF()
22+
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql.wxi)
23+
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql_feature.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql_feature.wxi)

‎win/packaging/heidisql.wxi.in

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,77 @@
1-
<Include>
2-
<Property Id="HEIDISQLINSTALLED" Secure="yes">
3-
<RegistrySearch Id="HeidiSQL"
4-
Root="HKLM"
5-
Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\HeidiSQL_is1"
6-
Name="UninstallString"
7-
Type="raw"
8-
Win64="no"
9-
/>
10-
</Property>
11-
<DirectoryRef Id="MariaDBShared">
12-
<Directory Id="D.HeidiSQL" Name="HeidiSQL">
13-
<Component Id="component.HeidiSQL" Guid="96ea3879-5320-4098-8f26-2f655d2f716c" Win64="no">
14-
15-
<File Id="heidisql.gpl.txt" Name="gpl.txt" Source="${HEIDISQL_DOWNLOAD_DIR}\gpl.txt" />
16-
<File Id="heidisql.heidisql.exe" Name="heidisql.exe" Source="${HEIDISQL_DOWNLOAD_DIR}\heidisql.exe" KeyPath="yes">
17-
<Shortcut Id="desktopHeidiSQL" Directory="DesktopFolder" Name="HeidiSQL" Advertise="yes"/>
18-
</File>
19-
<!--
20-
Forced file removal for heidisql.exe might be required.
21-
HeidiSQL is self-updating, thus the version that was installed by MSI not necessarily matches
22-
the version of the file on uninstall. MSI would not touch such file by default and leave it after
23-
uninstallation. We use RemoveFile to force delete in any case.
24-
-->
25-
<RemoveFile Id="Remove_HeidiSQL_exe" Name="heidisql.exe" On="uninstall" />
26-
<!-- remove readme.txt too, it's not included in HeidiSQL-9.1-Portable.zip -->
27-
<RemoveFile Id="Remove_readme_txt" Name="readme.txt" On="uninstall" />
28-
29-
<File Id="heidisql.license.txt" Name="license.txt" Source="${HEIDISQL_DOWNLOAD_DIR}\license.txt" />
30-
</Component>
31-
<Component Id="component.HeidiSQL_MenuShortcut" Guid="*" Win64="no">
32-
<RegistryValue Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall" Name="shortcuts.heidisql" Value="1" Type="string" KeyPath="yes" />
33-
<Shortcut Id="startmenuHeidiSQL" Directory="ShortcutFolder" Name="HeidiSQL" Target="[D.HeidiSQL]\heidisql.exe"/>
34-
</Component>
35-
<Component Id="component.HeidiSQL_libmysql.dll" Guid="*" Win64="no">
36-
<File Id="heidisql.libmysql.dll" Name="libmysql.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libmysql.dll" />
37-
</Component>
38-
39-
<Component Id="component.HeidiSQL_libeay32.dll" Guid="*" Win64="no">
40-
<File Id="heidisql.libeay32.dll" Name="libeay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libeay32.dll" />
41-
</Component>
42-
<Component Id="component.HeidiSQL_libpq.dll" Guid="*" Win64="no">
43-
<File Id="heidisql.libpq.dll" Name="libpq.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libpq.dll" />
44-
</Component>
45-
<Component Id="component.HeidiSQL_ssleay32.dll" Guid="*" Win64="no">
46-
<File Id="heidisql.ssleay32.dll" Name="ssleay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\ssleay32.dll" />
47-
</Component>
48-
<Component Id="component.HeidiSQL_libintl.dll" Guid="*" Win64="no">
49-
<File Id="heidisql.libintl.dll" Name="libintl.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libintl.dll" />
50-
</Component>
51-
52-
<Directory Id="D.HeidiSQL.plugins" Name="plugins">
53-
<Component Id="component.HeidiSQL_dialog.dll" Guid="*" Win64="no">
54-
<File Id="heidisql.dialog.dll" Name="dialog.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\plugins\dialog.dll" />
55-
</Component>
56-
</Directory>
57-
58-
<Component Id="component.HeidiSQL_CleanupSettings" Guid="*" Win64="no">
59-
<Condition>HEIDISQLINSTALLED</Condition>
60-
<RegistryValue Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\UninstallCleanupHeidiSQLSettings" Name="cleanup.heidisql" Value="1" Type="string" KeyPath="yes" />
61-
<RemoveRegistryKey Id="HeidiSQL_RegistryCleanup" Root="HKCU" Key="SOFTWARE\HeidiSQL" Action="removeOnUninstall" />
62-
</Component>
63-
</Directory>
64-
</DirectoryRef>
65-
66-
<ComponentGroup Id="HeidiSQL">
67-
<ComponentRef Id="component.HeidiSQL"/>
68-
<ComponentRef Id="component.HeidiSQL_MenuShortcut"/>
69-
<ComponentRef Id="component.HeidiSQL_libmysql.dll"/>
70-
<ComponentRef Id="component.HeidiSQL_libeay32.dll" />
71-
<ComponentRef Id="component.HeidiSQL_libpq.dll" />
72-
<ComponentRef Id="component.HeidiSQL_ssleay32.dll" />
73-
<ComponentRef Id="component.HeidiSQL_libintl.dll" />
74-
<ComponentRef Id="component.HeidiSQL_dialog.dll" />
75-
<ComponentRef Id="component.HeidiSQL_CleanupSettings"/>
76-
</ComponentGroup>
77-
</Include>
1+
<Include>
2+
<Property Id="HEIDISQLINSTALLED" Secure="yes">
3+
<RegistrySearch Id="HeidiSQL"
4+
Root="HKLM"
5+
Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\HeidiSQL_is1"
6+
Name="UninstallString"
7+
Type="raw"
8+
Win64="no"
9+
/>
10+
</Property>
11+
<DirectoryRef Id="MariaDBShared">
12+
<Directory Id="D.HeidiSQL" Name="HeidiSQL">
13+
<Component Id="component.HeidiSQL" Guid="96ea3879-5320-4098-8f26-2f655d2f716c" Win64="no">
14+
15+
<File Id="heidisql.gpl.txt" Name="gpl.txt" Source="${HEIDISQL_DOWNLOAD_DIR}\gpl.txt" />
16+
<File Id="heidisql.heidisql.exe" Name="heidisql.exe" Source="${HEIDISQL_DOWNLOAD_DIR}\heidisql.exe" KeyPath="yes">
17+
<Shortcut Id="desktopHeidiSQL" Directory="DesktopFolder" Name="HeidiSQL" Advertise="yes"/>
18+
</File>
19+
<!--
20+
Forced file removal for heidisql.exe might be required.
21+
HeidiSQL is self-updating, thus the version that was installed by MSI not necessarily matches
22+
the version of the file on uninstall. MSI would not touch such file by default and leave it after
23+
uninstallation. We use RemoveFile to force delete in any case.
24+
-->
25+
<RemoveFile Id="Remove_HeidiSQL_exe" Name="heidisql.exe" On="uninstall" />
26+
<!-- remove readme.txt too, it's not included in HeidiSQL-9.1-Portable.zip -->
27+
<RemoveFile Id="Remove_readme_txt" Name="readme.txt" On="uninstall" />
28+
29+
<File Id="heidisql.license.txt" Name="license.txt" Source="${HEIDISQL_DOWNLOAD_DIR}\license.txt" />
30+
</Component>
31+
<Component Id="component.HeidiSQL_MenuShortcut" Guid="*" Win64="no">
32+
<RegistryValue Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall" Name="shortcuts.heidisql" Value="1" Type="string" KeyPath="yes" />
33+
<Shortcut Id="startmenuHeidiSQL" Directory="ShortcutFolder" Name="HeidiSQL" Target="[D.HeidiSQL]\heidisql.exe"/>
34+
</Component>
35+
<Component Id="component.HeidiSQL_libmysql.dll" Guid="*" Win64="no">
36+
<File Id="heidisql.libmysql.dll" Name="libmysql.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libmysql.dll" />
37+
</Component>
38+
39+
<Component Id="component.HeidiSQL_libeay32.dll" Guid="*" Win64="no">
40+
<File Id="heidisql.libeay32.dll" Name="libeay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libeay32.dll" />
41+
</Component>
42+
<Component Id="component.HeidiSQL_libpq.dll" Guid="*" Win64="no">
43+
<File Id="heidisql.libpq.dll" Name="libpq.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libpq.dll" />
44+
</Component>
45+
<Component Id="component.HeidiSQL_ssleay32.dll" Guid="*" Win64="no">
46+
<File Id="heidisql.ssleay32.dll" Name="ssleay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\ssleay32.dll" />
47+
</Component>
48+
<Component Id="component.HeidiSQL_libintl.dll" Guid="*" Win64="no">
49+
<File Id="heidisql.libintl.dll" Name="libintl.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libintl.dll" />
50+
</Component>
51+
52+
<Directory Id="D.HeidiSQL.plugins" Name="plugins">
53+
<Component Id="component.HeidiSQL_dialog.dll" Guid="*" Win64="no">
54+
<File Id="heidisql.dialog.dll" Name="dialog.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\plugins\dialog.dll" />
55+
</Component>
56+
</Directory>
57+
58+
<Component Id="component.HeidiSQL_CleanupSettings" Guid="*" Win64="no">
59+
<Condition>HEIDISQLINSTALLED</Condition>
60+
<RegistryValue Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\UninstallCleanupHeidiSQLSettings" Name="cleanup.heidisql" Value="1" Type="string" KeyPath="yes" />
61+
<RemoveRegistryKey Id="HeidiSQL_RegistryCleanup" Root="HKCU" Key="SOFTWARE\HeidiSQL" Action="removeOnUninstall" />
62+
</Component>
63+
</Directory>
64+
</DirectoryRef>
65+
66+
<ComponentGroup Id="HeidiSQL">
67+
<ComponentRef Id="component.HeidiSQL"/>
68+
<ComponentRef Id="component.HeidiSQL_MenuShortcut"/>
69+
<ComponentRef Id="component.HeidiSQL_libmysql.dll"/>
70+
<ComponentRef Id="component.HeidiSQL_libeay32.dll" />
71+
<ComponentRef Id="component.HeidiSQL_libpq.dll" />
72+
<ComponentRef Id="component.HeidiSQL_ssleay32.dll" />
73+
<ComponentRef Id="component.HeidiSQL_libintl.dll" />
74+
<ComponentRef Id="component.HeidiSQL_dialog.dll" />
75+
<ComponentRef Id="component.HeidiSQL_CleanupSettings"/>
76+
</ComponentGroup>
77+
</Include>

0 commit comments

Comments
 (0)