Bug 669504 - Port bug 649373 - remove the PRE_RELEASE_SUFFIX so that nightly/aurora builds don't have Alpha in their window titles; r=bienvenu
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 06 Jul 2011 19:02:14 +0100
changeset 8514 3ac94faeeb559a7b41afe1710e83e7e8262f68bb
parent 8513 69de1b1f58f7264ba2952c9f9a8e320541d804ad
child 8515 b65e94778dbd5d6a1f852bb167da792488a0e6b3
push id158
push userbugzilla@standard8.plus.com
push dateTue, 27 Sep 2011 19:18:14 +0000
treeherdercomm-beta@e47b99c61e4d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbienvenu
bugs669504, 649373
Bug 669504 - Port bug 649373 - remove the PRE_RELEASE_SUFFIX so that nightly/aurora builds don't have Alpha in their window titles; r=bienvenu
mail/base/Makefile.in
mail/installer/windows/Makefile.in
mail/jquery/Makefile.in
--- a/mail/base/Makefile.in
+++ b/mail/base/Makefile.in
@@ -43,17 +43,17 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 DIRS = modules
 
 PRE_RELEASE_SUFFIX := $(shell $(PYTHON) $(topsrcdir)/mozilla/config/printprereleasesuffix.py \
                       $(MOZ_APP_VERSION))
 
 DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
-           -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"
+           -DPRE_RELEASE_SUFFIX=""
 
 ifdef MOZILLA_OFFICIAL
 DEFINES += -DOFFICIAL_BUILD=1
 endif
 
 ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT)))
 DEFINES += -DHAVE_SHELL_SERVICE=1
 endif
--- a/mail/installer/windows/Makefile.in
+++ b/mail/installer/windows/Makefile.in
@@ -44,17 +44,17 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/package-name.mk
 
 CONFIG_DIR = instgen
 SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/thunderbird/7zSD.sfx
 
 DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION)
-PRE_RELEASE_SUFFIX := $(shell $(PYTHON) $(topsrcdir)/mozilla/config/printprereleasesuffix.py $(MOZ_APP_VERSION))
+PRE_RELEASE_SUFFIX := ""
 DEFINES += -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"
 
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
 INSTALLER_FILES = \
 	app.tag \
--- a/mail/jquery/Makefile.in
+++ b/mail/jquery/Makefile.in
@@ -35,31 +35,11 @@
 #
 # ***** END LICENSE BLOCK *****
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
-DIRS =
-
 include $(DEPTH)/config/autoconf.mk
 
-PRE_RELEASE_SUFFIX := $(shell $(PYTHON) $(topsrcdir)/mozilla/config/printprereleasesuffix.py \
-                      $(MOZ_APP_VERSION))
-
-DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
-           -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"
-
-ifdef MOZILLA_OFFICIAL
-DEFINES += -DOFFICIAL_BUILD=1
-endif
-
-ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT)))
-DEFINES += -DHAVE_SHELL_SERVICE=1
-endif
-
-ifdef MOZ_UPDATER
-DEFINES += -DMOZ_UPDATER=1
-endif
-
 include $(topsrcdir)/config/rules.mk