From 4c867b9fa704b8746e8641b0f07730494eb65f5c Mon Sep 17 00:00:00 2001 From: Panos Astithas Date: Sat, 8 Nov 2014 10:50:28 +0200 Subject: [PATCH] Bug 1094505 - Avoid using concatenated name in installer. r=rstrong --- browser/branding/aurora/branding.nsi | 1 + browser/installer/windows/nsis/defines.nsi.in | 2 ++ 2 files changed, 3 insertions(+) diff --git a/browser/branding/aurora/branding.nsi b/browser/branding/aurora/branding.nsi index 0eaf4a84db16..a95ef4c090b4 100644 --- a/browser/branding/aurora/branding.nsi +++ b/browser/branding/aurora/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 "Firefox Developer Edition" +!define BrandShortName "Firefox Developer Edition" !define CompanyName "mozilla.org" !define URLInfoAbout "https://www.mozilla.org" !define HelpLink "https://support.mozilla.org" diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in index 0d7ef32d9055..dc4053d229f1 100644 --- a/browser/installer/windows/nsis/defines.nsi.in +++ b/browser/installer/windows/nsis/defines.nsi.in @@ -31,7 +31,9 @@ !define DDEApplication "Firefox" !define AppRegName "Firefox" +!ifndef DEV_EDITION !define BrandShortName "@MOZ_APP_DISPLAYNAME@" +!endif !define BrandFullName "${BrandFullNameInternal}" !define NO_UNINSTALL_SURVEY