From 1482f44e8be33cce088d1c9240858842e882b0ca Mon Sep 17 00:00:00 2001 From: Mark Banner Date: Sat, 23 Aug 2008 19:29:11 +0100 Subject: [PATCH] Part of Bug 443351 Move all of Thunderbird's unofficial/nightly branding items into mail/branding/nightly - icons, images and more. r=mkmelin --HG-- rename : mail/app/macbuild/background.png => mail/branding/nightly/background.png rename : mail/installer/windows/nsis/branding.nsi => mail/branding/nightly/branding.nsi rename : mail/app/default.xpm => mail/branding/nightly/default.xpm rename : mail/app/macbuild/disk.icns => mail/branding/nightly/disk.icns rename : mail/app/macbuild/dsstore => mail/branding/nightly/dsstore rename : mail/app/macbuild/license.r => mail/branding/nightly/license.r rename : mail/app/mozicon16.xpm => mail/branding/nightly/mozicon16.xpm rename : mail/app/mozicon50.xpm => mail/branding/nightly/mozicon50.xpm rename : mail/app/macbuild/thunderbird.icns => mail/branding/nightly/thunderbird.icns rename : mail/app/thunderbird.ico => mail/branding/nightly/thunderbird.ico rename : mail/installer/windows/wizHeader.bmp => mail/branding/nightly/wizHeader.bmp rename : mail/installer/windows/wizHeaderRTL.bmp => mail/branding/nightly/wizHeaderRTL.bmp rename : mail/installer/windows/wizWatermark.bmp => mail/branding/nightly/wizWatermark.bmp --- mail/app/Makefile.in | 23 ------ mail/base/Makefile.in | 4 - mail/branding/nightly/Makefile.in | 23 ++++++ .../nightly}/background.png | Bin .../nsis => branding/nightly}/branding.nsi | 0 mail/{app => branding/nightly}/default.xpm | 0 .../macbuild => branding/nightly}/disk.icns | Bin .../macbuild => branding/nightly}/dsstore | Bin .../macbuild => branding/nightly}/license.r | 0 mail/{app => branding/nightly}/mozicon16.xpm | 0 mail/{app => branding/nightly}/mozicon50.xpm | 0 .../nightly}/thunderbird.icns | Bin .../{app => branding/nightly}/thunderbird.ico | Bin .../nightly}/wizHeader.bmp | Bin .../nightly}/wizHeaderRTL.bmp | Bin .../nightly}/wizWatermark.bmp | Bin mail/installer/windows/Makefile.in | 10 --- .../branding/thunderbird/Makefile.in | 70 +++++++++--------- 18 files changed, 58 insertions(+), 72 deletions(-) rename mail/{app/macbuild => branding/nightly}/background.png (100%) rename mail/{installer/windows/nsis => branding/nightly}/branding.nsi (100%) rename mail/{app => branding/nightly}/default.xpm (100%) rename mail/{app/macbuild => branding/nightly}/disk.icns (100%) rename mail/{app/macbuild => branding/nightly}/dsstore (100%) rename mail/{app/macbuild => branding/nightly}/license.r (100%) rename mail/{app => branding/nightly}/mozicon16.xpm (100%) rename mail/{app => branding/nightly}/mozicon50.xpm (100%) rename mail/{app/macbuild => branding/nightly}/thunderbird.icns (100%) rename mail/{app => branding/nightly}/thunderbird.ico (100%) rename mail/{installer/windows => branding/nightly}/wizHeader.bmp (100%) rename mail/{installer/windows => branding/nightly}/wizHeaderRTL.bmp (100%) rename mail/{installer/windows => branding/nightly}/wizWatermark.bmp (100%) diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in index 5ad9cfd6ef..4d329f22d5 100644 --- a/mail/app/Makefile.in +++ b/mail/app/Makefile.in @@ -292,29 +292,6 @@ install:: $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default.xpm $(DESTDIR)$(mozappdir)/chrome/icons/default endif -export:: -ifndef MOZ_BRANDING_DIRECTORY - $(NSINSTALL) -D $(DIST)/branding -ifeq ($(OS_ARCH),WINNT) - cp $(srcdir)/thunderbird.ico $(DIST)/branding/thunderbird.ico - cp $(srcdir)/thunderbird.ico $(DIST)/branding/app.ico -endif -ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) - cp $(srcdir)/macbuild/thunderbird.icns $(DIST)/branding/thunderbird.icns - cp $(srcdir)/macbuild/dsstore $(DIST)/branding/dsstore - cp $(srcdir)/macbuild/background.png $(DIST)/branding/background.png - cp $(srcdir)/macbuild/disk.icns $(DIST)/branding/disk.icns - cp $(srcdir)/macbuild/license.r $(DIST)/branding/license.r -endif -ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) - cp $(srcdir)/mozicon16.xpm $(DIST)/branding/mozicon16.xpm - cp $(srcdir)/mozicon50.xpm $(DIST)/branding/mozicon50.xpm -endif -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) - cp $(srcdir)/default.xpm $(DIST)/branding/default.xpm -endif -endif - ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH))) thunderbird:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \ diff --git a/mail/base/Makefile.in b/mail/base/Makefile.in index b4eaa9d576..078ffca5a1 100644 --- a/mail/base/Makefile.in +++ b/mail/base/Makefile.in @@ -48,10 +48,6 @@ ifneq (,$(filter windows gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT))) DEFINES += -DHAVE_SHELL_SERVICE=1 endif -ifndef MOZ_BRANDING_DIRECTORY -DEFINES += -DMOZ_USE_GENERIC_BRANDING -endif - ifeq (cocoa, $(MOZ_WIDGET_TOOLKIT)) DEFINES += -DTOOLBAR_CUSTOMIZATION_SHEET endif diff --git a/mail/branding/nightly/Makefile.in b/mail/branding/nightly/Makefile.in index 895a5da2c9..082b402dfe 100644 --- a/mail/branding/nightly/Makefile.in +++ b/mail/branding/nightly/Makefile.in @@ -51,3 +51,26 @@ DIRS = \ PREF_JS_EXPORTS += $(srcdir)/thunderbird-branding.js include $(topsrcdir)/config/rules.mk + +export:: + $(NSINSTALL) -D $(DIST)/branding +ifeq ($(OS_ARCH),WINNT) + cp $(srcdir)/thunderbird.ico $(DIST)/branding/thunderbird.ico + cp $(srcdir)/thunderbird.ico $(DIST)/branding/app.ico + cp $(srcdir)/branding.nsi $(DIST)/branding/branding.nsi + cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp + cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp + cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp +endif +ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) + cp $(srcdir)/background.png $(DIST)/branding/background.png + cp $(srcdir)/dsstore $(DIST)/branding/dsstore + cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns + cp $(srcdir)/license.r $(DIST)/branding/license.r + cp $(srcdir)/thunderbird.icns $(DIST)/branding/thunderbird.icns +endif +ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) + cp $(srcdir)/mozicon16.xpm $(DIST)/branding/mozicon16.xpm + cp $(srcdir)/mozicon50.xpm $(DIST)/branding/mozicon50.xpm + cp $(srcdir)/default.xpm $(DIST)/branding/default.xpm +endif diff --git a/mail/app/macbuild/background.png b/mail/branding/nightly/background.png similarity index 100% rename from mail/app/macbuild/background.png rename to mail/branding/nightly/background.png diff --git a/mail/installer/windows/nsis/branding.nsi b/mail/branding/nightly/branding.nsi similarity index 100% rename from mail/installer/windows/nsis/branding.nsi rename to mail/branding/nightly/branding.nsi diff --git a/mail/app/default.xpm b/mail/branding/nightly/default.xpm similarity index 100% rename from mail/app/default.xpm rename to mail/branding/nightly/default.xpm diff --git a/mail/app/macbuild/disk.icns b/mail/branding/nightly/disk.icns similarity index 100% rename from mail/app/macbuild/disk.icns rename to mail/branding/nightly/disk.icns diff --git a/mail/app/macbuild/dsstore b/mail/branding/nightly/dsstore similarity index 100% rename from mail/app/macbuild/dsstore rename to mail/branding/nightly/dsstore diff --git a/mail/app/macbuild/license.r b/mail/branding/nightly/license.r similarity index 100% rename from mail/app/macbuild/license.r rename to mail/branding/nightly/license.r diff --git a/mail/app/mozicon16.xpm b/mail/branding/nightly/mozicon16.xpm similarity index 100% rename from mail/app/mozicon16.xpm rename to mail/branding/nightly/mozicon16.xpm diff --git a/mail/app/mozicon50.xpm b/mail/branding/nightly/mozicon50.xpm similarity index 100% rename from mail/app/mozicon50.xpm rename to mail/branding/nightly/mozicon50.xpm diff --git a/mail/app/macbuild/thunderbird.icns b/mail/branding/nightly/thunderbird.icns similarity index 100% rename from mail/app/macbuild/thunderbird.icns rename to mail/branding/nightly/thunderbird.icns diff --git a/mail/app/thunderbird.ico b/mail/branding/nightly/thunderbird.ico similarity index 100% rename from mail/app/thunderbird.ico rename to mail/branding/nightly/thunderbird.ico diff --git a/mail/installer/windows/wizHeader.bmp b/mail/branding/nightly/wizHeader.bmp similarity index 100% rename from mail/installer/windows/wizHeader.bmp rename to mail/branding/nightly/wizHeader.bmp diff --git a/mail/installer/windows/wizHeaderRTL.bmp b/mail/branding/nightly/wizHeaderRTL.bmp similarity index 100% rename from mail/installer/windows/wizHeaderRTL.bmp rename to mail/branding/nightly/wizHeaderRTL.bmp diff --git a/mail/installer/windows/wizWatermark.bmp b/mail/branding/nightly/wizWatermark.bmp similarity index 100% rename from mail/installer/windows/wizWatermark.bmp rename to mail/branding/nightly/wizWatermark.bmp diff --git a/mail/installer/windows/Makefile.in b/mail/installer/windows/Makefile.in index e7b54857b7..1207d4a22c 100644 --- a/mail/installer/windows/Makefile.in +++ b/mail/installer/windows/Makefile.in @@ -116,13 +116,3 @@ $(CONFIG_DIR)/setup.exe:: include $(topsrcdir)/config/rules.mk include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/makensis.mk - -export:: -ifndef MOZ_BRANDING_DIRECTORY - $(NSINSTALL) -D $(DIST)/branding - cp $(srcdir)/nsis/branding.nsi $(DIST)/branding/branding.nsi - cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp - cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp - cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp -endif - diff --git a/other-licenses/branding/thunderbird/Makefile.in b/other-licenses/branding/thunderbird/Makefile.in index 280ffb297a..9031cca923 100644 --- a/other-licenses/branding/thunderbird/Makefile.in +++ b/other-licenses/branding/thunderbird/Makefile.in @@ -18,46 +18,46 @@ PREF_JS_EXPORTS = $(srcdir)/thunderbird-branding.js include $(topsrcdir)/config/rules.mk -MAIL_APP_FILES = \ - thunderbird.ico \ - default.xpm \ - mozicon16.xpm \ - mozicon50.xpm \ - $(NULL) - export:: $(NSINSTALL) -D $(DIST)/branding - cp $(addprefix $(srcdir)/, $(MAIL_APP_FILES)) $(DIST)/branding/ - if [ ! -d $(DEPTH)/mail/app/icons ] ; then \ - mkdir $(DEPTH)/mail/app/icons; \ - fi - if [ ! -d $(DEPTH)/mail/app/icons/windows ] ; then \ - mkdir $(DEPTH)/mail/app/icons/windows; \ - fi - cp $(srcdir)/thunderbird.ico $(DEPTH)/mail/app/icons/windows/messengerWindow.ico - if [ ! -d $(DEPTH)/mail/app/icons/gtk ] ; then \ - mkdir $(DEPTH)/mail/app/icons/gtk; \ - fi - cp $(srcdir)/mozicon50.xpm $(DEPTH)/mail/app/icons/gtk/messengerWindow.xpm - cp $(srcdir)/mozicon16.xpm $(DEPTH)/mail/app/icons/gtk/messengerWindow16.xpm - if [ ! -d $(DEPTH)/mail/app/icons/os2 ] ; then \ - mkdir $(DEPTH)/mail/app/icons/os2; \ - fi - cp $(srcdir)/thunderbird-os2.ico $(DEPTH)/mail/app/icons/os2/messengerWindow.ico -ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) - cp $(srcdir)/thunderbird.icns $(DIST)/branding/thunderbird.icns - cp $(srcdir)/dsstore $(DIST)/branding/dsstore - cp $(srcdir)/background.png $(DIST)/branding/background.png - cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns - cp $(srcdir)/license.r $(DIST)/branding/license.r +# Export items into the branding directory first +ifeq ($(OS_ARCH),WINNT) + cp $(srcdir)/thunderbird.ico $(DIST)/branding/thunderbird.ico + cp $(srcdir)/thunderbird.ico $(DIST)/branding/app.ico + cp $(srcdir)/branding.nsi $(DIST)/branding/branding.nsi + cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp + cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp + cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp +endif +ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) + cp $(srcdir)/background.png $(DIST)/branding/background.png + cp $(srcdir)/dsstore $(DIST)/branding/dsstore + cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns + cp $(srcdir)/license.r $(DIST)/branding/license.r + cp $(srcdir)/thunderbird.icns $(DIST)/branding/thunderbird.icns +endif +ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) + cp $(srcdir)/mozicon16.xpm $(DIST)/branding/mozicon16.xpm + cp $(srcdir)/mozicon50.xpm $(DIST)/branding/mozicon50.xpm + cp $(srcdir)/default.xpm $(DIST)/branding/default.xpm endif - cp $(srcdir)/thunderbird.ico $(DIST)/branding/app.ico - cp $(srcdir)/branding.nsi $(DIST)/branding/branding.nsi - cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp - cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp - cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp ifeq ($(OS_ARCH),OS2) cp $(srcdir)/thunderbird-os2.ico $(DIST)/branding/thunderbird.ico cp $(srcdir)/thunderbird-os2.ico $(DIST)/branding/app.ico endif +# Now sort out the branding specific icons + $(NSINSTALL) -D $(DIST)/mail/app/icons +ifeq ($(OS_ARCH),WINNT) + $(NSINSTALL) -D $(DIST)/mail/app/icons/windows + cp $(srcdir)/thunderbird.ico $(DEPTH)/mail/app/icons/windows/messengerWindow.ico +endif +ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) + $(NSINSTALL) -D $(DIST)/mail/app/icons/gtk + cp $(srcdir)/mozicon50.xpm $(DEPTH)/mail/app/icons/gtk/messengerWindow.xpm + cp $(srcdir)/mozicon16.xpm $(DEPTH)/mail/app/icons/gtk/messengerWindow16.xpm +endif +ifeq ($(OS_ARCH),OS2) + $(NSINSTALL) -D $(DIST)/mail/app/icons/os2 + cp $(srcdir)/thunderbird-os2.ico $(DEPTH)/mail/app/icons/os2/messengerWindow.ico +endif