Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #241003 --> add initial plumbing for the new thunderbird branding arwork.

Browse Source 
Does not effect the seamonkey build.


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_7_BRANCH@155144 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scott%scott-macgregor.org
2004-04-19 19:34:56 +00:00
parent 949d24c020
commit 8edd7b09d6
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/Makefile.in
View File

@@ -199,6 +199,12 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
tier_9_dirs += xpfe/bootstrap/appleevents
endif
ifdef THUNDERBIRD
ifdef MOZ_USE_OFFICIAL_BRANDING
tier_9_dirs += other-licenses/branding/thunderbird
endif
endif
ifdef MOZ_PHOENIX
ifdef MOZ_USE_OFFICIAL_BRANDING
tier_9_dirs += other-licenses/branding/firefox

10
mozilla/allmakefiles.sh
View File

@@ -848,7 +848,12 @@ extensions/typeaheadfind/Makefile
"
if [ "$MOZ_USE_OFFICIAL_BRANDING" ]; then
MAKEFILES_firefox_branding="other-licenses/branding/firefox/Makefile"
if [ "$MOZ_PHOENIX" ]; then
MAKEFILES_firefox_branding="other-licenses/branding/firefox/Makefile"
fi
if [ "$MOZ_THUNDERBIRD" ]; then
MAKEFILES_thunderbird_branding="other-licenses/branding/thunderbird/Makefile"
fi
fi
MAKEFILES_phoenix="
@@ -1448,6 +1453,9 @@ if test -n "$MOZ_XUL_APP"; then
fi
if test -n "$MOZ_THUNDERBIRD"; then
if test -n "$MOZ_USE_OFFICIAL_BRANDING"; then
add_makefiles "$MAKEFILES_thunderbird_branding"
fi
add_makefiles "$MAKEFILES_thunderbird"
fi

4
mozilla/client.mk
View File

@@ -405,7 +405,9 @@ ifdef MAIL_CO_TAG
MAIL_CO_FLAGS := $(MAIL_CO_FLAGS) -r $(MAIL_CO_TAG)
endif
CVSCO_THUNDERBIRD := $(CVS) $(CVS_FLAGS) co $(MAIL_CO_FLAGS) $(CVS_CO_DATE_FLAGS) mozilla/mail
MAIL_CO_DIRS := mozilla/mail mozilla/other-licenses/branding/thunderbird
CVSCO_THUNDERBIRD := $(CVS) $(CVS_FLAGS) co $(MAIL_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(MAIL_CO_DIRS)
ifdef MOZ_THUNDERBIRD
FASTUPDATE_THUNDERBIRD := fast_update $(CVSCO_THUNDERBIRD)
CHECKOUT_THUNDERBIRD := cvs_co $(CVSCO_THUNDERBIRD)