Bug 481374 - "Simplify / automate the addition of the pre-release suffix string (e.g. Alpha 1, Beta 2, etc.) - Port bug 468197 to TB" [r=Standard8,a=dmose (over irc)]

2009-07-10 19:37:03 +01:00 · 2009-07-10 19:37:03 +01:00 · a5fd4375dd
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@ -54,6 +54,7 @@ MOZ_BUILD_APP = @MOZ_BUILD_APP@
 MOZ_APP_NAME	= @MOZ_APP_NAME@
 MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNAME@
 MOZ_APP_VERSION = @MOZ_APP_VERSION@
+MOZ_APP_VERSION_TXT = @MOZ_APP_VERSION_TXT@

 MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@

--- a/configure.in
+++ b/configure.in
@ -7354,6 +7354,7 @@ AC_SUBST(TARGET_DEVICE)
 AC_SUBST(MOZ_APP_NAME)
 AC_SUBST(MOZ_APP_DISPLAYNAME)
 AC_SUBST(MOZ_APP_VERSION)
+AC_SUBST(MOZ_APP_VERSION_TXT)
 AC_SUBST(FIREFOX_VERSION)
 AC_SUBST(THUNDERBIRD_VERSION)
 AC_SUBST(SUNBIRD_VERSION)
--- a/mail/base/Makefile.in
+++ b/mail/base/Makefile.in
@ -44,7 +44,11 @@ include $(DEPTH)/config/autoconf.mk

 DIRS = modules

-DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION)
+PRE_RELEASE_SUFFIX := $(shell $(PYTHON) $(topsrcdir)/mozilla/config/printprereleasesuffix.py \
+                      $(shell cat $(MOZ_APP_VERSION_TXT) ))
+
+DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
+           -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"

 ifneq (,$(BUILD_OFFICIAL)$(MOZILLA_OFFICIAL))
 DEFINES += -DOFFICIAL_BUILD=1
--- a/mail/base/content/messageWindow.xul
+++ b/mail/base/content/messageWindow.xul
@ -1,3 +1,4 @@
+#filter substitution
 <?xml version="1.0"?>

 # ***** BEGIN LICENSE BLOCK *****
@ -63,8 +64,8 @@
  -->
 <window id="messengerWindow"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&titledefault.label;"
-        titlemodifier="&titledefault.label;"
+        title="&titledefault.label;@PRE_RELEASE_SUFFIX@"
+        titlemodifier="&titledefault.label;@PRE_RELEASE_SUFFIX@"
        titlemenuseparator="&titleSeparator.label;"
        onload="OnLoadMessageWindow()"
        onunload="OnUnloadMessageWindow()"
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@ -1,3 +1,4 @@
+#filter substitution
 <?xml version="1.0"?>

 # ***** BEGIN LICENSE BLOCK *****
@ -64,8 +65,8 @@
  -->
 <window id="messengerWindow"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&titledefault.label;"
-        titlemodifier="&titledefault.label;"
+        title="&titledefault.label;@PRE_RELEASE_SUFFIX@"
+        titlemodifier="&titledefault.label;@PRE_RELEASE_SUFFIX@"
        titlemenuseparator="&titleSeparator.label;"
        onload="OnLoadMessenger()"
        onunload="OnUnloadMessenger()"
--- a/mail/branding/nightly/branding.nsi
+++ b/mail/branding/nightly/branding.nsi
@ -36,7 +36,7 @@

 # NSIS defines for nightly builds.
 # The release build branding.nsi is located in other-license/branding/thunderbird/
-!define BrandShortName        "Shredder"
+
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Shredder"
@ -44,11 +44,3 @@
 !define URLInfoAbout          "http://www.mozilla.org/"
 !define URLUpdateInfo         "http://www.mozilla.org/products/thunderbird/"
 !define SurveyURL             "https://survey.mozilla.com/1/Mozilla%20Thunderbird/${AppVersion}/${AB_CD}/exit.html"
-
-# Everything below this line may be modified for Alpha / Beta releases.
-!define BrandFullName         "Shredder"
-
-# Add !define NO_INSTDIR_FROM_REG 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.
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@ -55,10 +55,14 @@ MOZ_SAFE_BROWSING=1
 # Needed for the mozilla-central build side of the system.
 # Can be dropped when we branch MOZILLA_1_9_1_BRANCH
 MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/\(^[0-9]\.[0-9]\.[0-9]\).*/\1/;'`
