diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 18:09:06 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 18:09:06 +0100 |
| commit | e3d37bfebf818fba7d65fbd89f721dae4864bc0c (patch) | |
| tree | 2524a70a4402f39f74e56a49c8e4480cac495a08 /win | |
| parent | 7f19330c595e3183d079fe2c18eecc74740e8f83 (diff) | |
| parent | ad916ef33c1e779da6940cce0f6e64b1b380bd6d (diff) | |
| download | mariadb-git-e3d37bfebf818fba7d65fbd89f721dae4864bc0c.tar.gz | |
Merge branch 'connect/10.1' into 10.1
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/heidisql.cmake | 2 | ||||
| -rw-r--r-- | win/packaging/heidisql.wxi.in | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/win/packaging/heidisql.cmake b/win/packaging/heidisql.cmake index 5b0cd07cea4..dfde0cc53b3 100644 --- a/win/packaging/heidisql.cmake +++ b/win/packaging/heidisql.cmake @@ -4,7 +4,7 @@ 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 4f07a07627c..ce9f668e291 100644 --- a/win/packaging/heidisql.wxi.in +++ b/win/packaging/heidisql.wxi.in @@ -10,16 +10,16 @@ </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" /> |