Bug 555658 Move Find Service and intl charset-menu code to toolkit. r=dtownsend

--HG--
rename : xpfe/components/find/Makefile.in => toolkit/components/find/Makefile.in
rename : xpfe/components/find/public/Makefile.in => toolkit/components/find/public/Makefile.in
rename : xpfe/components/find/public/nsIFindService.idl => toolkit/components/find/public/nsIFindService.idl
rename : xpfe/components/find/src/Makefile.in => toolkit/components/find/src/Makefile.in
rename : xpfe/components/find/src/nsFindService.cpp => toolkit/components/find/src/nsFindService.cpp
rename : xpfe/components/find/src/nsFindService.h => toolkit/components/find/src/nsFindService.h
rename : xpfe/components/intl/Makefile.in => toolkit/components/intl/Makefile.in
rename : xpfe/components/intl/nsCharsetMenu.cpp => toolkit/components/intl/nsCharsetMenu.cpp
rename : xpfe/components/intl/nsCharsetMenu.h => toolkit/components/intl/nsCharsetMenu.h

toolkit/components/Makefile.in

@@ -58,6 +58,7 @@ PARALLEL_DIRS += \
   cookie \
   exthelper \
   filepicker \
+  find \
   microformats \
   parentalcontrols \
   passwordmgr \
@@ -109,7 +110,10 @@ PARALLEL_DIRS += search
 endif
 
 ifdef MOZ_RDF
-PARALLEL_DIRS += downloads
+PARALLEL_DIRS += \
+  downloads \
+  intl \
+  $(NULL)
 endif
 
 ifdef MOZ_URL_CLASSIFIER

toolkit/components/build/Makefile.in

@@ -66,6 +66,8 @@ include $(topsrcdir)/config/config.mk
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../downloads/src \
 	-I$(srcdir)/../feeds/src \
+	-I$(srcdir)/../find/src \
+	-I$(srcdir)/../intl \
 	-I$(srcdir)/../startup/src \
 	-I$(srcdir)/../statusfilter \
 	-I$(srcdir)/../typeaheadfind/src \
@@ -79,6 +81,7 @@ LOCAL_INCLUDES += \
 endif
 
 SHARED_LIBRARY_LIBS = \
+	../find/src/$(LIB_PREFIX)mozfind_s.$(LIB_SUFFIX) \
 	../typeaheadfind/src/$(LIB_PREFIX)fastfind_s.$(LIB_SUFFIX) \
 	../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
 	../statusfilter/$(LIB_PREFIX)mozbrwsr_s.$(LIB_SUFFIX) \
@@ -94,7 +97,10 @@ endif
 endif
 
 ifdef MOZ_RDF
-SHARED_LIBRARY_LIBS += ../downloads/src/$(LIB_PREFIX)download_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += \
+  ../downloads/src/$(LIB_PREFIX)download_s.$(LIB_SUFFIX) \
+  ../intl/$(LIB_PREFIX)intl_s.$(LIB_SUFFIX) \
+  $(NULL)
 endif
 
 ifdef ALERTS_SERVICE

toolkit/components/build/nsToolkitCompsModule.cpp

@@ -39,6 +39,7 @@
 #include "nsAppStartup.h"
 #include "nsUserInfo.h"
 #include "nsToolkitCompsCID.h"
+#include "nsFindService.h"
 
 #if defined(XP_WIN) && !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
 #include "nsParentalControlsServiceWin.h"
@@ -51,6 +52,8 @@
 #ifdef MOZ_RDF
 #include "nsDownloadManager.h"
 #include "nsDownloadProxy.h"
+#include "nsCharsetMenu.h"
+#include "rdf.h"
 #endif
 
 #include "nsTypeAheadFind.h"
@@ -73,6 +76,7 @@
 
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAppStartup, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsFindService)
 
 #if defined(XP_WIN) && !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsParentalControlsServiceWin)
@@ -156,6 +160,10 @@ static const nsModuleComponentInfo components[] =
     NS_TRANSFER_CONTRACTID,
     nsDownloadProxyConstructor },
 #endif
+  { "Find Service",
+    NS_FIND_SERVICE_CID,
+    NS_FIND_SERVICE_CONTRACTID,
+    nsFindServiceConstructor },
   { "TypeAheadFind Component",
     NS_TYPEAHEADFIND_CID,
     NS_TYPEAHEADFIND_CONTRACTID,
@@ -193,6 +201,10 @@ static const nsModuleComponentInfo components[] =
     NS_BROWSERSTATUSFILTER_CID,
     NS_BROWSERSTATUSFILTER_CONTRACTID,
     nsBrowserStatusFilterConstructor },
+  { "nsCharsetMenu",
+    NS_CHARSETMENU_CID,
+    NS_RDF_DATASOURCE_CONTRACTID_PREFIX NS_CHARSETMENU_PID,
+    NS_NewCharsetMenu },
 };
 
 NS_IMPL_NSGETMODULE(nsToolkitCompsModule, components)

toolkit/components/find/public/Makefile.in

@@ -42,7 +42,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= appcomps
+MODULE		= mozfind
 XPIDL_MODULE	= mozfind
 
 XPIDLSRCS	= \
@@ -50,4 +50,3 @@ XPIDLSRCS	= \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
-

toolkit/components/find/src/Makefile.in

@@ -42,26 +42,14 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= appcomps
-XPIDL_MODULE	= mozfind
-LIBRARY_NAME	= mozfind
-EXPORT_LIBRARY = 1
-IS_COMPONENT	= 1
-MODULE_NAME	= nsFindComponent
+MODULE		= mozfind
+LIBRARY_NAME	= mozfind_s
+FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY	= 1
 
-
-CPPSRCS		= \
-            nsFindService.cpp     \
-            nsFindModule.cpp      \
-            $(NULL)
-
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(XPCOM_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NSPR_LIBS) \
-		$(NULL)
+CPPSRCS	= \
+  nsFindService.cpp \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 

toolkit/components/intl/Makefile.in

@@ -42,21 +42,13 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE            = appcomps
-LIBRARY_NAME      = intlapp
+MODULE            = intl
+LIBRARY_NAME      = intl_s
+FORCE_STATIC_LIB  = 1
 LIBXUL_LIBRARY    = 1
-MODULE_NAME       = nsXPIntlModule
-EXPORT_LIBRARY    = 1
-IS_COMPONENT      = 1
-
 
 CPPSRCS= \
 	nsCharsetMenu.cpp \
 	$(NULL)
 
-EXTRA_DSO_LDOPTS = \
-	$(MOZ_UNICHARUTIL_LIBS) \
-	$(MOZ_COMPONENT_LIBS) \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk

toolkit/components/intl/nsCharsetMenu.cpp

@@ -2079,13 +2079,3 @@ NS_IMETHODIMP nsCharsetMenu::EndUpdateBatch()
 {
   return mInner->EndUpdateBatch();
 }
-
-// Module definitions
-
-static const nsModuleComponentInfo components[] = {
-    { "nsCharsetMenu", NS_CHARSETMENU_CID,
-      NS_RDF_DATASOURCE_CONTRACTID_PREFIX NS_CHARSETMENU_PID,
-      NS_NewCharsetMenu },
-};
-
-NS_IMPL_NSGETMODULE(nsXPIntlModule, components)

toolkit/library/libxul-config.mk

@@ -153,7 +153,6 @@ COMPONENT_LIBS += \
 	toolkitcomps \
 	pipboot \
 	pipnss \
-	mozfind \
 	appcomps \
 	$(NULL)
 
@@ -244,7 +243,6 @@ ifdef MOZ_RDF
 COMPONENT_LIBS += \
 	rdf \
 	windowds \
-	intlapp \
 	$(NULL)
 endif
 

toolkit/library/nsStaticXULComponents.cpp

@@ -96,7 +96,6 @@
 #ifdef MOZ_RDF
 #define RDF_MODULES \
     MODULE(nsRDFModule) \
-    MODULE(nsXPIntlModule) \
     MODULE(nsWindowDataSourceModule)
 #else
 #define RDF_MODULES
@@ -264,7 +263,6 @@
     COMPOSER_MODULE                          \
     MODULE(nsChromeModule)                   \
     MODULE(application)                      \
-    MODULE(nsFindComponent)                  \
     MODULE(Apprunner)                        \
     MODULE(CommandLineModule)                \
     FILEVIEW_MODULE                          \

toolkit/toolkit-makefiles.sh

@@ -565,10 +565,6 @@ MAKEFILES_xpfe="
   toolkit/components/remote/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
   xpfe/components/autocomplete/src/Makefile
@@ -676,7 +672,11 @@ MAKEFILES_xulapp="
   toolkit/components/filepicker/Makefile
   toolkit/components/filepicker/public/Makefile
   toolkit/components/filepicker/src/Makefile
+  toolkit/components/find/Makefile
+  toolkit/components/find/public/Makefile
+  toolkit/components/find/src/Makefile
   toolkit/components/help/Makefile
+  toolkit/components/intl/Makefile
   toolkit/components/microformats/Makefile
   toolkit/components/microformats/src/Makefile
   toolkit/components/parentalcontrols/Makefile

xpfe/components/Makefile.in

@@ -57,13 +57,8 @@ ifdef MOZ_SUNBIRD
 MOZ_HAVE_BROWSER=
 endif
 
-DIRS = \
-        find \
-        $(NULL)
-
 ifdef MOZ_RDF
 DIRS += \
-        intl \
         windowds \
         $(NULL)
 endif

xpfe/components/find/src/nsFindModule.cpp

@@ -1,21 +0,0 @@
-
-
-#include "nsIGenericFactory.h"
-
-#include "nsString.h"
-#include "nsFindService.h"
-
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsFindService)
-
-static const nsModuleComponentInfo gComponents[] = {
-  { 
-    "Find Service",
-    NS_FIND_SERVICE_CID,
-    NS_FIND_SERVICE_CONTRACTID,
-    nsFindServiceConstructor
-  }
-};
-
-NS_IMPL_NSGETMODULE(nsFindComponent, gComponents)
-