Bug 1187756 - Update installer build files r=Neil a=Ratty for a CLOSED TREE

suite/branding/nightly/package/windows/branding.nsi

@@ -3,8 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #NSIS defines
-!define BrandShortName          "SeaMonkey"
-!define BrandFullName           "SeaMonkey"
+# BrandFullNameInternal is used for some registry and file system values
+# instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal   "SeaMonkey"
 !define CompanyName             "mozilla.org"
 !define URLInfoAbout            "http://www.mozilla.org"

suite/installer/windows/Makefile.in

@@ -22,15 +22,6 @@ BRANDING_FILES = \
 	wizWatermark.bmp \
 	$(NULL)
 
-DEFINES += \
-	-DPKG_BASENAME="$(PKG_BASENAME)" \
-	-DPKG_INST_BASENAME="$(PKG_INST_BASENAME)" \
-	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
-	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
-	-DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME} \
-	-DMOZILLA_VERSION=${MOZILLA_VERSION} \
-	$(NULL)
-
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif

suite/installer/windows/moz.build

@@ -2,3 +2,9 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DEFINES['APP_VERSION'] = CONFIG['SEAMONKEY_VERSION']
+
+DEFINES['MOZ_APP_NAME'] = CONFIG['MOZ_APP_NAME']
+DEFINES['MOZ_APP_DISPLAYNAME'] = "'%s'" % CONFIG['MOZ_APP_DISPLAYNAME']
+DEFINES['MOZILLA_VERSION'] = CONFIG['MOZILLA_VERSION']

suite/installer/windows/nsis/defines.nsi.in

@@ -1,14 +1,8 @@
 #filter substitution
-
-# These defines should match application.ini settings
 !define AppName               "SeaMonkey"
-!define AppVersion            "@MOZ_APP_VERSION@"
-
+!define AppVersion            "@APP_VERSION@"
 !define GREVersion            @MOZILLA_VERSION@
 !define AB_CD                 "@AB_CD@"
-!define FileInstallerEXE      "@PKG_INST_BASENAME@.exe"
-!define FileInstallerMSI      "@PKG_INST_BASENAME@.msi"
-!define FileInstallerNETRoot  "@PKG_BASENAME@.net-installer"
 !define NO_UNINSTALL_SURVEY
 
 !define FileMainEXE           "@MOZ_APP_NAME@.exe"
@@ -19,6 +13,9 @@
 !define AppRegNameMail        "SeaMonkey (Mail)"
 !define AppRegNameNews        "SeaMonkey (News)"
 
+!define BrandShortName        "@MOZ_APP_DISPLAYNAME@"
+!define BrandFullName         "${BrandFullNameInternal}"
+
 # ARCH is used when it is necessary to differentiate the x64 registry keys from
 # the x86 registry keys (e.g. the uninstall registry key).
 #ifdef HAVE_64BIT_BUILD