diff --git a/mozilla/xpfe/components/Makefile.in b/mozilla/xpfe/components/Makefile.in index 121aade6840..d72f2045cd0 100644 --- a/mozilla/xpfe/components/Makefile.in +++ b/mozilla/xpfe/components/Makefile.in @@ -89,8 +89,7 @@ DIRS += \ history \ sidebar \ $(NULL) -# XXX When Suite is a fully fledged xul app, this ifdef can be reduced. -ifneq (11,$(MOZ_SUITE)$(MOZ_XUL_APP)) +ifndef MOZ_XUL_APP DIRS += \ updates \ startup \ @@ -101,13 +100,11 @@ endif endif endif +ifdef MOZ_SUITE ifeq ($(OS_ARCH),WINNT) -ifndef MOZ_PHOENIX -ifndef MOZ_XULRUNNER DIRS += urlwidget winhooks endif endif -endif # build should be last DIRS += build diff --git a/mozilla/xpfe/components/build/Makefile.in b/mozilla/xpfe/components/build/Makefile.in index 80efdcc12bc..b6871dbec19 100644 --- a/mozilla/xpfe/components/build/Makefile.in +++ b/mozilla/xpfe/components/build/Makefile.in @@ -52,18 +52,12 @@ LIBXUL_LIBRARY = 1 PACKAGE_FILE = appcomps.pkg PACKAGE_VARS += MOZ_PHOENIX -# don't build ALERTS_SERVICE for firefox, xulrunner or toolkit-based suite -ifndef MOZ_PHOENIX -ifndef MOZ_XULRUNNER -# XXX When Suite is a fully fledged xul app, this ifdef can be reduced. -ifneq (11,$(MOZ_SUITE)$(MOZ_XUL_APP)) +ifndef MOZ_XUL_APP ifneq (,$(filter $(MOZ_GFX_TOOLKIT),windows gtk gtk2)) ALERTS_SERVICE=1 DEFINES += -DALERTS_SERVICE endif endif -endif -endif REQUIRES = xpcom \ string \ @@ -90,93 +84,68 @@ REQUIRES = xpcom \ chardet \ $(NULL) -ifndef MOZ_PHOENIX -ifndef MOZ_XULRUNNER -REQUIRES += history downloadmanager -endif -endif - CPPSRCS = nsModule.cpp ifdef MOZ_PERF_METRICS EXTRA_DSO_LIBS += mozutil_s endif -SHARED_LIBRARY_LIBS = \ - ../directory/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX) \ - $(NULL) +# General includes +SHARED_LIBRARY_LIBS += ../directory/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX) +LOCAL_INCLUDES += -I$(srcdir)/../directory +# Non-Mac Browser requirements ifneq ($(MOZ_BUILD_APP),macbrowser) -SHARED_LIBRARY_LIBS += \ - ../../browser/src/$(LIB_PREFIX)mozbrwsr_s.$(LIB_SUFFIX) \ - $(NULL) +SHARED_LIBRARY_LIBS += ../../browser/src/$(LIB_PREFIX)mozbrwsr_s.$(LIB_SUFFIX) +LOCAL_INCLUDES += -I$(srcdir)/../../browser/src endif -ifndef MOZ_PHOENIX -ifndef MOZ_XULRUNNER -ifneq ($(MOZ_BUILD_APP),macbrowser) +ifdef ALERTS_SERVICE +SHARED_LIBRARY_LIBS += ../alerts/src/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX) +LOCAL_INCLUDES += -I$(srcdir)/../alerts/src +endif # ALERTS_SERVICE + +# Suite specific includes +ifdef MOZ_SUITE +REQUIRES += history downloadmanager + SHARED_LIBRARY_LIBS += \ ../bookmarks/src/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \ ../download-manager/src/$(LIB_PREFIX)downloadmanager_s.$(LIB_SUFFIX) \ ../history/src/$(LIB_PREFIX)history_s.$(LIB_SUFFIX) \ ../related/src/$(LIB_PREFIX)related_s.$(LIB_SUFFIX) \ $(NULL) -# XXX When Suite is a fully fledged xul app, this ifdef can be reduced. -ifneq (11,$(MOZ_SUITE)$(MOZ_XUL_APP)) -SHARED_LIBRARY_LIBS += \ - ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \ +LOCAL_INCLUDES += \ + -I$(srcdir)/../bookmarks/src \ + -I$(srcdir)/../download-manager/src \ + -I$(srcdir)/../history/src \ + -I$(srcdir)/../related/src \ $(NULL) -endif -endif - -ifdef ALERTS_SERVICE -SHARED_LIBRARY_LIBS += \ - ../alerts/src/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX) \ - $(NULL) -endif # ALERTS_SERVICE ifeq ($(OS_ARCH),WINNT) SHARED_LIBRARY_LIBS += \ ../urlwidget/$(LIB_PREFIX)urlwidgt_s.$(LIB_SUFFIX) \ ../winhooks/$(LIB_PREFIX)winhooks_s.$(LIB_SUFFIX) \ $(NULL) -endif # WINNT - -endif # MOZ_XULRUNNER -endif # MOZ_PHOENIX - -LOCAL_INCLUDES = \ - -I$(srcdir)/../../browser/src \ - -I$(srcdir)/../directory \ - $(NULL) - -ifndef MOZ_PHOENIX -ifndef MOZ_XULRUNNER -LOCAL_INCLUDES += \ - -I$(srcdir)/../bookmarks/src \ - -I$(srcdir)/../download-manager/src \ - -I$(srcdir)/../history/src \ - -I$(srcdir)/../related/src \ - -I$(srcdir)/../startup/src \ - -I$(srcdir)/../alerts/src \ - $(NULL) - -ifeq ($(OS_ARCH),WINNT) LOCAL_INCLUDES += \ -I$(srcdir)/../urlwidget \ - -I$(srcdir)/../winhooks \ - $(NULL) -endif + -I$(srcdir)/../winhooks \ + $(NULL) +endif # WINNT + +# XXX When Suite becomes a full XUL App this section can be removed. +ifndef MOZ_XUL_APP +SHARED_LIBRARY_LIBS += ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) +LOCAL_INCLUDES += -I$(srcdir)/../startup/src ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) -ifneq ($(MOZ_BUILD_APP),macbrowser) SHARED_LIBRARY_LIBS += ../../bootstrap/appleevents/$(LIB_PREFIX)appleevents_s.$(LIB_SUFFIX) EXTRA_DSO_LDOPTS += $(TK_LIBS) endif -endif -endif # MOZ_XULRUNNER -endif # MOZ_PHOENIX +endif # MOZ_XUL_APP + +endif # MOZ_SUITE ifeq ($(OS_ARCH),WINNT) OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32) diff --git a/mozilla/xpfe/components/build/nsModule.cpp b/mozilla/xpfe/components/build/nsModule.cpp index e24ca39d580..5eba5aad09a 100644 --- a/mozilla/xpfe/components/build/nsModule.cpp +++ b/mozilla/xpfe/components/build/nsModule.cpp @@ -42,31 +42,30 @@ #include "nsDirectoryViewer.h" #include "nsRDFCID.h" -#if !defined(MOZ_PHOENIX) && !defined(MOZ_XULRUNNER) && !defined(MOZ_MACBROWSER) +#ifdef MOZ_SUITE #include "nsBookmarksService.h" #include "nsRelatedLinksHandlerImpl.h" #include "nsGlobalHistory.h" #include "nsDocShellCID.h" #include "nsDownloadManager.h" #include "nsDownloadProxy.h" -// XXX When Suite is a fully fledged xul app, this ifdef can be reduced. -#if !defined(MOZ_SUITE) || !defined(MOZ_XUL_APP) + +// XXX When Suite becomes a full XUL App this section can be removed. +#ifndef MOZ_XUL_APP #include "nsAppStartup.h" #include "nsCommandLineService.h" #include "nsUserInfo.h" -#endif +#endif // !MOZ_XUL_APP -#endif // !defined(MOZ_PHOENIX) && !defined(MOZ_XULRUNNER) && !defined(MOZ_MACBROWSER) - -#if defined(ALERTS_SERVICE) -#include "nsAlertsService.h" -#endif - -#if !defined(MOZ_PHOENIX) && !defined(MOZ_XULRUNNER) #if defined(XP_WIN) #include "nsWindowsHooks.h" #include "nsUrlWidget.h" #endif // Windows + +#endif // MOZ_SUITE + +#ifdef ALERTS_SERVICE +#include "nsAlertsService.h" #endif #include "nsBrowserStatusFilter.h" @@ -90,29 +89,28 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserStatusFilter) NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserInstance) #endif -#if !defined(MOZ_PHOENIX) && !defined(MOZ_XULRUNNER) && !defined(MOZ_MACBROWSER) +#ifdef MOZ_SUITE NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(RelatedLinksHandlerImpl, Init) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsBookmarksService, Init) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGlobalHistory, Init) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDownloadManager, Init) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy) -// XXX When Suite is a fully fledged xul app, this ifdef can be reduced. -#if !defined(MOZ_SUITE) || !defined(MOZ_XUL_APP) + +#ifndef MOZ_XUL_APP NS_GENERIC_FACTORY_CONSTRUCTOR(nsCmdLineService) NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppStartup) NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo) -#endif -#endif // !defined(MOZ_PHOENIX) && !defined(MOZ_XULRUNNER) && !defined(MOZ_MACBROWSER) +#endif // !MOZ_XUL_APP -#if defined(ALERTS_SERVICE) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsAlertsService) -#endif - -#if !defined(MOZ_PHOENIX) && !defined(MOZ_XULRUNNER) #if defined(XP_WIN) NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsHooks) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUrlWidget, Init) #endif // Windows + +#endif // MOZ_SUITE + +#ifdef ALERTS_SERVICE +NS_GENERIC_FACTORY_CONSTRUCTOR(nsAlertsService) #endif #if (!defined(MOZ_XUL_APP)) && !defined(MOZ_MACBROWSER) @@ -163,7 +161,7 @@ static const nsModuleComponentInfo components[] = { { "Directory Viewer", NS_HTTPINDEX_SERVICE_CID, NS_HTTPINDEX_DATASOURCE_CONTRACTID, nsHTTPIndexConstructor }, -#if !defined(MOZ_PHOENIX) && !defined(MOZ_XULRUNNER) && !defined(MOZ_MACBROWSER) +#ifdef MOZ_SUITE { "Bookmarks", NS_BOOKMARKS_SERVICE_CID, NS_BOOKMARKS_SERVICE_CONTRACTID, nsBookmarksServiceConstructor }, { "Bookmarks", NS_BOOKMARKS_SERVICE_CID, @@ -181,8 +179,9 @@ static const nsModuleComponentInfo components[] = { nsGlobalHistoryConstructor }, { "Global History", NS_GLOBALHISTORY_CID, NS_GLOBALHISTORY_AUTOCOMPLETE_CONTRACTID, nsGlobalHistoryConstructor }, -// XXX When Suite is a fully fledged xul app, this ifdef can be reduced. -#if !defined(MOZ_SUITE) || !defined(MOZ_XUL_APP) + { "Related Links Handler", NS_RELATEDLINKSHANDLER_CID, NS_RELATEDLINKSHANDLER_CONTRACTID, + RelatedLinksHandlerImplConstructor}, +#ifndef MOZ_XUL_APP { "App Startup Service", NS_SEAMONKEY_APPSTARTUP_CID, NS_APPSTARTUP_CONTRACTID, @@ -198,10 +197,16 @@ static const nsModuleComponentInfo components[] = { NS_USERINFO_CONTRACTID, nsUserInfoConstructor }, -#endif - { "Related Links Handler", NS_RELATEDLINKSHANDLER_CID, NS_RELATEDLINKSHANDLER_CONTRACTID, - RelatedLinksHandlerImplConstructor}, -#endif // !defined(MOZ_PHOENIX) && !defined(MOZ_XULRUNNER) && !defined(MOZ_MACBROWSER) +#endif // MOZ_XUL_APP + +#ifdef XP_WIN + { NS_IURLWIDGET_CLASSNAME, NS_IURLWIDGET_CID, + NS_IURLWIDGET_CONTRACTID, nsUrlWidgetConstructor }, + { NS_IWINDOWSHOOKS_CLASSNAME, NS_IWINDOWSHOOKS_CID, + NS_IWINDOWSHOOKS_CONTRACTID, nsWindowsHooksConstructor }, +#endif // XP_WIN + +#endif // MOZ_SUITE #if !defined(MOZ_MACBROWSER) { NS_BROWSERSTATUSFILTER_CLASSNAME, @@ -216,18 +221,10 @@ static const nsModuleComponentInfo components[] = { }, #endif -#if defined(ALERTS_SERVICE) +#ifdef ALERTS_SERVICE { "nsAlertsService", NS_ALERTSSERVICE_CID, NS_ALERTSERVICE_CONTRACTID, nsAlertsServiceConstructor }, #endif -#if !defined(MOZ_PHOENIX) && !defined(MOZ_XULRUNNER) -#if defined(XP_WIN) - { NS_IURLWIDGET_CLASSNAME, NS_IURLWIDGET_CID, - NS_IURLWIDGET_CONTRACTID, nsUrlWidgetConstructor }, - { NS_IWINDOWSHOOKS_CLASSNAME, NS_IWINDOWSHOOKS_CID, - NS_IWINDOWSHOOKS_CONTRACTID, nsWindowsHooksConstructor }, -#endif // defined(XP_WIN) -#endif #if (!defined(MOZ_XUL_APP)) && !defined(MOZ_MACBROWSER) { "Browser Content Handler",