Part of
Bug 443351 Move all of Thunderbird's unofficial/nightly branding items into mail/branding/nightly - icons, images and more. r=mkmelin
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -287,39 +287,16 @@ endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
libs::
$(INSTALL) $(DIST)/branding/default.xpm $(DIST)/bin/chrome/icons/default
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)|" \
-e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@
chmod +x $@
libs:: thunderbird
$(INSTALL) $< $(DIST)/bin
--- a/mail/base/Makefile.in
+++ b/mail/base/Makefile.in
@@ -43,17 +43,13 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION)
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
include $(topsrcdir)/config/rules.mk
--- a/mail/branding/nightly/Makefile.in
+++ b/mail/branding/nightly/Makefile.in
@@ -46,8 +46,31 @@ include $(DEPTH)/config/autoconf.mk
DIRS = \
locales \
$(NULL)
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
rename from mail/app/macbuild/background.png
rename to mail/branding/nightly/background.png
rename from mail/installer/windows/nsis/branding.nsi
rename to mail/branding/nightly/branding.nsi
rename from mail/app/default.xpm
rename to mail/branding/nightly/default.xpm
rename from mail/app/macbuild/disk.icns
rename to mail/branding/nightly/disk.icns
rename from mail/app/macbuild/dsstore
rename to mail/branding/nightly/dsstore
rename from mail/app/macbuild/license.r
rename to mail/branding/nightly/license.r
rename from mail/app/mozicon16.xpm
rename to mail/branding/nightly/mozicon16.xpm
rename from mail/app/mozicon50.xpm
rename to mail/branding/nightly/mozicon50.xpm
rename from mail/app/macbuild/thunderbird.icns
rename to mail/branding/nightly/thunderbird.icns
rename from mail/app/thunderbird.ico
rename to mail/branding/nightly/thunderbird.ico
rename from mail/installer/windows/wizHeader.bmp
rename to mail/branding/nightly/wizHeader.bmp
rename from mail/installer/windows/wizHeaderRTL.bmp
rename to mail/branding/nightly/wizHeaderRTL.bmp
rename from mail/installer/windows/wizWatermark.bmp
rename to mail/branding/nightly/wizWatermark.bmp
--- a/mail/installer/windows/Makefile.in
+++ b/mail/installer/windows/Makefile.in
@@ -111,18 +111,8 @@ uninstaller::
$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl -Fsubstitution $(DEFINES) $(ACDEFINES) \
$(srcdir)/nsis/defines.nsi.in > $(CONFIG_DIR)/defines.nsi
$(PERL) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.pl \
$(topsrcdir) $(call EXPAND_LOCALE_SRCDIR,mail/locales)/installer $(AB_CD) \
$(WIN_INSTALLER_CHARSET) $(CONFIG_DIR)
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
-
--- a/other-licenses/branding/thunderbird/Makefile.in
+++ b/other-licenses/branding/thunderbird/Makefile.in
@@ -13,51 +13,51 @@ include $(DEPTH)/config/autoconf.mk
DIRS = \
locales \
$(NULL)
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
+# 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
- 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
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 ($(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
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
