Stop using version.nsh - Bug 592133 - Installer includes 'Minefield is a Trademark of The Mozilla Foundation' when not using official branded. r=jmathies, ur-r=beltzner, a=approval2.0 beltzner
authorRobert Strong <robert.bugzilla@gmail.com>
Wed, 01 Sep 2010 16:26:53 -0700
changeset 51862 556f27f56d1438d6cb6726a26a90c3f202f7c0df
parent 51861 4e295e38281d8d82856b72c3c202b0a7de5aed21
child 51863 c9ee9a98f2d4d4db468d593972e985b6e92634a6
push id15454
push userrstrong@mozilla.com
push dateWed, 01 Sep 2010 23:27:33 +0000
treeherdermozilla-central@3c3c95c37d20 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmathies, approval2
bugs592133
milestone2.0b6pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Stop using version.nsh - Bug 592133 - Installer includes 'Minefield is a Trademark of The Mozilla Foundation' when not using official branded. r=jmathies, ur-r=beltzner, a=approval2.0 beltzner
browser/installer/windows/nsis/defines.nsi.in
browser/installer/windows/nsis/installer.nsi
browser/installer/windows/nsis/uninstaller.nsi
--- a/browser/installer/windows/nsis/defines.nsi.in
+++ b/browser/installer/windows/nsis/defines.nsi.in
@@ -43,8 +43,21 @@
 #ifdef HAVE_64BIT_OS
 !define HAVE_64BIT_OS
 !define ARCH "x64"
 !define MinSupportedVer "Microsoft Windows Vista x64"
 #else
 !define ARCH "x86"
 !define MinSupportedVer "Microsoft Windows 2000"
 #endif
+
+# File details shared by both the installer and uninstaller
+VIProductVersion "1.0.0.0"
+VIAddVersionKey "ProductName"     "${BrandShortName}"
+VIAddVersionKey "CompanyName"     "${CompanyName}"
+#ifdef MOZ_OFFICIAL_BRANDING
+VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of The Mozilla Foundation."
+#endif
+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/browser/installer/windows/nsis/installer.nsi
+++ b/browser/installer/windows/nsis/installer.nsi
@@ -83,17 +83,16 @@ Var PageName
 !insertmacro WordFind
 !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/browser/installer/windows/nsis/uninstaller.nsi
+++ b/browser/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