Part of bug 811770 - rework the branding to be release channel by default with an environment option for ESR. r=mconley,a=Standard8
☠☠ backed out by f35cea3253fb ☠ ☠
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 02 Jan 2013 21:09:21 +0000
changeset 13594 ae503020d67f1e8b9a5798cab69c416d549cb576
parent 13593 6edb04be80599e01cd64cb9161af6817d682920a
child 13595 b64dc927ed819961c764a6696750d2f855f3f7b5
push id22
push userbugzilla@standard8.plus.com
push dateWed, 02 Jan 2013 21:09:45 +0000
reviewersmconley, Standard8
bugs811770
Part of bug 811770 - rework the branding to be release channel by default with an environment option for ESR. r=mconley,a=Standard8
configure.in
mail/confvars.sh
other-licenses/branding/thunderbird/Makefile.in
other-licenses/branding/thunderbird/content/about-esr-wordmark.png
other-licenses/branding/thunderbird/jar.mn
other-licenses/branding/thunderbird/thunderbird-branding.js
other-licenses/branding/thunderbird/thunderbird-esr-branding.js
--- a/configure.in
+++ b/configure.in
@@ -6714,16 +6714,17 @@ else
 fi
 
 AC_SUBST(MOZ_APP_NAME)
 AC_SUBST(MOZ_APP_DISPLAYNAME)
 AC_SUBST(MOZ_APP_VERSION)
 AC_SUBST(MOZ_APP_MAXVERSION)
 AC_SUBST(MAR_CHANNEL_ID)
 AC_SUBST(ACCEPTED_MAR_CHANNEL_IDS)
+AC_SUBST(MOZ_ESR)
 AC_SUBST(FIREFOX_VERSION)
 AC_SUBST(THUNDERBIRD_VERSION)
 AC_SUBST(SUNBIRD_VERSION)
 AC_SUBST(SEAMONKEY_VERSION)
 
 AC_SUBST(MOZ_PKG_SPECIAL)
 
 AC_SUBST(MAIL_PKG_SHARED)
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -30,14 +30,24 @@ MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
 fi
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 THUNDERBIRD_VERSION=$MOZ_APP_VERSION
 
 MOZ_BRANDING_DIRECTORY=mail/branding/aurora
 MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/thunderbird
-# This should usually be the same as the value MAR_CHANNEL_ID.
-# If more than one ID is needed, then you should use a comma separated list
-# of values.
-ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-esr
-# The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
-MAR_CHANNEL_ID=thunderbird-comm-esr
+
+if [ "$MOZ_ESR" ]; then
+  # This should usually be the same as the value MAR_CHANNEL_ID.
+  # If more than one ID is needed, then you should use a comma separated list
+  # of values.
+  ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-esr
+  # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
+  MAR_CHANNEL_ID=thunderbird-comm-esr
+else
+  # This should usually be the same as the value MAR_CHANNEL_ID.
+  # If more than one ID is needed, then you should use a comma separated list
+  # of values.
+  ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-release
+  # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
+  MAR_CHANNEL_ID=thunderbird-comm-release
+fi
--- a/other-licenses/branding/thunderbird/Makefile.in
+++ b/other-licenses/branding/thunderbird/Makefile.in
@@ -9,17 +9,22 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS = \
 	locales \
 	$(NULL)
 
+ifdef MOZ_ESR
+PREF_JS_EXPORTS = $(srcdir)/thunderbird-esr-branding.js
+DEFINES += -DMOZ_ESR=1
+else
 PREF_JS_EXPORTS = $(srcdir)/thunderbird-branding.js
+endif
 
 include $(topsrcdir)/config/rules.mk
 
 export::
 	$(NSINSTALL) -D $(DIST)/branding
 # Export items into the branding directory first
 ifeq ($(OS_ARCH),WINNT)
 	cp $(srcdir)/thunderbird.ico   $(DIST)/branding/thunderbird.ico
copy from other-licenses/branding/thunderbird/content/about-wordmark.png
copy to other-licenses/branding/thunderbird/content/about-esr-wordmark.png
--- a/other-licenses/branding/thunderbird/jar.mn
+++ b/other-licenses/branding/thunderbird/jar.mn
@@ -1,9 +1,13 @@
 messenger.jar:
 % content branding %content/branding/
   content/branding/about-background.png             (content/about-background.png)
   content/branding/about-logo.png                   (content/about-logo.png)
+#ifdef MOZ_ESR
+  content/branding/about-wordmark.png               (content/about-esr-wordmark.png)
+#else
   content/branding/about-wordmark.png               (content/about-wordmark.png)
+#endif
   content/branding/about.png                        (content/about.png)
   content/branding/icon48.png                       (content/icon48.png)
   content/branding/icon64.png                       (content/icon64.png)
   content/branding/aboutDialog.css                  (content/aboutDialog.css)
--- a/other-licenses/branding/thunderbird/thunderbird-branding.js
+++ b/other-licenses/branding/thunderbird/thunderbird-branding.js
@@ -1,16 +1,16 @@
 // Default start page
 pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
 // start page override to load after an update
-pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%esr&os=%OS%&buildid=%APPBUILDID%");
+pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
 // Release notes URL
-pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%esr&os=%OS%&buildid=%APPBUILDID%");
+pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
 // Interval: Time between checks for a new version (in seconds)
 // nightly=8 hours, official=24 hours
 pref("app.update.interval", 86400);
 
 // The time interval between the downloading of mar file chunks in the
 // background (in seconds)
 pref("app.update.download.backgroundInterval", 600);
copy from other-licenses/branding/thunderbird/thunderbird-branding.js
copy to other-licenses/branding/thunderbird/thunderbird-esr-branding.js