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

@@ -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)|" \

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

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

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
-

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
-endif
+# 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
 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