Bug 552222 Drop MOZ_XPFE_COMPONENTS / --disable-xpfe-components. r=ted
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 23 Mar 2010 20:33:51 +0000
changeset 39748 1e0e12538211d97823b72e0343853eb98c48484b
parent 39747 de002015a6d3b3b322d7b62cfc1e89f76b31c569
child 39749 ee481095f7c27c6c871a5631477fbf63d0f70df7
push id12379
push userbugzilla@standard8.plus.com
push dateTue, 23 Mar 2010 20:35:06 +0000
treeherdermozilla-central@1e0e12538211 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs552222
milestone1.9.3a4pre
Bug 552222 Drop MOZ_XPFE_COMPONENTS / --disable-xpfe-components. r=ted
config/autoconf.mk.in
configure.in
toolkit/library/libxul-config.mk
toolkit/library/nsStaticXULComponents.cpp
toolkit/toolkit-makefiles.sh
toolkit/toolkit-tiers.mk
xpfe/Makefile.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -138,17 +138,16 @@ MOZ_UPDATER	= @MOZ_UPDATER@
 MOZ_UPDATE_PACKAGING	= @MOZ_UPDATE_PACKAGING@
 MOZ_NO_ACTIVEX_SUPPORT = @MOZ_NO_ACTIVEX_SUPPORT@
 MOZ_ACTIVEX_SCRIPTING_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@
 MOZ_DISABLE_VISTA_SDK_REQUIREMENTS = @MOZ_DISABLE_VISTA_SDK_REQUIREMENTS@
 MOZ_DISABLE_PARENTAL_CONTROLS = @MOZ_DISABLE_PARENTAL_CONTROLS@
 XPC_IDISPATCH_SUPPORT = @XPC_IDISPATCH_SUPPORT@
 NS_ENABLE_TSF = @NS_ENABLE_TSF@
 MOZ_SPELLCHECK = @MOZ_SPELLCHECK@
-MOZ_XPFE_COMPONENTS = @MOZ_XPFE_COMPONENTS@
 MOZ_PROFILELOCKING = @MOZ_PROFILELOCKING@
 MOZ_FEEDS = @MOZ_FEEDS@
 MOZ_TOOLKIT_SEARCH = @MOZ_TOOLKIT_SEARCH@
 MOZ_PLACES = @MOZ_PLACES@
 MOZ_PLACES_BOOKMARKS = @MOZ_PLACES_BOOKMARKS@
 MOZ_STORAGE = @MOZ_STORAGE@
 MOZ_SAFE_BROWSING = @MOZ_SAFE_BROWSING@
 MOZ_FASTSTART = @MOZ_FASTSTART@
--- a/configure.in
+++ b/configure.in
@@ -4744,17 +4744,16 @@ MOZ_STORAGE=1
 MOZ_SVG=1
 MOZ_TIMELINE=
 MOZ_TOOLKIT_SEARCH=1
 MOZ_UI_LOCALE=en-US
 MOZ_UNIVERSALCHARDET=1
 MOZ_URL_CLASSIFIER=
 MOZ_USE_NATIVE_UCONV=
 MOZ_VIEW_SOURCE=1
-MOZ_XPFE_COMPONENTS=1
 MOZ_XPINSTALL=1
 MOZ_XSLT_STANDALONE=
 MOZ_XTF=1
 MOZ_XUL=1
 MOZ_ZIPWRITER=1
 NS_PRINTING=1
 NECKO_WIFI=1
 NECKO_COOKIES=1
