зеркало из https://github.com/mozilla/pjs.git
Bug 269460 - Build system for easy replacement of trademarked names --with-branding=directory r=chase a=shaver
This commit is contained in:
bsmedberg%covad.net
Родитель
2b48dc4a64
Коммит
a7722c1a38
34
Makefile.in
34
Makefile.in
|
|
@ -339,10 +339,11 @@ ifneq (,$(filter browser suite,$(MOZ_BUILD_APP)))
|
|||
tier_99_dirs += xpfe/components/search
|
||||
endif
|
||||
|
||||
ifdef MOZ_PHOENIX
|
||||
ifdef MOZ_USE_OFFICIAL_BRANDING
|
||||
tier_99_dirs += other-licenses/branding/firefox
|
||||
ifdef MOZ_BRANDING_DIRECTORY
|
||||
tier_99_dirs += $(MOZ_BRANDING_DIRECTORY)
|
||||
endif
|
||||
|
||||
ifdef MOZ_PHOENIX
|
||||
tier_99_dirs += browser xpfe/bootstrap/init.d
|
||||
endif
|
||||
|
||||
|
|
@ -355,9 +356,6 @@ tier_99_dirs += editor/ui
|
|||
endif
|
||||
|
||||
ifdef MOZ_THUNDERBIRD
|
||||
ifdef MOZ_USE_OFFICIAL_BRANDING
|
||||
tier_99_dirs += other-licenses/branding/thunderbird
|
||||
endif
|
||||
tier_99_dirs += mail xpfe/bootstrap/init.d
|
||||
endif
|
||||
|
||||
|
|
@ -485,11 +483,14 @@ endif
|
|||
|
||||
# Map mozilla targets to standard automake target
|
||||
ifdef MOZ_ENABLE_LIBXUL
|
||||
tier_50:
|
||||
tier_50: $(addsuffix /Makefile, $(filter-out $(STATIC_MAKEFILES), $($@_dirs)))
|
||||
@echo "tier_50: $(tier_50_dirs)"
|
||||
@$(EXIT_ON_ERROR) \
|
||||
for d in $(tier_50_dirs); do \
|
||||
$(UPDATE_TITLE) \
|
||||
if test ! -f $$d/Makefile; then \
|
||||
$(PERL) $(AUTOCONF_TOOLS)/make-makefile -t $(topsrcdir) -d $(DEPTH) $(CYGWIN_TOPSRCDIR) $$d/Makefile; \
|
||||
fi; \
|
||||
$(MAKE) -C $$d export; \
|
||||
done ; \
|
||||
for d in $(tier_50_dirs); do \
|
||||
|
|
@ -504,15 +505,20 @@ tier_50:
|
|||
done;
|
||||
endif
|
||||
|
||||
tier_%:
|
||||
tier_%:
|
||||
@echo "$@: $($@_dirs)"
|
||||
@$(EXIT_ON_ERROR) \
|
||||
for d in $($@_dirs); do $(UPDATE_TITLE) \
|
||||
$(MAKE) -C $$d export; \
|
||||
done ; \
|
||||
for d in $($@_dirs); do $(UPDATE_TITLE) \
|
||||
$(MAKE) -C $$d libs; \
|
||||
done
|
||||
for d in $($@_dirs); do \
|
||||
$(UPDATE_TITLE) \
|
||||
if test ! -f $$d/Makefile; then \
|
||||
$(PERL) $(AUTOCONF_TOOLS)/make-makefile -t $(topsrcdir) -d $(DEPTH) $(CYGWIN_TOPSRCDIR) $$d/Makefile; \
|
||||
fi; \
|
||||
$(MAKE) -C $$d export; \
|
||||
done ; \
|
||||
for d in $($@_dirs); do $(UPDATE_TITLE) \
|
||||
$(MAKE) -C $$d libs; \
|
||||
done
|
||||
|
||||
#
|
||||
# Individual modules
|
||||
#
|
||||
|
|
|
|||
|
|
@ -887,18 +887,6 @@ extensions/typeaheadfind/src/Makefile
|
|||
extensions/typeaheadfind/Makefile
|
||||
"
|
||||
|
||||
MAKEFILES_firefox_branding="
|
||||
other-licenses/branding/firefox/Makefile
|
||||
other-licenses/branding/firefox/content/Makefile
|
||||
other-licenses/branding/firefox/locales/Makefile
|
||||
"
|
||||
|
||||
MAKEFILES_thunderbird_branding="
|
||||
other-licenses/branding/thunderbird/Makefile
|
||||
other-licenses/branding/thunderbird/content/Makefile
|
||||
other-licenses/branding/thunderbird/locales/Makefile
|
||||
"
|
||||
|
||||
MAKEFILES_phoenix="
|
||||
browser/Makefile
|
||||
browser/app/Makefile
|
||||
|
|
@ -1636,9 +1624,6 @@ 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
|
||||
|
||||
|
|
@ -1655,9 +1640,6 @@ if test -n "$MOZ_XULRUNNER"; 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
|
||||
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@ install::
|
|||
endif
|
||||
|
||||
export::
|
||||
ifndef MOZ_USE_OFFICIAL_BRANDING
|
||||
ifndef MOZ_BRANDING_DIRECTORY
|
||||
$(NSINSTALL) -D $(DIST)/branding
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
cp $(srcdir)/firefox.ico $(DIST)/branding/firefox.ico
|
||||
|
|
|
|||
|
|
@ -48,15 +48,15 @@ include $(topsrcdir)/config/rules.mk
|
|||
|
||||
DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION)
|
||||
|
||||
ifdef MOZ_USE_OFFICIAL_BRANDING
|
||||
DEFINES += -DMOZ_USE_OFFICIAL_BRANDING
|
||||
ifndef MOZ_BRANDING_DIRECTORY
|
||||
DEFINES += -DMOZ_USE_GENERIC_BRANDING
|
||||
endif
|
||||
|
||||
ifneq (,$(filter windows gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
|
||||
DEFINES += -DHAVE_SHELL_SERVICE=1
|
||||
endif
|
||||
|
||||
ifndef MOZ_USE_OFFICIAL_BRANDING
|
||||
ifndef MOZ_BRANDING_DIRECTORY
|
||||
libs locale::
|
||||
$(INSTALL) $(srcdir)/content/browserconfig.properties $(DIST)/bin
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ browser.jar:
|
|||
* content/browser/jsConsoleOverlay.xul (content/jsConsoleOverlay.xul)
|
||||
#endif
|
||||
* content/browser/viewSourceOverlay.xul (content/viewSourceOverlay.xul)
|
||||
#ifndef MOZ_USE_OFFICIAL_BRANDING
|
||||
#ifdef MOZ_USE_GENERIC_BRANDING
|
||||
% content branding %content/branding/ xpcnativewrappers=yes
|
||||
content/branding/about.png (branding/about.png)
|
||||
content/branding/aboutCredits.png (branding/aboutCredits.png)
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ installer:
|
|||
$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) -I$(topsrcdir)/browser/locales/$(AB_CD)/installer/installer.inc $(srcdir)/$$i > instgen/$$i; \
|
||||
done
|
||||
$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) -I$(topsrcdir)/browser/locales/$(AB_CD)/defines.inc $(srcdir)/ab-CD.jst > instgen/$(AB_CD).jst
|
||||
ifndef MOZ_USE_OFFICIAL_BRANDING
|
||||
ifndef MOZ_BRANDING_DIRECTORY
|
||||
$(NSINSTALL) -D $(DIST)/install
|
||||
cp $(srcdir)/header.png $(DIST)/install/header.png
|
||||
cp $(srcdir)/watermark.png $(DIST)/install/watermark.png
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ installer:
|
|||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
export::
|
||||
ifndef MOZ_USE_OFFICIAL_BRANDING
|
||||
ifndef MOZ_BRANDING_DIRECTORY
|
||||
$(NSINSTALL) -D $(DIST)/branding
|
||||
cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp
|
||||
cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp
|
||||
|
|
|
|||
|
|
@ -59,8 +59,8 @@ DEFINES += \
|
|||
-DPKG_BASENAME=$(PKG_BASENAME) \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_USE_OFFICIAL_BRANDING
|
||||
DEFINES += -DMOZ_USE_OFFICIAL_BRANDING
|
||||
ifndef MOZ_BRANDING_DIRECTORY
|
||||
DEFINES += -DMOZ_USE_GENERIC_BRANDING
|
||||
endif
|
||||
|
||||
ifeq (,$(filter-out pref,$(MOZ_EXTENSIONS)))
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@
|
|||
<!ENTITY historySidebarCmd.accesskey "s">
|
||||
<!ENTITY historySidebarCmd.commandKey "h">
|
||||
|
||||
<!ENTITY toolsMenu.label "Tools">
|
||||
<!ENTITY toolsMenu.label "工具">
|
||||
<!ENTITY toolsMenu.accesskey "T">
|
||||
|
||||
<!ENTITY keywordfield.label "Add a Keyword for this Search...">
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
locale/browser/help/tabbed_browsing.xhtml (%chrome/help/tabbed_browsing.xhtml)
|
||||
locale/browser/help/glossary.xhtml (%chrome/help/glossary.xhtml)
|
||||
locale/browser/help/firebird-glossary.rdf (%chrome/help/firebird-glossary.rdf)
|
||||
#ifndef MOZ_USE_OFFICIAL_BRANDING
|
||||
#ifdef MOZ_USE_GENERIC_BRANDING
|
||||
% locale branding @AB_CD@ %locale/branding/
|
||||
locale/branding/brand.dtd (%chrome/branding/brand.dtd)
|
||||
locale/branding/brand.properties (%chrome/branding/brand.properties)
|
||||
|
|
|
|||
|
|
@ -116,7 +116,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@
|
||||
MOZ_BRANDING_DIRECTORY = @MOZ_BRANDING_DIRECTORY@
|
||||
XPCOM_USE_LEA = @XPCOM_USE_LEA@
|
||||
JS_ULTRASPARC_OPTS = @JS_ULTRASPARC_OPTS@
|
||||
MOZ_ENABLE_POSTSCRIPT = @MOZ_ENABLE_POSTSCRIPT@
|
||||
|
|
|
|||
22
configure.in
22
configure.in
|
|
@ -4067,16 +4067,32 @@ MOZ_ARG_DISABLE_BOOL(ldap,
|
|||
dnl ========================================================
|
||||
dnl = Trademarked Branding
|
||||
dnl ========================================================
|
||||
MOZ_BRANDING_DIRECTORY=
|
||||
MOZ_ARG_ENABLE_BOOL(official-branding,
|
||||
[ --enable-official-branding Enable Official mozilla.org Branding
|
||||
Do not distribute builds with
|
||||
--enable-official-branding unless you have
|
||||
permission to use trademarks per
|
||||
http://www.mozilla.org/foundation/trademarks/ .],
|
||||
MOZ_USE_OFFICIAL_BRANDING=1,
|
||||
MOZ_USE_OFFICIAL_BRANDING= )
|
||||
[case "$MOZ_BUILD_APP" in
|
||||
browser)
|
||||
MOZ_BRANDING_DIRECTORY=other-licenses/branding/firefox
|
||||
;;
|
||||
|
||||
AC_SUBST(MOZ_USE_OFFICIAL_BRANDING)
|
||||
mail)
|
||||
MOZ_BRANDING_DIRECTORY=other-licenses/branding/thunderbird
|
||||
;;
|
||||
|
||||
*)]
|
||||
AC_MSG_ERROR([Official branding is only available for Firefox and Thunderbird.])
|
||||
esac
|
||||
)
|
||||
|
||||
MOZ_ARG_WITH_STRING(branding,
|
||||
[ --enable-branding Enable branding from the specified directory.],
|
||||
MOZ_BRANDING_DIRECTORY=$withval)
|
||||
|
||||
AC_SUBST(MOZ_BRANDING_DIRECTORY)
|
||||
|
||||
# Rebrand Firefox as DeerPark for unofficial builds.
|
||||
if test -z "$MOZ_USE_OFFICIAL_BRANDING" && test "$MOZ_BUILD_APP" = "browser"; then
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ install::
|
|||
endif
|
||||
|
||||
export::
|
||||
ifndef MOZ_USE_OFFICIAL_BRANDING
|
||||
ifndef MOZ_BRANDING_DIRECTORY
|
||||
$(NSINSTALL) -D $(DIST)/branding
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
cp $(srcdir)/thunderbird.ico $(DIST)/branding/thunderbird.ico
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION)
|
||||
|
||||
ifdef MOZ_USE_OFFICIAL_BRANDING
|
||||
DEFINES += -DMOZ_USE_OFFICIAL_BRANDING
|
||||
ifndef MOZ_USE_OFFICIAL_BRANDING
|
||||
DEFINES += -DMOZ_USE_GENERIC_BRANDING
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ messenger.jar:
|
|||
content/messenger/startpage-gecko.png (content/startpage-gecko.png)
|
||||
content/messenger/messenger.css (content/messenger.css)
|
||||
* content/messenger/search.xml (content/search.xml)
|
||||
#ifndef MOZ_USE_OFFICIAL_BRANDING
|
||||
#ifndef MOZ_USE_GENERIC_BRANDING
|
||||
% content branding %content/branding/ xpcnativewrappers=yes
|
||||
content/branding/about-credits.png (content/about-credits.png)
|
||||
content/branding/about-thunderbird.png (content/about-thunderbird.png)
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ installer:
|
|||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
export::
|
||||
ifndef MOZ_USE_OFFICIAL_BRANDING
|
||||
ifndef MOZ_BRANDING_DIRECTORY
|
||||
$(NSINSTALL) -D $(DIST)/branding
|
||||
cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp
|
||||
cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp
|
||||
|
|
|
|||
|
|
@ -58,8 +58,8 @@ DEFINES += \
|
|||
-DPKG_BASENAME=$(PKG_BASENAME) \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_USE_OFFICIAL_BRANDING
|
||||
DEFINES += -DMOZ_USE_OFFICIAL_BRANDING
|
||||
ifndef MOZ_USE_OFFICIAL_BRANDING
|
||||
DEFINES += -DMOZ_USE_GENERIC_BRANDING
|
||||
endif
|
||||
|
||||
PREF_JS_EXPORTS = $(LOCALE_SRCDIR)/all-l10n.js
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@
|
|||
locale/@AB_CD@/navigator-platform/unix/navigator.properties (%chrome/navigator-platform/unix/navigator.properties)
|
||||
+ locale/@AB_CD@/global/charset.dtd (%chrome/global/charset.dtd)
|
||||
locale/@AB_CD@/global-platform/win/nsWindowsHooks.properties (%chrome/global-platform/win/nsWindowsHooks.properties)
|
||||
#ifndef MOZ_USE_OFFICIAL_BRANDING
|
||||
#ifndef MOZ_USE_GENERIC_BRANDING
|
||||
% locale branding @AB_CD@ %locale/@AB_CD@/branding/
|
||||
locale/@AB_CD@/branding/brand.properties (%chrome/branding/brand.properties)
|
||||
* locale/@AB_CD@/branding/brand.dtd (%chrome/branding/brand.dtd)
|
||||
|
|
|
|||
|
|
@ -281,7 +281,6 @@ endif
|
|||
# $(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)/xulrunner.ico $(DIST)/branding/xulrunner.ico
|
||||
|
|
@ -301,7 +300,6 @@ ifeq ($(OS_ARCH),OS2)
|
|||
cp $(srcdir)/xulrunner-os2.ico $(DIST)/branding/app.ico
|
||||
cp $(srcdir)/document-os2.ico $(DIST)/branding/document.ico
|
||||
endif
|
||||
endif
|
||||
|
||||
libs::
|
||||
touch $(DIST)/bin/.autoreg
|
||||
|
|
|
|||
|
|
@ -52,11 +52,9 @@ SRC_DIR=$(shell cd $(topsrcdir) && pwd)
|
|||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
export::
|
||||
ifndef MOZ_USE_OFFICIAL_BRANDING
|
||||
$(NSINSTALL) -D $(DIST)/branding
|
||||
cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp
|
||||
cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp
|
||||
endif
|
||||
|
||||
# Create a manifest for use with codesighs, by stripping "bin/" off of the
|
||||
# beginning of lines in the packages file.
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче