From 0fb4d3e8a491911112ea20a2f847f5950b003c3c Mon Sep 17 00:00:00 2001 From: "bugzilla%standard8.plus.com" Date: Thu, 3 Jul 2008 07:47:02 +0000 Subject: [PATCH] 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 | 6 +-- mail/branding/nightly/Makefile.in | 53 +++++++++++++++++++ mail/branding/nightly/configure.sh | 1 + mail/branding/nightly/locales/Makefile.in | 48 +++++++++++++++++ mail/branding/nightly/locales/en-US/brand.dtd | 3 ++ .../nightly/locales/en-US/brand.properties | 4 ++ mail/branding/nightly/locales/jar.mn | 7 +++ mail/branding/unofficial/Makefile.in | 0 mail/branding/unofficial/locales/Makefile.in | 0 .../unofficial/locales/en-US/brand.dtd | 0 .../unofficial/locales/en-US/brand.properties | 0 mail/branding/unofficial/locales/jar.mn | 0 mail/build.mk | 2 +- mail/confvars.sh | 1 - mail/installer/windows/nsis/branding.nsi | 18 ++++--- mail/makefiles.sh | 4 +- .../branding/thunderbird/branding.nsi | 16 ++++-- .../branding/thunderbird/configure.sh | 1 + 18 files changed, 146 insertions(+), 18 deletions(-) create mode 100644 mail/branding/nightly/Makefile.in create mode 100644 mail/branding/nightly/configure.sh create mode 100755 mail/branding/nightly/locales/Makefile.in create mode 100755 mail/branding/nightly/locales/en-US/brand.dtd create mode 100755 mail/branding/nightly/locales/en-US/brand.properties create mode 100755 mail/branding/nightly/locales/jar.mn delete mode 100644 mail/branding/unofficial/Makefile.in delete mode 100755 mail/branding/unofficial/locales/Makefile.in delete mode 100755 mail/branding/unofficial/locales/en-US/brand.dtd delete mode 100755 mail/branding/unofficial/locales/en-US/brand.properties delete mode 100755 mail/branding/unofficial/locales/jar.mn create mode 100644 other-licenses/branding/thunderbird/configure.sh diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in index 1cb21c0d60b..dc189b4b351 100644 --- a/mail/app/Makefile.in +++ b/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) diff --git a/mail/branding/nightly/Makefile.in b/mail/branding/nightly/Makefile.in new file mode 100644 index 00000000000..942aafb89a7 --- /dev/null +++ b/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 +# +# 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 diff --git a/mail/branding/nightly/configure.sh b/mail/branding/nightly/configure.sh new file mode 100644 index 00000000000..59c18123ed3 --- /dev/null +++ b/mail/branding/nightly/configure.sh @@ -0,0 +1 @@ +MOZ_APP_DISPLAYNAME=Shredder diff --git a/mail/branding/nightly/locales/Makefile.in b/mail/branding/nightly/locales/Makefile.in new file mode 100755 index 00000000000..c8ced4b20c9 --- /dev/null +++ b/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 +# +# 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 diff --git a/mail/branding/nightly/locales/en-US/brand.dtd b/mail/branding/nightly/locales/en-US/brand.dtd new file mode 100755 index 00000000000..94d17d6959b --- /dev/null +++ b/mail/branding/nightly/locales/en-US/brand.dtd @@ -0,0 +1,3 @@ + + + diff --git a/mail/branding/nightly/locales/en-US/brand.properties b/mail/branding/nightly/locales/en-US/brand.properties new file mode 100755 index 00000000000..467f4fc2a5f --- /dev/null +++ b/mail/branding/nightly/locales/en-US/brand.properties @@ -0,0 +1,4 @@ +brandShortName=Shredder +brandFullName=Shredder +vendorShortName=mozilla.org + diff --git a/mail/branding/nightly/locales/jar.mn b/mail/branding/nightly/locales/jar.mn new file mode 100755 index 00000000000..640cda16d10 --- /dev/null +++ b/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) diff --git a/mail/branding/unofficial/Makefile.in b/mail/branding/unofficial/Makefile.in deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/mail/branding/unofficial/locales/Makefile.in b/mail/branding/unofficial/locales/Makefile.in deleted file mode 100755 index e69de29bb2d..00000000000 diff --git a/mail/branding/unofficial/locales/en-US/brand.dtd b/mail/branding/unofficial/locales/en-US/brand.dtd deleted file mode 100755 index e69de29bb2d..00000000000 diff --git a/mail/branding/unofficial/locales/en-US/brand.properties b/mail/branding/unofficial/locales/en-US/brand.properties deleted file mode 100755 index e69de29bb2d..00000000000 diff --git a/mail/branding/unofficial/locales/jar.mn b/mail/branding/unofficial/locales/jar.mn deleted file mode 100755 index e69de29bb2d..00000000000 diff --git a/mail/build.mk b/mail/build.mk index 660b52c40c0..e806ad24920 100644 --- a/mail/build.mk +++ b/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 += \ diff --git a/mail/confvars.sh b/mail/confvars.sh index 2f67dfd7922..045f981fca3 100755 --- a/mail/confvars.sh +++ b/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= diff --git a/mail/installer/windows/nsis/branding.nsi b/mail/installer/windows/nsis/branding.nsi index 3c8d7b1b0c4..c600976f0b2 100755 --- a/mail/installer/windows/nsis/branding.nsi +++ b/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. diff --git a/mail/makefiles.sh b/mail/makefiles.sh index 349c207bbcd..12b175021f9 100644 --- a/mail/makefiles.sh +++ b/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 diff --git a/other-licenses/branding/thunderbird/branding.nsi b/other-licenses/branding/thunderbird/branding.nsi index 0ce624e21aa..680f6f25310 100755 --- a/other-licenses/branding/thunderbird/branding.nsi +++ b/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. diff --git a/other-licenses/branding/thunderbird/configure.sh b/other-licenses/branding/thunderbird/configure.sh new file mode 100644 index 00000000000..f0718c97baa --- /dev/null +++ b/other-licenses/branding/thunderbird/configure.sh @@ -0,0 +1 @@ +MOZ_APP_DISPLAYNAME=Thunderbird