Bug 834388 - Remove use of version.nsh from Sunbird. r=philipp
authorRobert Strong <robert.bugzilla@gmail.com>
Thu, 07 Feb 2013 11:43:14 -0800
changeset 14829 46eff8f0474d89e529700ccf74f0195202723201
parent 14828 c39b215c927ab1363dac7d8d5fe9ee21a309f223
child 14830 af56cbb736574c1f9e2ce3234ab8193a79e9f2a0
push id867
push userbugzilla@standard8.plus.com
push dateMon, 01 Apr 2013 20:44:27 +0000
treeherdercomm-beta@797726b8d244 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilipp
bugs834388
Bug 834388 - Remove use of version.nsh from Sunbird. r=philipp
calendar/installer/windows/nsis/defines.nsi.in
calendar/installer/windows/nsis/installer.nsi
calendar/installer/windows/nsis/uninstaller.nsi
--- a/calendar/installer/windows/nsis/defines.nsi.in
+++ b/calendar/installer/windows/nsis/defines.nsi.in
@@ -14,8 +14,19 @@
 !define AppVersion            "@MOZ_APP_VERSION@"
 !define AppUserModelID        "${AppVendor}.${AppName}.${AppVersion}"
 !define GREVersion            @MOZILLA_VERSION@
 !define AB_CD                 "@AB_CD@"
 
 !define FileMainEXE           "sunbird.exe"
 !define WindowClass           "SunbirdMessageWindow"
 !define MinSupportedVer       "Microsoft Windows 2000"
+
+# File details shared by both the installer and uninstaller
+VIProductVersion "1.0.0.0"
+VIAddVersionKey "ProductName"     "${BrandShortName}"
+VIAddVersionKey "CompanyName"     "${CompanyName}"
+VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of The Mozilla Foundation."
+VIAddVersionKey "LegalCopyright"  "${CompanyName}"
+VIAddVersionKey "FileVersion"     "${AppVersion}"
+VIAddVersionKey "ProductVersion"  "${AppVersion}"
+# Comments is not used but left below commented out for future reference
+# VIAddVersionKey "Comments"        "Comments"
--- a/calendar/installer/windows/nsis/installer.nsi
+++ b/calendar/installer/windows/nsis/installer.nsi
@@ -42,17 +42,16 @@ Var AddDesktopSC
 !insertmacro StrFilter
 !insertmacro WordReplace
 
 ; The following includes are custom.
 !include branding.nsi
 !include defines.nsi
 !include common.nsh
 !include locales.nsi
-!include version.nsh
 
 VIAddVersionKey "FileDescription" "${BrandShortName} Installer"
 VIAddVersionKey "OriginalFilename" "setup.exe"
 
 ; Must be inserted before other macros that use logging
 !insertmacro _LoggingCommon
 
 ; Most commonly used macros for managing shortcuts
--- a/calendar/installer/windows/nsis/uninstaller.nsi
+++ b/calendar/installer/windows/nsis/uninstaller.nsi
@@ -40,17 +40,16 @@ Var TmpVal
 
 !insertmacro un.GetParent
 
 ; The following includes are custom.
 !include branding.nsi
 !include defines.nsi
 !include common.nsh
 !include locales.nsi
-!include version.nsh
 
 ; This is named BrandShortName helper because we use this for software update
 ; post update cleanup.
 VIAddVersionKey "FileDescription"  "${BrandShortName} Helper"
 VIAddVersionKey "OriginalFilename" "helper.exe"
 
 ; Most commonly used macros for managing shortcuts
 !insertmacro _LoggingShortcutsCommon