bug 1378834 - Update of the installers to reflect the nightly name change r=mhowell

BrandFullName is now defined in the branding files


MozReview-Commit-ID: 5wmInT9xbrT

--HG--
extra : rebase_source : 97f85c75026a354cbd7f55a4ed9860abad56820b

browser/branding/aurora/branding.nsi

@@ -10,6 +10,7 @@
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Firefox Developer Edition"
 !define BrandShortName        "Firefox Developer Edition"
+!define BrandFullName         "Firefox Developer Edition"
 !define CompanyName           "mozilla.org"
 !define URLInfoAbout          "https://www.mozilla.org"
 !define HelpLink              "https://support.mozilla.org"

browser/branding/official/branding.nsi

@@ -9,6 +9,7 @@
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Mozilla Firefox"
+!define BrandFullName         "Mozilla Firefox"
 !define CompanyName           "Mozilla Corporation"
 !define URLInfoAbout          "https://www.mozilla.org"
 !define URLUpdateInfo         "https://www.mozilla.org/firefox/${AppVersion}/releasenotes"

browser/branding/unofficial/branding.nsi

@@ -9,6 +9,7 @@
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Mozilla Developer Preview"
+!define BrandFullName         "Mozilla Developer Preview"
 !define CompanyName           "mozilla.org"
 !define URLInfoAbout          "https://www.mozilla.org"
 !define HelpLink              "https://support.mozilla.org"

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

@@ -36,7 +36,6 @@
 !ifndef DEV_EDITION
 !define BrandShortName        "@MOZ_APP_DISPLAYNAME@"
 !endif
-!define BrandFullName         "${BrandFullNameInternal}"
 
 !define CERTIFICATE_NAME            "Mozilla Corporation"
 !define CERTIFICATE_ISSUER          "DigiCert SHA2 Assured ID Code Signing CA"

browser/installer/windows/nsis/maintenanceservice_installer.nsi

@@ -51,7 +51,9 @@ Var BrandFullName
 ; We keep defines.nsi defined so that we get other things like 
 ; the version number, but we redefine BrandFullName
 !define MaintFullName "Mozilla Maintenance Service"
+!ifdef BrandFullName
 !undef BrandFullName
+!endif
 !define BrandFullName "${MaintFullName}"
 
 !include common.nsh

toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi

@@ -51,7 +51,9 @@ Var BrandFullName
 ; We keep defines.nsi defined so that we get other things like 
 ; the version number, but we redefine BrandFullName
 !define MaintFullName "Mozilla Maintenance Service"
+!ifdef BrandFullName
 !undef BrandFullName
+!endif
 !define BrandFullName "${MaintFullName}"
 
 !include common.nsh