237596 - add --enable-official-branding for Firefox which builds official artwork. r=bryner

Makefile.in

@@ -320,6 +320,9 @@ endif
 endif # MOZ_COMPONENTLIB
 
 ifdef MOZ_PHOENIX
+ifdef MOZ_USE_OFFICIAL_BRANDING
+tire_99_dirs  += other-licenses/branding/firefox
+endif
 tier_99_dirs	+= browser xpfe/bootstrap/init.d
 endif
 

allmakefiles.sh

@@ -847,6 +847,10 @@ extensions/typeaheadfind/src/Makefile
 extensions/typeaheadfind/Makefile
 "
 
+if [ "$MOZ_USE_OFFICIAL_BRANDING" ]; then
+    MAKEFILES_firefox_branding="other-licenses/branding/firefox/Makefile"
+fi
+
 MAKEFILES_phoenix="
 browser/Makefile
 browser/app/Makefile
@@ -1422,6 +1426,9 @@ if test -n "$MOZ_CALENDAR"; then
 fi
 
 if test -n "$MOZ_PHOENIX"; then
+    if test -n "$MOZ_USE_OFFICIAL_BRANDING"; then
+        add_makefiles "$MAKEFILES_firefox_branding"
+    fi
     add_makefiles "$MAKEFILES_phoenix"
 fi
 

client.mk

@@ -380,7 +380,9 @@ ifdef BROWSER_CO_TAG
   BROWSER_CO_FLAGS := $(BROWSER_CO_FLAGS) -r $(BROWSER_CO_TAG)
 endif
 
-CVSCO_PHOENIX := $(CVS) $(CVS_FLAGS) co $(BROWSER_CO_FLAGS) $(CVS_CO_DATE_FLAGS) mozilla/browser
+BROWSER_CO_DIRS := mozilla/browser mozilla/other-licenses/branding/firefox
+
+CVSCO_PHOENIX := $(CVS) $(CVS_FLAGS) co $(BROWSER_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(BROWSER_CO_DIRS)
 
 ifdef MOZ_PHOENIX
 FASTUPDATE_PHOENIX := fast_update $(CVSCO_PHOENIX)

config/autoconf.mk.in

@@ -98,6 +98,7 @@ MOZ_USE_NATIVE_UCONV = @MOZ_USE_NATIVE_UCONV@
 MOZ_SINGLE_PROFILE = @MOZ_SINGLE_PROFILE@
 MOZ_LDAP_XPCOM = @MOZ_LDAP_XPCOM@
 MOZ_LDAP_XPCOM_EXPERIMENTAL = @MOZ_LDAP_XPCOM_EXPERIMENTAL@
+MOZ_USE_OFFICIAL_BRANDING=@MOZ_USE_OFFICIAL_BRANDING@
 XPCOM_USE_LEA = @XPCOM_USE_LEA@
 JS_ULTRASPARC_OPTS = @JS_ULTRASPARC_OPTS@
 MOZ_ENABLE_POSTSCRIPT = @MOZ_ENABLE_POSTSCRIPT@

configure.in

@@ -3324,6 +3324,16 @@ MOZ_ARG_DISABLE_BOOL(ldap,
     MOZ_LDAP_XPCOM=,
     MOZ_LDAP_XPCOM=1)
 
+dnl ========================================================
+dnl = Trademarked Branding 
+dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(official-branding,
+[  --enable-official-branding    Enable Official Branding],
+    MOZ_USE_OFFICIAL_BRANDING=1,
+    MOZ_USE_OFFICIAL_BRANDING= )
+
+AC_SUBST(MOZ_USE_OFFICIAL_BRANDING)
+
 dnl ========================================================
 dnl = Phoenix
 dnl ========================================================

other-licenses/branding/firefox/Makefile.in

@@ -1,6 +1,7 @@
 # Branding Makefile
 #  - jars chrome artwork
-#  - copies winstaller artwork to objdir
+#  - copies artwork to appropriate places in objdir for bundling into app 
+#    resources
 
 DEPTH = ../../..
 topsrcdir = @top_srcdir@
@@ -11,11 +12,15 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
-firefox.ico: firefox.ico.in
-  $(INSTALL) $^ $(topsrcdir)/$(OBJDIR)/browser/app/
+export::
+	cp $(srcdir)/firefox.ico $(DEPTH)/browser/app/firefox.ico
+	cp $(srcdir)/firefox.ico $(DEPTH)/toolkit/mozapps/installer/windows/wizard/setuprsc/browser.ico
+	if [ ! -d $(DEPTH)/browser/app/macbuild ] ; then \
+		mkdir $(DEPTH)/browser/app/macbuild; \
+	fi
+	cp $(srcdir)/firefox.icns $(DEPTH)/browser/app/macbuild/firefox.icns
+	cp $(srcdir)/document.icns $(DEPTH)/browser/app/macbuild/document.icns
+	cp $(srcdir)/document.ico $(DEPTH)/browser/app/document.ico
+	cp $(srcdir)/Header.bmp $(DEPTH)/toolkit/mozapps/installer/windows/wizard/setuprsc/Header.bmp
+	cp $(srcdir)/Watermrk.bmp $(DEPTH)/toolkit/mozapps/installer/windows/wizard/setuprsc/Watermrk.bmp
 
-browser.ico: firefox.ico.in
-  $(INSTALL) $^ $(topsrcdir)/$(OBJDIR)/toolkit/mozapps/installer/wizard/windows/setuprsc/
-
-firefox.icns: firefox.icns.in
-  $(INSTALL) $^ $(topsrcdir)/$(OBJDIR)/browser/app/macbuild/