Bug #237725 --> Use dist\branding as a staging area for branded artwork.

Copy generic branded icons out to dist\branding

During the install phase, use the icons in dist\branding instead of the ones in browser\app

sr=bryner

browser/app/Makefile.in

@@ -144,6 +144,8 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
+
 ifdef BUILD_STATIC_LIBS
 include $(topsrcdir)/config/static-rules.mk
 endif
@@ -198,6 +200,7 @@ endif
 endif
 
 ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
+
 firefox:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
 	cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
                 -e "s|%MOZ_USER_DIR%|.firefox|" \
@@ -217,9 +220,10 @@ GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js)
 endif
 
 ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
+
 ICON_FILES	= \
-		mozicon50.xpm \
-		mozicon16.xpm \
+		$(DIST)/branding/mozicon50.xpm \
+		$(DIST)/branding/mozicon16.xpm \
 		$(NULL)
 
 libs:: $(ICON_FILES)
@@ -230,16 +234,36 @@ install::
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-libs:: default.xpm
-	$(INSTALL) $^ $(DIST)/bin/chrome/icons/default
+libs::
+	$(INSTALL) $(DIST)/branding/default.xpm $(DIST)/bin/chrome/icons/default
 
-install:: default.xpm
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/icons
+install::
+	$(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default.xpm $(DESTDIR)$(mozappdir)/icons
 endif
 
 export:: brand.dtd.in
 	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > brand.dtd
 
+export::
+ifndef MOZ_USE_OFFICIAL_BRANDING
+	$(NSINSTALL) -D $(DIST)/branding
+ifeq ($(OS_ARCH),WINNT)
+	cp $(srcdir)/firefox.ico   $(DIST)/branding/firefox.ico
+	cp $(srcdir)/firefox.ico   $(DIST)/branding/app.ico
+	cp $(srcdir)/document.ico  $(DIST)/branding/document.ico
+endif
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+	cp $(srcdir)/macbuild/firefox.icns  $(DIST)/branding/firefox.icns
+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
+
 libs::
 	touch $(DIST)/bin/.autoreg
 
@@ -254,7 +278,7 @@ libs:: $(PROGRAM)
 	rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/MacOS
 	rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
 	rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
-	cp -RL $(srcdir)/macbuild/firefox.icns $(DIST)/$(APP_NAME).app/Contents/Resources/firefox.icns
+	cp -RL $(DIST)/branding/firefox.icns $(DIST)/$(APP_NAME).app/Contents/Resources/firefox.icns
 	echo -n APPLMOZB > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
 #       remove CVS dirs from packaged app
 	find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;

browser/app/splash.rc

@@ -41,9 +41,9 @@
 
 1 24 "firefox.exe.manifest"
 
-IDI_APPICON ICON "firefox.ico"
-IDI_DOCUMENT ICON "document.ico"
-IDI_APPLICATION ICON "firefox.ico"
+IDI_APPICON ICON FIREFOX_ICO
+IDI_DOCUMENT ICON DOCUMENT_ICO
+IDI_APPLICATION ICON FIREFOX_ICO
 
 STRINGTABLE DISCARDABLE
 BEGIN

mail/app/Makefile.in

@@ -42,6 +42,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+DEFINES += -DTHUNDERBIRD_ICO=\"$(DIST)/branding/mozilla.ico\"
+
 DIRS		= profile
 
 PREF_JS_EXPORTS = \
@@ -165,10 +167,29 @@ endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 libs::
-	$(INSTALL) $(srcdir)/default.xpm $(DIST)/bin/chrome/icons
+	$(INSTALL) $(DIST)/branding/default.xpm $(DIST)/bin/chrome/icons/default
 
 install::
-	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/default.xpm $(DESTDIR)$(mozappdir)/icons
+	$(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default.xpm $(DESTDIR)$(mozappdir)/icons
+endif
+
+export::
+ifndef MOZ_USE_OFFICIAL_BRANDING
+	$(NSINSTALL) -D $(DIST)/branding
+ifeq ($(OS_ARCH),WINNT)
+	cp $(srcdir)/mozilla.ico   $(DIST)/branding/mozilla.ico
+	cp $(srcdir)/mozilla.ico   $(DIST)/branding/app.ico
+endif
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+	cp $(srcdir)/macbuild/mach.icns  $(DIST)/branding/mach.icns
+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)))
@@ -191,8 +212,8 @@ endif
 
 ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
 ICON_FILES	= \
-		$(srcdir)/mozicon50.xpm \
-		$(srcdir)/mozicon16.xpm \
+		$(DIST)/branding/mozicon50.xpm \
+		$(DIST)/branding/mozicon16.xpm \
 		$(NULL)
 
 libs::
@@ -221,7 +242,7 @@ libs:: $(PROGRAM)
 	rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/MacOS
 	rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
 	rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
-	cp -RL $(srcdir)/macbuild/mach.icns $(DIST)/$(APP_NAME).app/Contents/Resources/mach.icns
+	cp -RL $(DIST)/branding/mach.icns $(DIST)/$(APP_NAME).app/Contents/Resources/mach.icns
 	echo -n APPLMOZM > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
 #       remove CVS dirs from packaged app
 	find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;

mail/app/splash.rc

@@ -50,8 +50,7 @@
 #define ID_DDE_APPLICATION_NAME 102
 
 // Program icon.
-IDI_APPLICATION ICON
-	"mozilla.ico"
+IDI_APPLICATION ICON THUNDERBIRD_ICO
 
 // Splash screen dialog.
 IDD_SPLASH DIALOGEX