@@ -5563,25 +5562,16 @@ case "$target" in
     if test "$ac_cv_header_oleacc_idl" = "no"; then
         AC_MSG_ERROR([System header oleacc.idl is not available. See http://developer.mozilla.org/en/docs/oleacc.idl for details on fixing this problem.])
     fi
     ;;
 esac
 fi
 
 dnl ========================================================
-dnl xpfe/components on by default
-dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(xpfe-components,
-[  --disable-xpfe-components
-                          Disable xpfe components],
-    MOZ_XPFE_COMPONENTS=,
-    MOZ_XPFE_COMPONENTS=1 )
-
-dnl ========================================================
 dnl xpinstall support on by default
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(xpinstall,
 [  --disable-xpinstall     Disable xpinstall support],
     MOZ_XPINSTALL=,
     MOZ_XPINSTALL=1 )
 if test "$MOZ_XPINSTALL"; then
     AC_DEFINE(MOZ_XPINSTALL)
@@ -8276,17 +8266,16 @@ AC_SUBST(BUILD_STATIC_LIBS)
 AC_SUBST(MOZ_ENABLE_LIBXUL)
 AC_SUBST(ENABLE_TESTS)
 AC_SUBST(IBMBIDI)
 AC_SUBST(MOZ_UNIVERSALCHARDET)
 AC_SUBST(ACCESSIBILITY)
 AC_SUBST(MOZ_XPINSTALL)
 AC_SUBST(MOZ_VIEW_SOURCE)
 AC_SUBST(MOZ_SPELLCHECK)
-AC_SUBST(MOZ_XPFE_COMPONENTS)
 AC_SUBST(MOZ_USER_DIR)
 AC_SUBST(MOZ_CRASHREPORTER)
 
 AC_SUBST(ENABLE_STRIP)
 AC_SUBST(PKG_SKIP_STRIP)
 AC_SUBST(USE_ELF_DYNSTR_GC)
 AC_SUBST(INCREMENTAL_LINKER)
 AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS)
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -147,39 +147,33 @@ COMPONENT_LIBS += \
 	webbrwsr \
 	nsappshell \
 	txmgr \
 	chrome \
 	commandlines \
 	toolkitcomps \
 	pipboot \
 	pipnss \
+	mozfind \
+	appcomps \
 	$(NULL)
 
 ifdef BUILD_CTYPES
 COMPONENT_LIBS += \
 	jsctypes \
 	$(NULL)
 endif
 
 ifdef MOZ_PLUGINS
 DEFINES += -DMOZ_PLUGINS
 COMPONENT_LIBS += \
 	gkplugin \
 	$(NULL)
 endif
 
-ifdef MOZ_XPFE_COMPONENTS
-DEFINES += -DMOZ_XPFE_COMPONENTS
-COMPONENT_LIBS += \
-	mozfind \
-	appcomps \
-	$(NULL)
-endif
-
 ifdef MOZ_XUL
 ifdef MOZ_ENABLE_GTK2
 COMPONENT_LIBS += \
 	unixproxy \
 	$(NULL)
 endif
 endif
 
@@ -243,33 +237,27 @@ ifndef MOZ_PLAINTEXT_EDITOR_ONLY
 COMPONENT_LIBS += composer
 else
 DEFINES += -DMOZ_PLAINTEXT_EDITOR_ONLY
 endif
 
 ifdef MOZ_RDF
 COMPONENT_LIBS += \
 	rdf \
-	$(NULL)
-ifdef MOZ_XPFE_COMPONENTS
-COMPONENT_LIBS += \
 	windowds \
 	intlapp \
 	$(NULL)
 endif
-endif
 
 ifeq (,$(filter qt beos os2 photon cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
 ifdef MOZ_XUL
-ifdef MOZ_XPFE_COMPONENTS
 COMPONENT_LIBS += fileview
 DEFINES += -DMOZ_FILEVIEW
 endif
 endif
-endif
 
 ifdef MOZ_STORAGE
 COMPONENT_LIBS += storagecomps
 EXTRA_DSO_LDOPTS += $(SQLITE_LIBS)
 endif
 
 ifdef MOZ_PLACES
 STATIC_LIBS += morkreader_s
--- a/toolkit/library/nsStaticXULComponents.cpp
+++ b/toolkit/library/nsStaticXULComponents.cpp
@@ -89,19 +89,22 @@
 
 #ifdef ICON_DECODER
 #define ICON_MODULE MODULE(nsIconDecoderModule)
 #else
 #define ICON_MODULE
 #endif
 
 #ifdef MOZ_RDF
-#define RDF_MODULE MODULE(nsRDFModule)
+#define RDF_MODULES \
+    MODULE(nsRDFModule) \
+    MODULE(nsXPIntlModule) \
+    MODULE(nsWindowDataSourceModule)
 #else
-#define RDF_MODULE
+#define RDF_MODULES
 #endif
 
 #ifdef MOZ_PLAINTEXT_EDITOR_ONLY
 #define COMPOSER_MODULE
 #else
 #define COMPOSER_MODULE MODULE(nsComposerModule)
 #endif
 
@@ -137,47 +140,31 @@
 
 #ifdef MOZ_PLUGINS
 #define PLUGINS_MODULES \
     MODULE(nsPluginModule)
 #else
 #define PLUGINS_MODULES
 #endif
 
-#ifdef MOZ_XPFE_COMPONENTS
-#ifdef MOZ_RDF
-#define RDFAPP_MODULES \
-    MODULE(nsXPIntlModule) \
-    MODULE(nsWindowDataSourceModule)
-#else
-#define RDFAPP_MODULES
-#endif
-#define APPLICATION_MODULES \
-    MODULE(application) \
-    MODULE(nsFindComponent)
-#else
-#define APPLICATION_MODULES
-#define RDFAPP_MODULES
-#endif
-
 #ifdef MOZ_XPINSTALL
 #define XPINSTALL_MODULES \
     MODULE(nsSoftwareUpdate)
 #else
 #define XPINSTALL_MODULES
 #endif
 
 #ifdef MOZ_JSDEBUGGER
 #define JSDEBUGGER_MODULES \
     MODULE(JavaScript_Debugger)
 #else
 #define JSDEBUGGER_MODULES
 #endif
 
-#if defined(MOZ_FILEVIEW) && defined(MOZ_XPFE_COMPONENTS) && defined(MOZ_XUL)
+#if defined(MOZ_FILEVIEW) && defined(MOZ_XUL)
 #define FILEVIEW_MODULE MODULE(nsFileViewModule)
 #else
 #define FILEVIEW_MODULE
 #endif
 
 #ifdef MOZ_STORAGE
 #define STORAGE_MODULE MODULE(mozStorageModule)
 #else
@@ -255,34 +242,34 @@
     UNIVERSALCHARDET_MODULE                  \
     MODULE(necko)                            \
     PERMISSIONS_MODULES                      \
     AUTH_MODULE                              \
     MODULE(nsJarModule)                      \
     ZIPWRITER_MODULE                         \
     MODULE(nsPrefModule)                     \
     MODULE(nsSecurityManagerModule)          \
-    RDF_MODULE                               \
-    RDFAPP_MODULES                           \
+    RDF_MODULES                              \
     MODULE(nsParserModule)                   \
     GFX_MODULES                              \
     WIDGET_MODULES                           \
     MODULE(nsImageLib2Module)                \
     ICON_MODULE                              \
     PLUGINS_MODULES                          \
     MODULE(nsLayoutModule)                   \
     MODULE(docshell_provider)                \
     MODULE(embedcomponents)                  \
     MODULE(Browser_Embedding_Module)         \
     ACCESS_MODULES                           \
     MODULE(appshell)                         \
     MODULE(nsTransactionManagerModule)       \
     COMPOSER_MODULE                          \
     MODULE(nsChromeModule)                   \
-    APPLICATION_MODULES                      \
+    MODULE(application)                      \
+    MODULE(nsFindComponent)                  \
     MODULE(Apprunner)                        \
     MODULE(CommandLineModule)                \
     FILEVIEW_MODULE                          \
     STORAGE_MODULE                           \
     PLACES_MODULES                           \
     XULENABLED_MODULES                       \
     MODULE(nsToolkitCompsModule)             \
     XREMOTE_MODULES                          \
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -585,17 +585,16 @@ MAKEFILES_xpinstall="
   xpinstall/Makefile
   xpinstall/public/Makefile
   xpinstall/src/Makefile
 "
 
 MAKEFILES_xpfe="
   widget/src/xremoteclient/Makefile
   toolkit/components/remote/Makefile
-  xpfe/Makefile
   xpfe/components/Makefile
   xpfe/components/directory/Makefile
   xpfe/components/find/Makefile
   xpfe/components/find/public/Makefile
   xpfe/components/find/src/Makefile
   xpfe/components/intl/Makefile
   xpfe/components/autocomplete/Makefile
   xpfe/components/autocomplete/public/Makefile
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -202,17 +202,17 @@ endif
 
 tier_platform_dirs += chrome profile
 
 # This must preceed xpfe
 ifdef MOZ_JPROF
 tier_platform_dirs        += tools/jprof
 endif
 
-tier_platform_dirs	+= xpfe
+tier_platform_dirs	+= xpfe/components
 
 ifdef MOZ_ENABLE_XREMOTE
 tier_platform_dirs += widget/src/xremoteclient
 endif
 
 ifdef MOZ_SPELLCHECK
 tier_platform_dirs	+= extensions/spellcheck
 endif
deleted file mode 100644
--- a/xpfe/Makefile.in
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE       = browser
-
-# Because of our great use of encapsulation, there are
-# some header file in xpfe/components that are required
-# by layout and the dom.  This MOZ_XPFE_COMPONENTS, if 
-# unset, allows us to only export - not build - this 
-# stuff.
-ifdef MOZ_XPFE_COMPONENTS
-DIRS     += components
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-ifndef MOZ_XPFE_COMPONENTS
-export::
-	$(MAKE) -C components export
-endif