From 106591d3ab0e8471fa97bc9abbbe176b794916b6 Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Wed, 3 Jun 2015 14:45:23 +0200 Subject: [PATCH] use snoretoast to install the shortcut instead of the winshell plugin --- CMakeModules/NSIS.template.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeModules/NSIS.template.in b/CMakeModules/NSIS.template.in index a22cb868c..b894f15f6 100644 --- a/CMakeModules/NSIS.template.in +++ b/CMakeModules/NSIS.template.in @@ -38,6 +38,11 @@ ;define app id needed for Windows 8 notifications !define AppUserModelId org.tomahawk-player.Tomahawk +!define SnoreToastExe "$INSTDIR\SnoreToast.exe" +!macro SnoreShortcut path exe appID + nsExec::ExecToLog '"${SnoreToastExe}" -install "${path}" "${exe}" "${appID}"' +!macroend + ;----------------------------------------------------------------------------- ; Installer version ;----------------------------------------------------------------------------- @@ -436,8 +441,7 @@ SectionGroup "Shortcuts" RMDir /r "$SMPROGRAMS\Tomahawk" CreateDirectory "$SMPROGRAMS\Tomahawk" CreateShortCut "$SMPROGRAMS\Tomahawk\LICENSE.lnk" "$INSTDIR\LICENSE.txt" - CreateShortCut "$SMPROGRAMS\Tomahawk\Tomahawk.lnk" "$INSTDIR\tomahawk.exe" - WinShell::SetLnkAUMI "$SMPROGRAMS\Tomahawk\Tomahawk.lnk" "${AppUserModelId}" + !insertmacro SnoreShortcut "$SMPROGRAMS\Tomahawk\Tomahawk.lnk" "$INSTDIR\tomahawk.exe" "${AppUserModelId}" CreateShortCut "$SMPROGRAMS\Tomahawk\Release notes.lnk" "$INSTDIR\NOTES.txt" CreateShortCut "$SMPROGRAMS\Tomahawk\Uninstall.lnk" "$INSTDIR\uninstall.exe" SetShellVarContext current @@ -650,8 +654,6 @@ Section Uninstall ;Start menu shortcuts. !ifdef OPTION_SECTION_SC_START_MENU SetShellVarContext all - WinShell::UninstAppUserModelId "${AppUserModelId}" - WinShell::UninstShortcut "$SMPROGRAMS\Tomahawk\Tomahawk.lnk" RMDir /r "$SMPROGRAMS\Tomahawk" SetShellVarContext current !endif