Bug 440932 - toolkit dlmgr should be buildable by suite; r=ted, sr=NeilAway
authorJustin Wood <Callek@gmail.com>
Wed, 25 Jun 2008 21:12:25 -0400
changeset 15543 6c5ffebb17065ec21488271c919266099759f241
parent 15542 0c385f97b651b108f8103b93f97c9334bb26d19d
child 15544 c90c318622ac5a091bcbd9817f9dfe5f46b44d8a
push idunknown
push userunknown
push dateunknown
reviewersted, NeilAway
bugs440932
milestone1.9.1a1pre
Bug 440932 - toolkit dlmgr should be buildable by suite; r=ted, sr=NeilAway
toolkit/components/Makefile.in
toolkit/components/build/Makefile.in
toolkit/components/build/nsToolkitCompsModule.cpp
toolkit/mozapps/downloads/Makefile.in
xpfe/components/Makefile.in
xpfe/components/build/Makefile.in
xpfe/components/build/nsModule.cpp
--- a/toolkit/components/Makefile.in
+++ b/toolkit/components/Makefile.in
@@ -110,22 +110,21 @@ DIRS += passwordmgr/public
 else
 DIRS += passwordmgr
 ifndef MOZ_PLACES
 DIRS +=	history
 endif # MOZ_PLACES
 endif # MOZ_SUITE
 endif # MOZ_THUNDERBIRD
 
-ifndef MOZ_SUITE
-# XXX Suite doesn't want these just yet
+ifndef SUITE_USING_XPFE_DM
 ifdef MOZ_RDF
 DIRS +=	downloads
 endif
-endif # MOZ_SUITE
+endif # SUITE_USING_XPFE_DM
 
 ifdef MOZ_URL_CLASSIFIER
 DIRS += url-classifier
 endif
 
 DIRS += \
 	commandlines \
 	startup \
--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -116,18 +116,17 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 SHARED_LIBRARY_LIBS += ../parentalcontrols/src/$(LIB_PREFIX)parentalcontrols_s.$(LIB_SUFFIX)
 LOCAL_INCLUDES += \
 	-I$(srcdir)/../parentalcontrols/src \
 	$(NULL)
 REQUIRES += parentalcontrols
 endif
 endif
 
-ifndef MOZ_SUITE
-# XXX Suite isn't ready to build this just yet
+ifndef SUITE_USING_XPFE_DM
 ifdef MOZ_RDF
 SHARED_LIBRARY_LIBS += ../downloads/src/$(LIB_PREFIX)download_s.$(LIB_SUFFIX)
 endif
 endif
 
 ifdef ALERTS_SERVICE
 SHARED_LIBRARY_LIBS += ../alerts/src/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
 endif
--- a/toolkit/components/build/nsToolkitCompsModule.cpp
+++ b/toolkit/components/build/nsToolkitCompsModule.cpp
@@ -44,23 +44,22 @@
 #if defined(XP_WIN) && !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
 #include "nsParentalControlsServiceWin.h"
 #endif
 
 #ifdef ALERTS_SERVICE
 #include "nsAlertsService.h"
 #endif
 
-#ifndef MOZ_SUITE
-// XXX Suite isn't ready to include this just yet
+#ifndef SUITE_USING_XPFE_DM
 #ifdef MOZ_RDF
 #include "nsDownloadManager.h"
 #include "nsDownloadProxy.h"
 #endif
-#endif // MOZ_SUITE
+#endif
 
 #include "nsTypeAheadFind.h"
 
 #ifdef MOZ_URL_CLASSIFIER
 #include "nsUrlClassifierDBService.h"
 #include "nsUrlClassifierStreamUpdater.h"
 #include "nsUrlClassifierUtils.h"
 #include "nsUrlClassifierHashCompleter.h"
@@ -79,24 +78,23 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInf
 #if defined(XP_WIN) && !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsParentalControlsServiceWin)
 #endif
 
 #ifdef ALERTS_SERVICE
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAlertsService)
 #endif
 
-#ifndef MOZ_SUITE
-// XXX Suite isn't ready to include this just yet
+#ifndef SUITE_USING_XPFE_DM
 #ifdef MOZ_RDF
 NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsDownloadManager,
                                          nsDownloadManager::GetSingleton) 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy)
 #endif
-#endif // MOZ_SUITE
+#endif
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsTypeAheadFind)
 
 #ifdef MOZ_URL_CLASSIFIER
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUrlClassifierStreamUpdater)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUrlClassifierUtils, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUrlClassifierHashCompleter, Init)
 
@@ -144,29 +142,28 @@ static const nsModuleComponentInfo compo
     nsAlertsServiceConstructor },
 #endif
 #if defined(XP_WIN) && !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
   { "Parental Controls Service",
     NS_PARENTALCONTROLSSERVICE_CID,
     NS_PARENTALCONTROLSSERVICE_CONTRACTID,
     nsParentalControlsServiceWinConstructor },
 #endif
-#ifndef MOZ_SUITE
-// XXX Suite isn't ready to include this just yet
+#ifndef SUITE_USING_XPFE_DM
 #ifdef MOZ_RDF
   { "Download Manager",
     NS_DOWNLOADMANAGER_CID,
     NS_DOWNLOADMANAGER_CONTRACTID,
     nsDownloadManagerConstructor },
   { "Download",
     NS_DOWNLOAD_CID,
     NS_TRANSFER_CONTRACTID,
     nsDownloadProxyConstructor },
 #endif
