Heidi stuff

c387e7d8 · Olivier Bertrand · 3a889b1f · c387e7d8 · c387e7d8
Commit c387e7d8 authored May 07, 2015 by Olivier Bertrand
Hide whitespace changes
Inline Side-by-side

Showing with 100 additions and 100 deletions

win/packaging/heidisql.cmake win/packaging/heidisql.cmake +23 -23

win/packaging/heidisql.wxi.in win/packaging/heidisql.wxi.in +77 -77

No files found.
--- a/win/packaging/heidisql.cmake
+++ b/win/packaging/heidisql.cmake
 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}) 
  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}
    ${CMAKE_COMMAND} -E tar xfz ${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)
--- a/win/packaging/heidisql.wxi.in
+++ b/win/packaging/heidisql.wxi.in
 <Include>
 <Property Id="HEIDISQLINSTALLED" Secure="yes">
 <RegistrySearch Id="HeidiSQL"
          Root="HKLM"
          Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\HeidiSQL_is1"
          Name="UninstallString"
          Type="raw"
          Win64="no"
 />
 </Property>
 <DirectoryRef Id="MariaDBShared">
  <Directory Id="D.HeidiSQL" Name="HeidiSQL">
   <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. 
      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 
      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" />
    </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"  />
      <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_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"  />
     <RemoveRegistryKey Id="HeidiSQL_RegistryCleanup" Root="HKCU" Key="SOFTWARE\HeidiSQL" Action="removeOnUninstall" />
    </Component>
  </Directory>
 </DirectoryRef>
 <ComponentGroup Id="HeidiSQL">
  <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>