Followup to Bug 468197 - also add the version and not just the Alpha / Beta string. r=mconnor
authorRobert Strong <robert.bugzilla@gmail.com>
Wed, 18 Feb 2009 14:04:33 -0800
changeset 25152 025dca14ef8a4c40aabe53026745836a51fa9d6c
parent 25151 4e9612353fab0fb60a6bd63436ac72e8934f8e10
child 25154 46f49249cdd88b49db0520a4bdba3f1b9402fbd5
push id5430
push userrstrong@mozilla.com
push dateWed, 18 Feb 2009 22:04:58 +0000
treeherdermozilla-central@025dca14ef8a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconnor
bugs468197
milestone1.9.2a1pre
Followup to Bug 468197 - also add the version and not just the Alpha / Beta string. r=mconnor
browser/base/Makefile.in
browser/installer/windows/Makefile.in
--- a/browser/base/Makefile.in
+++ b/browser/base/Makefile.in
@@ -52,17 +52,18 @@ CHROME_DEPS += $(abs_srcdir)/content/ove
 ifdef ENABLE_TESTS
 DIRS += content/test
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 PRE_RELEASE_SUFFIX = $(shell cat $(srcdir)/../config/version.txt | \
   sed -e '/pre/s/.*//g' -e '/[ab][0-9]/!s/.*//g' \
-      -e 's/.*[0-9]a\([0-9]\+\)/ Alpha \1/g' -e 's/.*[0-9]b\([0-9]\+\)/ Beta \1/g')
+      -e 's/\(.*[0-9]\)a\([0-9]\+\)/ \1 Alpha \2/g' \
+      -e 's/\(.*[0-9]\)b\([0-9]\+\)/ \1 Beta \2/g')
 
 DEFINES += \
 	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
 	-DAPP_LICENSE_BLOCK=$(abs_srcdir)/content/overrides/app-license.html \
 	-DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)" \
 	$(NULL)
 
 ifndef MOZ_BRANDING_DIRECTORY
--- a/browser/installer/windows/Makefile.in
+++ b/browser/installer/windows/Makefile.in
@@ -48,17 +48,18 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 
 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 = $(shell echo $(APP_VERSION) | \
   sed -e '/pre/s/.*//g' -e '/[ab][0-9]/!s/.*//g' \
-      -e 's/.*[0-9]a\([0-9]\+\)/ Alpha \1/g' -e 's/.*[0-9]b\([0-9]\+\)/ Beta \1/g')
+      -e 's/\(.*[0-9]\)a\([0-9]\+\)/ \1 Alpha \2/g' \
+      -e 's/\(.*[0-9]\)b\([0-9]\+\)/ \1 Beta \2/g')
 DEFINES += -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"
 
 PP_LOCALIZED_FILES = \
 	packages-static \
 	$(NULL)
 
 # All script and locale files used by the Unicode version of NSIS need to be
 # converted from UTF-8 to UTF-16LE