From 6691c2d5e9ba79f7b844e3bf7fcdf19849b176e7 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 27 Nov 2013 17:13:32 +0900 Subject: [PATCH] Bug 943733 - Finish removing PRE_RELEASE_SUFFIX. r=rstrong --- browser/base/Makefile.in | 3 --- browser/base/content/browser.xul | 16 ++++++++-------- browser/base/content/chatWindow.xul | 2 +- browser/installer/windows/Makefile.in | 2 -- browser/installer/windows/nsis/defines.nsi.in | 12 +----------- 5 files changed, 10 insertions(+), 25 deletions(-) diff --git a/browser/base/Makefile.in b/browser/base/Makefile.in index ff2b9daa6068..160b1a60c456 100644 --- a/browser/base/Makefile.in +++ b/browser/base/Makefile.in @@ -9,12 +9,9 @@ abs_srcdir = $(abspath $(srcdir)) include $(topsrcdir)/config/rules.mk -PRE_RELEASE_SUFFIX := "" - DEFINES += \ -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \ -DAPP_LICENSE_BLOCK=$(abs_srcdir)/content/overrides/app-license.html \ - -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)" \ $(NULL) ifneq (,$(filter windows gtk2 gtk3 cocoa, $(MOZ_WIDGET_TOOLKIT))) diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index a6cfdf41d3af..8433e6b400d2 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -27,19 +27,19 @@ xmlns:html="http://www.w3.org/1999/xhtml" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();" - title="&mainWindow.title;@PRE_RELEASE_SUFFIX@" - title_normal="&mainWindow.title;@PRE_RELEASE_SUFFIX@" + title="&mainWindow.title;" + title_normal="&mainWindow.title;" #ifdef XP_MACOSX - title_privatebrowsing="&mainWindow.title;@PRE_RELEASE_SUFFIX@&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;" - titledefault="&mainWindow.title;@PRE_RELEASE_SUFFIX@" + title_privatebrowsing="&mainWindow.title;&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;" + titledefault="&mainWindow.title;" titlemodifier="" titlemodifier_normal="" titlemodifier_privatebrowsing="&mainWindow.titlePrivateBrowsingSuffix;" #else - title_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;" - titlemodifier="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@" - titlemodifier_normal="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@" - titlemodifier_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;" + title_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;" + titlemodifier="&mainWindow.titlemodifier;" + titlemodifier_normal="&mainWindow.titlemodifier;" + titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;" #endif #ifdef CAN_DRAW_IN_TITLEBAR #ifdef XP_WIN diff --git a/browser/base/content/chatWindow.xul b/browser/base/content/chatWindow.xul index a1b52a00f159..0dff7cf557a4 100644 --- a/browser/base/content/chatWindow.xul +++ b/browser/base/content/chatWindow.xul @@ -18,7 +18,7 @@ windowtype="Social:Chat" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - title="&mainWindow.title;@PRE_RELEASE_SUFFIX@" + title="&mainWindow.title;" onload="gChatWindow.onLoad();" onunload="gChatWindow.onUnload();" macanimationtype="document" diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in index 93b703282cff..463918ce6372 100644 --- a/browser/installer/windows/Makefile.in +++ b/browser/installer/windows/Makefile.in @@ -8,8 +8,6 @@ CONFIG_DIR = instgen SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx APP_VERSION := $(shell cat $(srcdir)/../../config/version.txt) DEFINES += -DAPP_VERSION=$(APP_VERSION) -PRE_RELEASE_SUFFIX := "" -DEFINES += -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)" INSTALLER_FILES = \ app.tag \ diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in index 019ae3cfddb8..ca94e44af879 100644 --- a/browser/installer/windows/nsis/defines.nsi.in +++ b/browser/installer/windows/nsis/defines.nsi.in @@ -32,8 +32,7 @@ !define AppRegName "Firefox" !define BrandShortName "@MOZ_APP_DISPLAYNAME@" -!define PreReleaseSuffix "@PRE_RELEASE_SUFFIX@" -!define BrandFullName "${BrandFullNameInternal}${PreReleaseSuffix}" +!define BrandFullName "${BrandFullNameInternal}" !define NO_UNINSTALL_SURVEY @@ -60,15 +59,6 @@ !define BaseURLStubPing "http://download-stats.mozilla.org/stub" -# NO_INSTDIR_FROM_REG is defined for pre-releases which have a PreReleaseSuffix -# (e.g. Alpha X, Beta X, etc.) to prevent finding a non-default installation -# directory in the registry and using that as the default. This prevents -# Beta releases built with official branding from finding an existing install -# of an official release and defaulting to its installation directory. -!if "@PRE_RELEASE_SUFFIX@" != "" -!define NO_INSTDIR_FROM_REG -!endif - # 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_OS