Bug 569017 - Port "Bug 566125 - Invalid command: ${UpdateShortcutAppModelIDs} when building uninstaller" to Sunbird [r=mschroeder]
authorStefan Sitter <ssitter@gmail.com>
Mon, 31 May 2010 21:13:07 +0200
changeset 5747 1f8b22f0dc0daccf781cb97f4aabedec2e651a11
parent 5746 232288e6614ca951cf7636f9af59f20d0e989930
child 5748 27777aeb16428603981dd7e4b70fdb683392f661
push idunknown
push userunknown
push dateunknown
reviewersmschroeder
bugs569017, 566125
Bug 569017 - Port "Bug 566125 - Invalid command: ${UpdateShortcutAppModelIDs} when building uninstaller" to Sunbird [r=mschroeder]
calendar/installer/windows/nsis/defines.nsi.in
calendar/installer/windows/nsis/uninstaller.nsi
--- a/calendar/installer/windows/nsis/defines.nsi.in
+++ b/calendar/installer/windows/nsis/defines.nsi.in
@@ -1,9 +1,18 @@
 #filter substitution
+
+# Win7: AppVendor, AppName, and AppVersion must match the application.ini values
+# of Vendor, Name, and Version. These values are used in registering shortcuts
+# with the taskbar. ExplicitAppUserModelID registration when the app launches is
+# handled in widget/src/windows/WinTaskbar.cpp.
+
+!define AppVendor             "Mozilla"
+!define AppName               "Sunbird"
 !define AppVersion            "@MOZ_APP_VERSION@"
+!define AppUserModelID        "${AppVendor}.${AppName}.${AppVersion}"
 !define GREVersion            @MOZILLA_VERSION@
 !define AB_CD                 "@AB_CD@"
 
 !define FileMainEXE           "sunbird.exe"
 !define NO_UNINSTALL_SURVEY
 !define WindowClass           "SunbirdMessageWindow"
 !define MinSupportedVer       "Microsoft Windows 2000"
--- a/calendar/installer/windows/nsis/uninstaller.nsi
+++ b/calendar/installer/windows/nsis/uninstaller.nsi
@@ -89,16 +89,17 @@ VIAddVersionKey "OriginalFilename" "help
 
 !insertmacro CleanVirtualStore
 !insertmacro FindSMProgramsDir
 !insertmacro GetLongPath
 !insertmacro RegCleanMain
 !insertmacro RegCleanUninstall
 !insertmacro SetBrandNameVars
 !insertmacro UnloadUAC
+!insertmacro UpdateShortcutAppModelIDs
 !insertmacro WriteRegDWORD2
 !insertmacro WriteRegStr2
 
 !insertmacro un.ChangeMUIHeaderImage
 !insertmacro un.CheckForFilesInUse
 !insertmacro un.CleanUpdatesDir
 !insertmacro un.CleanVirtualStore
 !insertmacro un.DeleteShortcuts