More work on bug 397621. Rename the branding directory to nightly, change the windows installer defaults to Shredder, and other improvements. r=davida,bienvenu

mail/app/Makefile.in

@@ -346,10 +346,10 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 
 AB := $(firstword $(subst -, ,$(AB_CD)))
 
+APP_NAME = $(MOZ_APP_DISPLAYNAME)
+
 ifdef MOZ_DEBUG
-APP_NAME = ThunderbirdDebug
-else
-APP_NAME = Thunderbird
+APP_NAME := $(APP_NAME)Debug
 endif
 
 libs:: $(PROGRAM)

mail/branding/nightly/Makefile.in

@@ -0,0 +1,53 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Thunderbird unofficial branding.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Messaging
+# Portions created by the Initial Developer are Copyright (C) 2008
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Banner <bugzilla@standard8.plus.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+# Branding Makefile
+#  - Currently just deals with locales, other items will be moved later into
+#    this directory.
+
+DEPTH = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = \
+	locales \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk

mail/branding/nightly/configure.sh

@@ -0,0 +1 @@
+MOZ_APP_DISPLAYNAME=Shredder

mail/branding/nightly/locales/Makefile.in

@@ -0,0 +1,48 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Thunderbird unofficial branding.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Messaging
+# Portions created by the Initial Developer are Copyright (C) 2008
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Banner <bugzilla@standard8.plus.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH          = ../../../..
+topsrcdir      = @top_srcdir@
+srcdir         = @srcdir@
+VPATH          = @srcdir@
+relativesrcdir = mail/branding/unofficial/locales
+
+include $(DEPTH)/config/autoconf.mk
+
+DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
+
+include $(topsrcdir)/config/rules.mk

mail/branding/nightly/locales/en-US/brand.dtd

@@ -0,0 +1,3 @@
+<!ENTITY  brandShortName        "Shredder">
+<!ENTITY  brandFullName         "Shredder">
+<!ENTITY  vendorShortName       "mozilla.org">

mail/branding/nightly/locales/en-US/brand.properties

@@ -0,0 +1,4 @@
+brandShortName=Shredder
+brandFullName=Shredder
+vendorShortName=mozilla.org
+

mail/branding/nightly/locales/jar.mn

@@ -0,0 +1,7 @@
+#filter substitution
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+# Shredder branding only exists in en-US
+  locale/branding/brand.dtd        (en-US/brand.dtd)
+* locale/branding/brand.properties (en-US/brand.properties)

mail/build.mk

@@ -45,7 +45,7 @@ TIERS += app
 ifdef MOZ_BRANDING_DIRECTORY
 tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
 else
-tier_app_dirs += mail/branding/unofficial
+tier_app_dirs += mail/branding/nightly
 endif
 
 tier_app_dirs += \

mail/confvars.sh

@@ -37,7 +37,6 @@
 # ***** END LICENSE BLOCK *****
 
 MOZ_APP_NAME=thunderbird
-MOZ_APP_DISPLAYNAME=Thunderbird
 MOZ_UPDATER=1
 MOZ_THUNDERBIRD=1
 MOZ_MATHML=

mail/installer/windows/nsis/branding.nsi

@@ -36,13 +36,19 @@
 
 # NSIS defines for nightly builds.
 # The release build branding.nsi is located in other-license/branding/thunderbird/
-!define BrandShortName        "Thunderbird"
-!define BrandFullName         "Mozilla Thunderbird"
-# BrandFullNameInternal is used for some registry and file system values that
-# should not contain release that may be in the BrandFullName (e.g. Beta 1, etc.)
-!define BrandFullNameInternal "Mozilla Thunderbird"
-!define CompanyName           "Mozilla"
+!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"
+!define CompanyName           "mozilla.org"
 !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.

mail/makefiles.sh

@@ -40,8 +40,8 @@ mail/Makefile
 mail/app/Makefile
 mail/app/profile/Makefile
 mail/base/Makefile
-mail/branding/unofficial/Makefile
-mail/branding/unofficial/locales/Makefile
+mail/branding/nightly/Makefile
+mail/branding/nightly/locales/Makefile
 mail/locales/Makefile
 mail/components/Makefile
 mail/components/compose/Makefile

other-licenses/branding/thunderbird/branding.nsi

@@ -34,15 +34,21 @@
 #
 # ***** END LICENSE BLOCK *****
 
-# NSIS defines for nightly builds.
-# The release build branding.nsi is located in other-license/branding/firefox/
+# NSIS defines for official release builds.
+# The nightly build branding.nsi is located in mail/installer/windows/nsis
 !define BrandShortName        "Thunderbird"
-!define BrandFullName         "Mozilla Thunderbird"
-# BrandFullNameInternal is used for some registry and file system values that
-# should not contain release that may be in the BrandFullName (e.g. Beta 1, etc.)
+# BrandFullNameInternal is used for some registry and file system values
+# instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Mozilla Thunderbird"
 !define CompanyName           "Mozilla"
 !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         "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.

other-licenses/branding/thunderbird/configure.sh

@@ -0,0 +1 @@
+MOZ_APP_DISPLAYNAME=Thunderbird