+
 if test "$MOZILLA_BRANCH_VERSION" = "1.9.1"; then
-  MOZ_APP_VERSION=`cat $topsrcdir/$MOZ_BUILD_APP/config/version-191.txt`
+  MOZ_APP_VERSION_TXT=$topsrcdir/$MOZ_BUILD_APP/config/version-191.txt
 else
-  MOZ_APP_VERSION=`cat $topsrcdir/$MOZ_BUILD_APP/config/version.txt`
+  MOZ_APP_VERSION_TXT=$topsrcdir/$MOZ_BUILD_APP/config/version.txt
 fi
+
+MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
+
 THUNDERBIRD_VERSION=$MOZ_APP_VERSION
 MOZ_NO_XPCOM_OBSOLETE=1
--- a/mail/installer/windows/Makefile.in
+++ b/mail/installer/windows/Makefile.in
@ -48,6 +48,11 @@ include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/package-name.mk
 CONFIG_DIR = instgen
 SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/thunderbird/7zSD.sfx

+APP_VERSION := $(shell cat $(MOZ_APP_VERSION_TXT))
+DEFINES += -DAPP_VERSION=$(APP_VERSION)
+PRE_RELEASE_SUFFIX := $(shell $(PYTHON) $(topsrcdir)/mozilla/config/printprereleasesuffix.py $(APP_VERSION))
+DEFINES += -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"
+
 PP_LOCALIZED_FILES = \
 	packages-static \
 	$(NULL)
@ -78,9 +83,7 @@ BRANDING_FILES = \

 DEFINES += \
 	-DAB_CD=$(AB_CD) \
-	-DPKG_BASENAME=$(PKG_BASENAME) \
-	-DPKG_INST_BASENAME=$(PKG_INST_BASENAME) \
-	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
+	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 	-DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME} \
 	-DMOZILLA_VERSION=${MOZILLA_VERSION} \
 	$(NULL)
--- a/mail/installer/windows/nsis/defines.nsi.in
+++ b/mail/installer/windows/nsis/defines.nsi.in
@ -1,12 +1,9 @@
 #filter substitution
-!define AppVersion            "@MOZ_APP_VERSION@"
+!define AppVersion            "@APP_VERSION@"
 !define GREVersion            @MOZILLA_VERSION@
 !define AB_CD                 "@AB_CD@"
-!define FileInstallerEXE      "@PKG_INST_BASENAME@.exe"
-!define FileInstallerMSI      "@PKG_INST_BASENAME@.msi"
-!define FileInstallerNETRoot  "@PKG_BASENAME@.net-installer"

-!define FileMainEXE           "thunderbird.exe"
+!define FileMainEXE           "@MOZ_APP_NAME@.exe"
 !define WindowClass           "ThunderbirdMessageWindow"

 !define AppRegNameMail        "Thunderbird"
@ -15,3 +12,16 @@
 !define ClientsRegName        "Mozilla Thunderbird"

 !define MinSupportedVer       "Microsoft Windows 2000"
+
+!define BrandShortName        "@MOZ_APP_DISPLAYNAME@"
+!define PreReleaseSuffix      "@PRE_RELEASE_SUFFIX@"
+!define BrandFullName         "${BrandFullNameInternal}${PreReleaseSuffix}"
+
+# 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
--- a/other-licenses/branding/thunderbird/branding.nsi
+++ b/other-licenses/branding/thunderbird/branding.nsi
@ -36,7 +36,7 @@

 # NSIS defines for official release builds.
 # The nightly build branding.nsi is located in mail/installer/windows/nsis
-!define BrandShortName        "Thunderbird"
+
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Mozilla Thunderbird"
@ -44,11 +44,3 @@
 !define URLInfoAbout          "http://www.mozillamessaging.com/${AB_CD}/"
 !define URLUpdateInfo         "http://www.mozillamessaging.com/${AB_CD}/thunderbird/"
 !define SurveyURL             "https://survey.mozilla.com/1/Mozilla%20Thunderbird/${AppVersion}/${AB_CD}/exit.html"
-
-# Everything below this line may be modified for Alpha / Beta releases.
-!define BrandFullName         "Mozilla Thunderbird"
-
-# Add !define NO_INSTDIR_FROM_REG 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.