зеркало из https://github.com/mozilla/gecko-dev.git
Split XUL layers (xpfe & toolkit) into a separate tier class.
Make the history component its own module. Bug #107302 r=bryner sr=leaf
This commit is contained in:
cls%seawood.org
Родитель
a360819fa4
Коммит
44e9eecf91
64
Makefile.in
64
Makefile.in
|
|
@ -42,6 +42,13 @@ default: $(SUBMAKEFILES)
|
|||
$(MAKE) tier_1
|
||||
$(MAKE) tier_2
|
||||
$(MAKE) tier_9
|
||||
$(MAKE) tier_50
|
||||
ifdef MOZ_XPINSTALL
|
||||
$(MAKE) tier_90
|
||||
endif
|
||||
ifdef MOZ_JSDEBUGGER
|
||||
$(MAKE) tier_93
|
||||
endif
|
||||
ifdef MOZ_EXTENSIONS
|
||||
$(MAKE) tier_94
|
||||
endif
|
||||
|
|
@ -62,12 +69,19 @@ DIRS = \
|
|||
$(tier_1_dirs) \
|
||||
$(tier_2_dirs) \
|
||||
$(tier_9_dirs) \
|
||||
$(tier_50_dirs) \
|
||||
$(NULL)
|
||||
|
||||
ifdef GC_LEAK_DETECTOR
|
||||
DIRS += gc/boehm
|
||||
endif
|
||||
|
||||
ifdef MOZ_XPINSTALL
|
||||
DIRS += $(tier_90_dirs)
|
||||
endif
|
||||
ifdef MOZ_JSDEBUGGER
|
||||
DIRS += $(tier_93_dirs)
|
||||
endif
|
||||
ifdef MOZ_EXTENSIONS
|
||||
DIRS += $(tier_94_dirs)
|
||||
endif
|
||||
|
|
@ -151,10 +165,6 @@ tier_9_dirs += \
|
|||
$(NULL)
|
||||
endif
|
||||
|
||||
ifdef MOZ_JSDEBUGGER
|
||||
tier_9_dirs += js/jsd
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_XLIB
|
||||
tier_9_dirs += gfx/src/xlibrgb widget/src/xlibxtbin
|
||||
endif
|
||||
|
|
@ -197,7 +207,18 @@ tier_9_dirs += \
|
|||
profile \
|
||||
embedding \
|
||||
editor \
|
||||
themes \
|
||||
$(NULL)
|
||||
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
tier_9_dirs += xpfe/bootstrap/appleevents
|
||||
endif
|
||||
|
||||
tier_9_dirs += \
|
||||
xpfe/appshell \
|
||||
xpfe/browser/public \
|
||||
xpfe/components/history/public \
|
||||
xpfe/components/sidebar/public \
|
||||
xpfe/components/xremote/public \
|
||||
$(NULL)
|
||||
|
||||
ifdef ACCESSIBILITY
|
||||
|
|
@ -208,42 +229,45 @@ ifdef MOZ_LDAP_XPCOM
|
|||
tier_9_dirs += directory/xpcom
|
||||
endif
|
||||
|
||||
#
|
||||
# tier 50 - xpfe & toolkit
|
||||
#
|
||||
|
||||
# This must preceed xpfe
|
||||
ifdef MOZ_JPROF
|
||||
tier_9_dirs += tools/jprof
|
||||
tier_50_dirs += tools/jprof
|
||||
endif
|
||||
|
||||
tier_9_dirs += xpfe
|
||||
|
||||
ifdef MOZ_XPINSTALL
|
||||
tier_9_dirs += xpinstall
|
||||
endif
|
||||
tier_50_dirs += xpfe themes
|
||||
|
||||
ifdef MOZ_LEAKY
|
||||
tier_9_dirs += tools/leaky
|
||||
tier_50_dirs += tools/leaky
|
||||
endif
|
||||
|
||||
ifdef MOZ_MAPINFO
|
||||
tier_9_dirs += tools/codesighs
|
||||
tier_50_dirs += tools/codesighs
|
||||
endif
|
||||
|
||||
ifneq (,$(MOZ_L10N_LANG)$(MOZ_L10N_TOOLS))
|
||||
tier_9_dirs += l10n
|
||||
tier_50_dirs += l10n
|
||||
endif
|
||||
|
||||
ifdef MOZ_XUL_APP
|
||||
tier_9_dirs += toolkit
|
||||
endif
|
||||
|
||||
ifdef MOZ_PHOENIX
|
||||
# remove this when bug 201821 is fixed
|
||||
tier_9_dirs += browser/components/bookmarks/public
|
||||
tier_50_dirs += toolkit
|
||||
endif
|
||||
|
||||
#
|
||||
# tier 9x - application features
|
||||
#
|
||||
|
||||
ifdef MOZ_XPINSTALL
|
||||
tier_90_dirs += xpinstall
|
||||
endif
|
||||
|
||||
ifdef MOZ_JSDEBUGGER
|
||||
tier_93_dirs += js/jsd
|
||||
endif
|
||||
|
||||
ifdef MOZ_EXTENSIONS
|
||||
tier_94_dirs += extensions
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -694,10 +694,14 @@ xpfe/components/console/Makefile
|
|||
xpfe/components/resetPref/Makefile
|
||||
xpfe/components/killAll/Makefile
|
||||
xpfe/components/build/Makefile
|
||||
xpfe/components/xremote/Makefile
|
||||
xpfe/components/xremote/public/Makefile
|
||||
xpfe/components/xremote/src/Makefile
|
||||
xpfe/appshell/Makefile
|
||||
xpfe/appshell/src/Makefile
|
||||
xpfe/appshell/public/Makefile
|
||||
xpfe/bootstrap/Makefile
|
||||
xpfe/bootstrap/appleevents/Makefile
|
||||
xpfe/browser/Makefile
|
||||
xpfe/browser/src/Makefile
|
||||
xpfe/browser/resources/Makefile
|
||||
|
|
|
|||
|
|
@ -63,14 +63,9 @@ REQUIRES = xpcom \
|
|||
composer \
|
||||
commandhandler \
|
||||
editor \
|
||||
history \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_PHOENIX
|
||||
REQUIRES += history
|
||||
else
|
||||
REQUIRES += appcomps
|
||||
endif
|
||||
|
||||
XPIDLSRCS = \
|
||||
nsCDocShell.idl \
|
||||
nsCDefaultURIFixup.idl \
|
||||
|
|
|
|||
|
|
@ -52,9 +52,7 @@ REQUIRES = xpcom \
|
|||
composer \
|
||||
editor \
|
||||
commandhandler \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES += \
|
||||
history \
|
||||
uriloader \
|
||||
exthandler \
|
||||
helperAppDlg \
|
||||
|
|
@ -67,12 +65,6 @@ ifeq ($(OS_ARCH),WINNT)
|
|||
EXTRA_DSO_LIBS = gkgfx
|
||||
endif
|
||||
|
||||
ifdef MOZ_PHOENIX
|
||||
REQUIRES += history
|
||||
else
|
||||
REQUIRES += appcomps
|
||||
endif
|
||||
|
||||
CPPSRCS = \
|
||||
nsDocShellModule.cpp \
|
||||
$(NULL)
|
||||
|
|
|
|||
|
|
@ -63,10 +63,11 @@ REQUIRES = xpcom \
|
|||
uconv \
|
||||
windowwatcher \
|
||||
appcomps \
|
||||
history \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_PHOENIX
|
||||
REQUIRES += toolkitcomps history
|
||||
REQUIRES += toolkitcomps
|
||||
endif
|
||||
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
|
|
|
|||
|
|
@ -26,11 +26,7 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = appshell browser components/shistory communicator global
|
||||
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
DIRS := bootstrap/appleevents $(DIRS)
|
||||
endif
|
||||
DIRS = browser components/shistory communicator global
|
||||
|
||||
# Because of our great use of encapsulation, there are
|
||||
# some header file in xpfe/components that are required
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public src samples resources
|
||||
DIRS = src samples resources
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ REQUIRES = xpcom \
|
|||
appcomps \
|
||||
webbrwsr \
|
||||
windowwatcher \
|
||||
history \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_PHOENIX
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public src
|
||||
DIRS = src
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = appcomps
|
||||
MODULE = history
|
||||
XPIDL_MODULE = history
|
||||
GRE_MODULE = 1
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = appcomps
|
||||
MODULE = history
|
||||
LIBRARY_NAME = history_s
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
|
@ -37,6 +37,7 @@ REQUIRES = xpcom \
|
|||
intl \
|
||||
unicharutil \
|
||||
uconv \
|
||||
appcomps \
|
||||
$(NULL)
|
||||
|
||||
CPPSRCS = nsGlobalHistory.cpp \
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public src
|
||||
DIRS = src
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,6 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public src
|
||||
DIRS = src
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче