diff options
author | Stefan Hacker <dd0t@users.sourceforge.net> | 2014-09-21 21:19:45 +0400 |
---|---|---|
committer | Stefan Hacker <dd0t@users.sourceforge.net> | 2014-09-21 21:24:07 +0400 |
commit | 4eba193f10e2b92966a69556202c2272c3dc06b1 (patch) | |
tree | 93a44392374b9858368dcc8335ab071469ed13f6 /installer | |
parent | 9f5b01b9ec87dfd8b51fdc39d52f61c618f6dd6d (diff) |
Add "Uninstall" shortcut to start menu folder with windows installer.
Instead of directly triggering uninstall (/x) this calls install (/i)
which will allow the user to modify, repair or actually uninstall the
application.
Diffstat (limited to 'installer')
-rw-r--r-- | installer/Product.wxs | 9 | ||||
-rw-r--r-- | installer/Settings.wxi | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/installer/Product.wxs b/installer/Product.wxs index d0b7b4d0c..8362d2446 100644 --- a/installer/Product.wxs +++ b/installer/Product.wxs @@ -77,6 +77,14 @@ <RegistryValue Key="Software\Mumble\Uninstall" Root="HKCU" Value="1" Type="integer" KeyPath="yes" /> <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall" /> </Component> + + <Component Id="UninstallerComponent" Guid="$(var.UninstallerComponentGuid)"> + <Shortcut Id="UninstallerShortcut" + Name="Uninstall" + Target="[SystemFolder]msiexec.exe" + Arguments="/i [ProductCode]"/> + <RegistryValue Key="Software\Mumble\UninstallerShortcut" Root="HKCU" Value="1" Type="integer" KeyPath="yes" /> + </Component> </DirectoryRef> <DirectoryRef Id="AppDataPluginFolder"> @@ -190,6 +198,7 @@ <Feature Id="Libraries" Title="Required Libraries" Display="hidden" AllowAdvertise="no" Absent="disallow" Level="1"> <ComponentGroupRef Id="LibrariesCommon" /> <ComponentRef Id="ApplicationProgramsFolderRemovalComponent" /> + <ComponentRef Id="UninstallerComponent" /> <ComponentRef Id="NSISUninstall" /> </Feature> diff --git a/installer/Settings.wxi b/installer/Settings.wxi index 6fe94dd70..620d75e96 100644 --- a/installer/Settings.wxi +++ b/installer/Settings.wxi @@ -17,6 +17,7 @@ <?define MumbleExeGuid = A08F7909-1116-4AC8-9422-051FA1A1BE19 ?> <?define MumbleDesktopShortcutGuid = 4448BE21-1AA1-41B8-887E-B3E07B28EFAE ?> <?define MurmurDesktopShortcutGuid = 02936CED-6588-4B7E-880F-241A4CF5E7D3 ?> + <?define UninstallerComponentGuid = CB81DC70-063E-48DD-94C3-593BBBAB20F4 ?> <?define LicenseTextGuid = 87C7967B-5E4B-41DD-83F5-A9E9E8AD3B39 ?> <?define ReadMeTextGuid = 15878902-B819-4E77-8C1D-0A915D79660B ?> <?define ApplicationProgramsFolderRemovalComponentGuid = 0AE1745D-FF86-4D61-BAF3-44248D21D263 ?> |