-#endif // MOZ_SUITE
+#endif
   { "TypeAheadFind Component",
     NS_TYPEAHEADFIND_CID,
     NS_TYPEAHEADFIND_CONTRACTID,
     nsTypeAheadFindConstructor
   },
 #ifdef MOZ_URL_CLASSIFIER
   { "Url Classifier DB Service",
     NS_URLCLASSIFIERDBSERVICE_CID,
--- a/toolkit/mozapps/downloads/Makefile.in
+++ b/toolkit/mozapps/downloads/Makefile.in
@@ -37,16 +37,15 @@
 
 DEPTH   = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifndef MOZ_SUITE
-# XXX Suite doesn't want these just yet
+ifndef SUITE_USING_XPFE_DM
 DIRS = src tests
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 
--- a/xpfe/components/Makefile.in
+++ b/xpfe/components/Makefile.in
@@ -83,19 +83,21 @@ DIRS += \
         $(NULL)
 
 ifndef MOZ_PHOENIX
 ifndef MOZ_XULRUNNER
 DIRS += \
         related \
         autocomplete \
         $(NULL)
-ifneq ($(MOZ_BUILD_APP),camino)
+        
+ifdef SUITE_USING_XPFE_DM
 DIRS += download-manager
 endif
+
 ifndef MOZ_XUL_APP
 DIRS += startup
 endif
 ifndef MOZ_PLACES
 DIRS += history
 endif
 endif
 endif
--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@@ -85,24 +85,27 @@ REQUIRES	+= \
 		intl \
 		mork \
 		widget \
 		mimetype \
 		autocomplete \
 		$(NULL)
 
 SHARED_LIBRARY_LIBS += \
-	../download-manager/src/$(LIB_PREFIX)downloadmanager_s.$(LIB_SUFFIX) \
 	../related/src/$(LIB_PREFIX)related_s.$(LIB_SUFFIX) \
 	$(NULL)
 LOCAL_INCLUDES += \
-	-I$(srcdir)/../download-manager/src \
 	-I$(srcdir)/../related/src       \
 	$(NULL)
 
+ifdef SUITE_USING_XPFE_DM
+SHARED_LIBRARY_LIBS += ../download-manager/src/$(LIB_PREFIX)downloadmanager_s.$(LIB_SUFFIX)
+LOCAL_INCLUDES += -I$(srcdir)/../download-manager/src
+endif
+
 ifndef MOZ_PLACES
 REQUIRES += history
 SHARED_LIBRARY_LIBS += \
 	../history/src/$(LIB_PREFIX)history_s.$(LIB_SUFFIX) \
 	$(NULL)
 LOCAL_INCLUDES += \
 	-I$(srcdir)/../history/src       \
 	$(NULL)
--- a/xpfe/components/build/nsModule.cpp
+++ b/xpfe/components/build/nsModule.cpp
@@ -43,18 +43,20 @@
 #ifdef MOZ_RDF
 #include "rdf.h"
 #include "nsRDFCID.h"
 #endif
 
 #ifdef MOZ_SUITE
 #include "nsRelatedLinksHandlerImpl.h"
 #include "nsDocShellCID.h"
+#ifdef SUITE_USING_XPFE_DM
 #include "nsDownloadManager.h"
 #include "nsDownloadProxy.h"
+#endif
 
 #if !defined(MOZ_PLACES)
 #include "nsGlobalHistory.h"
 #endif
 
 #if defined(XP_WIN)
 #include "nsWindowsHooks.h"
 #endif // Windows
@@ -85,18 +87,20 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDirecto
 
 #if !defined(MOZ_MACBROWSER)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserStatusFilter)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserInstance)
 #endif
 
 #ifdef MOZ_SUITE
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(RelatedLinksHandlerImpl, Init)
+#ifdef SUITE_USING_XPFE_DM
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDownloadManager, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy)
+#endif
 
 #if !defined(MOZ_PLACES)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGlobalHistory, Init)
 #endif
 
 #if defined(XP_WIN)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsHooks)
 #endif // Windows
@@ -149,20 +153,22 @@ static const nsModuleComponentInfo compo
 #ifdef MOZ_RDF
     { "Directory Viewer", NS_HTTPINDEX_SERVICE_CID, NS_HTTPINDEX_SERVICE_CONTRACTID,
       nsHTTPIndexConstructor },
     { "Directory Viewer", NS_HTTPINDEX_SERVICE_CID, NS_HTTPINDEX_DATASOURCE_CONTRACTID,
       nsHTTPIndexConstructor },
 #endif
 
 #ifdef MOZ_SUITE
+#ifdef SUITE_USING_XPFE_DM
     { "Download Manager", NS_DOWNLOADMANAGER_CID, NS_DOWNLOADMANAGER_CONTRACTID,
       nsDownloadManagerConstructor },
     { "Download", NS_DOWNLOAD_CID, NS_TRANSFER_CONTRACTID,
       nsDownloadProxyConstructor },
+#endif
     { "Related Links Handler", NS_RELATEDLINKSHANDLER_CID, NS_RELATEDLINKSHANDLER_CONTRACTID,
        RelatedLinksHandlerImplConstructor},
 
 #if !defined(MOZ_PLACES)
     { "Global History", NS_GLOBALHISTORY_CID, NS_GLOBALHISTORY2_CONTRACTID,
       nsGlobalHistoryConstructor },
     { "Global History", NS_GLOBALHISTORY_CID, NS_GLOBALHISTORY_DATASOURCE_CONTRACTID,
       nsGlobalHistoryConstructor },