Bug 552222 Drop MOZ_XPFE_COMPONENTS / --disable-xpfe-components. r=ted

config/autoconf.mk.in

@@ -143,7 +143,6 @@ 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@

configure.in

@@ -4749,7 +4749,6 @@ 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
@@ -5567,15 +5566,6 @@ case "$target" in
 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 ========================================================
@@ -8281,7 +8271,6 @@ 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)
 

toolkit/library/libxul-config.mk

@@ -152,6 +152,8 @@ COMPONENT_LIBS += \
 	toolkitcomps \
 	pipboot \
 	pipnss \
+	mozfind \
+	appcomps \
 	$(NULL)
 
 ifdef BUILD_CTYPES
@@ -167,14 +169,6 @@ COMPONENT_LIBS += \
 	$(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 += \
@@ -248,23 +242,17 @@ 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

toolkit/library/nsStaticXULComponents.cpp

@@ -94,9 +94,12 @@
 #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
@@ -142,22 +145,6 @@
 #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)
@@ -172,7 +159,7 @@
 #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
@@ -260,8 +247,7 @@
     ZIPWRITER_MODULE                         \
     MODULE(nsPrefModule)                     \
     MODULE(nsSecurityManagerModule)          \
-    RDF_MODULE                               \
-    RDFAPP_MODULES                           \
+    RDF_MODULES                              \
     MODULE(nsParserModule)                   \
     GFX_MODULES                              \
     WIDGET_MODULES                           \
@@ -277,7 +263,8 @@
     MODULE(nsTransactionManagerModule)       \
     COMPOSER_MODULE                          \
     MODULE(nsChromeModule)                   \
-    APPLICATION_MODULES                      \
+    MODULE(application)                      \
+    MODULE(nsFindComponent)                  \
     MODULE(Apprunner)                        \
     MODULE(CommandLineModule)                \
     FILEVIEW_MODULE                          \

toolkit/toolkit-makefiles.sh

@@ -590,7 +590,6 @@ MAKEFILES_xpinstall="
 MAKEFILES_xpfe="
   widget/src/xremoteclient/Makefile
   toolkit/components/remote/Makefile
-  xpfe/Makefile
   xpfe/components/Makefile
   xpfe/components/directory/Makefile
   xpfe/components/find/Makefile

toolkit/toolkit-tiers.mk

@@ -207,7 +207,7 @@ 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

xpfe/Makefile.in

@@ -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