Bug 593159 - Remove version.nsh dependency from installer code. r=Callek
authorFrank Wein <bugzilla@mcsmurf.de>
Fri, 02 Mar 2012 17:19:08 -0500
changeset 10985 e77c99d747c9cbe310e1f756828ee80490f9a181
parent 10984 7772f38115c9786a3cd1d3f999998696516a1679
child 10986 962931e86468365d02da2d2f8db2c2a6fff2dd26
push id463
push userbugzilla@standard8.plus.com
push dateTue, 24 Apr 2012 17:34:51 +0000
treeherdercomm-beta@e53588e8f7b0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs593159
Bug 593159 - Remove version.nsh dependency from installer code. r=Callek
suite/installer/windows/nsis/defines.nsi.in
suite/installer/windows/nsis/installer.nsi
suite/installer/windows/nsis/uninstaller.nsi
--- a/suite/installer/windows/nsis/defines.nsi.in
+++ b/suite/installer/windows/nsis/defines.nsi.in
@@ -20,8 +20,20 @@
 !define WindowClass           "SeaMonkeyMessageWindow"
 !define DDEApplication        "SeaMonkey"
 
 !define AppRegName            "SeaMonkey"
 !define AppRegNameMail        "SeaMonkey (Mail)"
 !define AppRegNameNews        "SeaMonkey (News)"
 
 !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/suite/installer/windows/nsis/installer.nsi
+++ b/suite/installer/windows/nsis/installer.nsi
@@ -75,17 +75,16 @@ Var AddDesktopSC
 !insertmacro GetSize
 !insertmacro WordFind
 
 ; The following includes are custom.
 !include branding.nsi
 !include defines.nsi
 !include common.nsh
 !include locales.nsi
-!include version.nsh
 !include custom.nsi
 
 VIAddVersionKey "FileDescription" "${BrandShortName} Installer"
 VIAddVersionKey "OriginalFilename" "setup.exe"
 
 ; Must be inserted before other macros that use logging
 !insertmacro _LoggingCommon
 
--- a/suite/installer/windows/nsis/uninstaller.nsi
+++ b/suite/installer/windows/nsis/uninstaller.nsi
@@ -76,17 +76,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