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

This commit is contained in:
Robert Strong 2010-09-01 16:26:53 -07:00
parent 3832fabbf1
commit e43b4b2b37
3 changed files with 13 additions and 2 deletions

View File

@ -48,3 +48,16 @@
!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"

View File

@ -88,7 +88,6 @@ Var PageName
!include defines.nsi
!include common.nsh
!include locales.nsi
!include version.nsh
VIAddVersionKey "FileDescription" "${BrandShortName} Installer"
VIAddVersionKey "OriginalFilename" "setup.exe"

View File

@ -81,7 +81,6 @@ Var TmpVal
!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.