From a6582b523998765a73a464b3318086fe11bb1341 Mon Sep 17 00:00:00 2001 From: "pavlov%pavlov.net" Date: Wed, 25 Jan 2006 04:54:07 +0000 Subject: [PATCH] backing out bsmedberg's checkins for bug 322965 due to build bustage. --- Makefile.in | 26 +++---- chrome/src/nsChromeFactory.cpp | 1 + chrome/src/nsChromeProtocolHandler.cpp | 14 +--- chrome/src/nsChromeRegistry.cpp | 52 ++++---------- chrome/src/nsChromeRegistry.h | 13 +--- config/rules.mk | 3 + embedding/browser/gtk/Makefile.in | 4 +- rdf/build/Makefile.in | 2 + toolkit/components/Makefile.in | 11 +-- toolkit/components/build/Makefile.in | 11 +++ .../components/build/nsToolkitCompsModule.cpp | 71 ++++++++++++++++++- toolkit/components/history/src/Makefile.in | 11 +-- .../history/src/nsGlobalHistory.cpp | 26 ------- .../components/passwordmgr/base/Makefile.in | 13 +--- .../passwordmgr/base/nsPasswordManager.cpp | 29 -------- toolkit/components/satchel/src/Makefile.in | 12 +--- .../satchel/src/nsFormFillController.cpp | 30 -------- toolkit/library/libxul-config.mk | 12 +--- toolkit/library/nsStaticXULComponents.cpp | 14 +--- 19 files changed, 130 insertions(+), 225 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6af7e8b828d8..736b0bc1405f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -147,17 +147,11 @@ tier_9_dirs += \ modules/libutil \ netwerk \ modules/libjar \ - $(NULL) - -ifdef MOZ_XUL -tier_9_dirs += rdf -endif - -tier_9_dirs += \ uriloader \ modules/libpref \ modules/libimg \ caps \ + rdf \ parser/expat \ parser/htmlparser \ gfx \ @@ -207,15 +201,15 @@ endif # tier 50 - xpfe & toolkit # +ifdef MOZ_XUL ifdef MOZ_XUL_APP tier_50_dirs += chrome else -ifdef MOZ_XUL tier_50_dirs += rdf/chrome +endif else tier_50_dirs += embedding/minimo/chromelite endif -endif tier_50_dirs += profile @@ -268,14 +262,6 @@ ifdef MOZ_JAVAXPCOM tier_50_dirs += extensions/java endif -ifndef BUILD_STATIC_LIBS -ifdef MOZ_XUL_APP -ifneq (,$(MOZ_ENABLE_GTK)$(MOZ_ENABLE_GTK2)) -tier_50_dirs += embedding/browser/gtk -endif -endif -endif - ifdef MOZ_XUL_APP ifndef BUILD_STATIC_LIBS tier_50_dirs += toolkit/library @@ -397,6 +383,10 @@ endif endif endif +ifneq (,$(MOZ_ENABLE_GTK)$(MOZ_ENABLE_GTK2)) +tier_99_dirs += embedding/browser/gtk +endif + # viewer ifneq (,$(ENABLE_TESTS)) ifndef MOZ_ENABLE_LIBXUL @@ -542,6 +532,7 @@ tools_tier_%: $(MAKE) -C $$d tools; \ done +ifdef MOZ_ENABLE_LIBXUL tier_50: @echo "$@: $($@_dirs)" $(MAKE) export_tier_50 @@ -549,6 +540,7 @@ tier_50: $(MAKE) tools_tier_2 $(MAKE) tools_tier_9 $(MAKE) tools_tier_50 +endif tier_%: @echo "$@: $(if $($@_dirs),$($@_dirs),$(error Tier $* not present.))" diff --git a/chrome/src/nsChromeFactory.cpp b/chrome/src/nsChromeFactory.cpp index 900d4dcc4191..4ab3b74123b9 100644 --- a/chrome/src/nsChromeFactory.cpp +++ b/chrome/src/nsChromeFactory.cpp @@ -43,6 +43,7 @@ #include "nsIComponentManager.h" #include "nsIChromeRegistry.h" #include "nscore.h" +#include "rdf.h" #include "nsChromeProtocolHandler.h" #include "nsChromeRegistry.h" diff --git a/chrome/src/nsChromeProtocolHandler.cpp b/chrome/src/nsChromeProtocolHandler.cpp index 2242568732e0..6ad32a04f476 100644 --- a/chrome/src/nsChromeProtocolHandler.cpp +++ b/chrome/src/nsChromeProtocolHandler.cpp @@ -66,16 +66,13 @@ #include "nsIServiceManager.h" #include "nsIStandardURL.h" #include "nsIStreamListener.h" +#include "nsIXULPrototypeCache.h" +#include "nsIXULPrototypeDocument.h" #include "nsNetUtil.h" #include "nsXPIDLString.h" #include "nsString.h" #include "prlog.h" -#ifdef MOZ_XUL -#include "nsIXULPrototypeCache.h" -#include "nsIXULPrototypeDocument.h" -#endif - //---------------------------------------------------------------------- static NS_DEFINE_CID(kXULPrototypeCacheCID, NS_XULPROTOTYPECACHE_CID); @@ -494,8 +491,6 @@ NS_IMETHODIMP nsChromeProtocolHandler::NewChannel(nsIURI* aURI, nsIChannel* *aResult) { - nsresult rv; - NS_ENSURE_ARG_POINTER(aURI); NS_PRECONDITION(aResult, "Null out param"); @@ -517,9 +512,9 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, } #endif + nsresult rv; nsCOMPtr result; -#ifdef MOZ_XUL // Check the prototype cache to see if we've already got the // document in the cache. nsCOMPtr cache @@ -555,7 +550,6 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, return NS_ERROR_OUT_OF_MEMORY; } else { -#endif // MOZ_XUL // Miss. Resolve the chrome URL using the registry and do a // normal necko load. //nsXPIDLCString oldSpec; @@ -638,7 +632,6 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, result->SetOwner(owner); } -#ifdef MOZ_XUL // Track FastLoad file dependencies. // // This is harder than it ought to be! While an nsResChannel "is-a" @@ -682,7 +675,6 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, } } } -#endif *aResult = result; NS_ADDREF(*aResult); diff --git a/chrome/src/nsChromeRegistry.cpp b/chrome/src/nsChromeRegistry.cpp index e792be418e1d..850e3e2c3753 100644 --- a/chrome/src/nsChromeRegistry.cpp +++ b/chrome/src/nsChromeRegistry.cpp @@ -102,7 +102,6 @@ #include "nsIXULAppInfo.h" #include "nsIXULRuntime.h" -#ifdef MOZ_XUL // keep all the RDF stuff together, in case we can remove it in the far future #include "rdf.h" #include "nsRDFCID.h" @@ -116,15 +115,6 @@ #include "nsIRDFContainer.h" #include "nsIRDFContainerUtils.h" -#define CHROME_URI "http://www.mozilla.org/rdf/chrome#" - -DEFINE_RDF_VOCAB(CHROME_URI, CHROME, packages); -DEFINE_RDF_VOCAB(CHROME_URI, CHROME, package); -DEFINE_RDF_VOCAB(CHROME_URI, CHROME, name); -DEFINE_RDF_VOCAB(CHROME_URI, CHROME, platformPackage); - -#endif - #define UILOCALE_CMD_LINE_ARG "UILocale" #define MATCH_OS_LOCALE_PREF "intl.locale.matchOS" @@ -136,6 +126,13 @@ static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); nsChromeRegistry* nsChromeRegistry::gChromeRegistry; +#define CHROME_URI "http://www.mozilla.org/rdf/chrome#" + +DEFINE_RDF_VOCAB(CHROME_URI, CHROME, packages); +DEFINE_RDF_VOCAB(CHROME_URI, CHROME, package); +DEFINE_RDF_VOCAB(CHROME_URI, CHROME, name); +DEFINE_RDF_VOCAB(CHROME_URI, CHROME, platformPackage); + //////////////////////////////////////////////////////////////////////////////// static void @@ -430,19 +427,13 @@ nsChromeRegistry::~nsChromeRegistry() gChromeRegistry = nsnull; } -NS_INTERFACE_MAP_BEGIN(nsChromeRegistry) - NS_INTERFACE_MAP_ENTRY(nsIChromeRegistry) - NS_INTERFACE_MAP_ENTRY(nsIXULChromeRegistry) - NS_INTERFACE_MAP_ENTRY(nsIToolkitChromeRegistry) -#ifdef MOZ_XUL - NS_INTERFACE_MAP_ENTRY(nsIXULOverlayProvider) -#endif - NS_INTERFACE_MAP_ENTRY(nsIObserver) - NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) -NS_INTERFACE_MAP_END - -NS_IMPL_ADDREF(nsChromeRegistry) -NS_IMPL_RELEASE(nsChromeRegistry) +NS_IMPL_THREADSAFE_ISUPPORTS6(nsChromeRegistry, + nsIChromeRegistry, + nsIXULChromeRegistry, + nsIToolkitChromeRegistry, + nsIXULOverlayProvider, + nsIObserver, + nsISupportsWeakReference) //////////////////////////////////////////////////////////////////////////////// // nsIChromeRegistry methods: @@ -787,7 +778,6 @@ nsChromeRegistry::GetLocalesForPackage(const nsACString& aPackage, return rv; } -#ifdef MOZ_XUL NS_IMETHODIMP nsChromeRegistry::GetStyleOverlays(nsIURI *aChromeURL, nsISimpleEnumerator **aResult) @@ -808,7 +798,6 @@ nsChromeRegistry::GetXULOverlays(nsIURI *aChromeURL, nsISimpleEnumerator **aResu return NS_NewArrayEnumerator(aResult, *parray); } -#endif // MOZ_XUL //////////////////////////////////////////////////////////////////////// @@ -1409,7 +1398,6 @@ NS_IMETHODIMP nsChromeRegistry::Observe(nsISupports *aSubject, const char *aTopi return rv; } -#ifdef MOZ_XUL static nsresult GetContainerEnumerator(nsIRDFDataSource* ds, nsIRDFResource* res, nsISimpleEnumerator* *aResult, PRInt32 *aCountResult = nsnull) @@ -1807,18 +1795,6 @@ nsChromeRegistry::ProcessOverlays(PRFileDesc *fd, nsIRDFDataSource* aDS, } } -#else // MOZ_XUL - -NS_IMETHODIMP -nsChromeRegistry::ProcessContentsManifest(nsIURI* aOldManifest, nsIURI* aFile, - nsIURI* aBaseURI, PRBool aAppend, - PRBool aSkinOnly) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -#endif // MOZ_XUL - nsresult nsChromeRegistry::ProcessManifest(nsILocalFile* aManifest, PRBool aSkinOnly) { diff --git a/chrome/src/nsChromeRegistry.h b/chrome/src/nsChromeRegistry.h index dd9c6e845778..07013b99702f 100644 --- a/chrome/src/nsChromeRegistry.h +++ b/chrome/src/nsChromeRegistry.h @@ -39,13 +39,10 @@ #include "nsIChromeRegistry.h" #include "nsIToolkitChromeRegistry.h" +#include "nsIXULOverlayProvider.h" #include "nsIObserver.h" #include "nsWeakReference.h" -#ifdef MOZ_XUL -#include "nsIXULOverlayProvider.h" -#endif - #include "pldhash.h" #include "nsCOMArray.h" @@ -64,7 +61,6 @@ class nsILocalFile; class nsIRDFDataSource; class nsIRDFResource; class nsIRDFService; -class nsISimpleEnumerator; class nsIURL; // for component registration @@ -73,9 +69,7 @@ class nsIURL; { 0x47049e42, 0x1d87, 0x482a, { 0x98, 0x4d, 0x56, 0xae, 0x18, 0x5e, 0x36, 0x7a } } class nsChromeRegistry : public nsIToolkitChromeRegistry, -#ifdef MOZ_XUL public nsIXULOverlayProvider, -#endif public nsIObserver, public nsSupportsWeakReference { @@ -86,10 +80,7 @@ public: NS_DECL_NSICHROMEREGISTRY NS_DECL_NSIXULCHROMEREGISTRY NS_DECL_NSITOOLKITCHROMEREGISTRY - -#ifdef MOZ_XUL NS_DECL_NSIXULOVERLAYPROVIDER -#endif NS_DECL_NSIOBSERVER @@ -118,14 +109,12 @@ private: static nsresult GetProviderAndPath(nsIURL* aChromeURL, nsACString& aProvider, nsACString& aPath); -#ifdef MOZ_XUL NS_HIDDEN_(void) ProcessProvider(PRFileDesc *fd, nsIRDFService* aRDFs, nsIRDFDataSource* ds, nsIRDFResource* aRoot, PRBool aIsLocale, const nsACString& aBaseURL); NS_HIDDEN_(void) ProcessOverlays(PRFileDesc *fd, nsIRDFDataSource* ds, nsIRDFResource* aRoot, const nsCSubstring& aType); -#endif NS_HIDDEN_(nsresult) ProcessManifest(nsILocalFile* aManifest, PRBool aSkinOnly); NS_HIDDEN_(nsresult) ProcessManifestBuffer(char *aBuffer, PRInt32 aLength, nsILocalFile* aManifest, PRBool aSkinOnly); diff --git a/config/rules.mk b/config/rules.mk index 12a98d062ed2..38dab2101b6a 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -696,6 +696,9 @@ ifdef HOST_LIBRARY endif endif # !NO_DIST_INSTALL +$(LOOP_OVER_DIRS) +ifndef MOZ_ENABLE_LIBXUL + +$(LOOP_OVER_TOOL_DIRS) +endif ############################################## install:: $(SUBMAKEFILES) $(MAKE_DIRS) diff --git a/embedding/browser/gtk/Makefile.in b/embedding/browser/gtk/Makefile.in index 60a08e22cb60..af6f8ab889d7 100644 --- a/embedding/browser/gtk/Makefile.in +++ b/embedding/browser/gtk/Makefile.in @@ -44,10 +44,10 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = gtkembedmoz -TOOL_DIRS=src +DIRS=src ifdef ENABLE_TESTS -TOOL_DIRS += tests +DIRS += tests endif PACKAGE_FILE = gtkembed.pkg diff --git a/rdf/build/Makefile.in b/rdf/build/Makefile.in index 26cbcfccb6ec..29bac1a4dd2a 100644 --- a/rdf/build/Makefile.in +++ b/rdf/build/Makefile.in @@ -43,6 +43,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = rdf +ifdef MOZ_XUL LIBRARY_NAME = rdf EXPORT_LIBRARY = 1 @@ -79,6 +80,7 @@ EXTRA_DSO_LDOPTS = \ $(MOZ_UNICHARUTIL_LIBS) \ $(MOZ_COMPONENT_LIBS) \ $(NULL) +endif EXPORTS = nsRDFCID.h diff --git a/toolkit/components/Makefile.in b/toolkit/components/Makefile.in index ee70bb36df03..54528b557113 100644 --- a/toolkit/components/Makefile.in +++ b/toolkit/components/Makefile.in @@ -69,19 +69,14 @@ endif ifndef MOZ_THUNDERBIRD DIRS += \ - cookie \ - typeaheadfind \ - $(NULL) - -ifdef MOZ_XUL -DIRS += \ autocomplete \ + cookie \ + help \ history \ passwordmgr \ satchel \ - help \ + typeaheadfind \ $(NULL) -endif # MOZ_XUL endif # MOZ_THUNDERBIRD ifdef MOZ_XPINSTALL diff --git a/toolkit/components/build/Makefile.in b/toolkit/components/build/Makefile.in index 502d889ea301..6aecb883c764 100644 --- a/toolkit/components/build/Makefile.in +++ b/toolkit/components/build/Makefile.in @@ -73,6 +73,8 @@ REQUIRES = \ mimetype \ webbrowserpersist \ progressDlg \ + history \ + satchel \ necko \ windowwatcher \ uriloader \ @@ -94,6 +96,9 @@ CPPSRCS = nsToolkitCompsModule.cpp LOCAL_INCLUDES = \ -I$(srcdir)/../downloads/src \ + -I$(srcdir)/../history/src \ + -I$(srcdir)/../satchel/src \ + -I$(srcdir)/../passwordmgr/base \ -I$(srcdir)/../startup/src \ -I$(srcdir)/../typeaheadfind/src \ -I$(srcdir)/../alerts/src \ @@ -112,7 +117,13 @@ SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX) endif ifndef MOZ_THUNDERBIRD +ifndef MOZ_PLACES +SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)history_s.$(LIB_SUFFIX) +endif + SHARED_LIBRARY_LIBS += \ + $(DIST)/lib/$(LIB_PREFIX)satchel_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)passwordmgr_s.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)fastfind_s.$(LIB_SUFFIX) \ $(NULL) diff --git a/toolkit/components/build/nsToolkitCompsModule.cpp b/toolkit/components/build/nsToolkitCompsModule.cpp index fb6cc1e5e98d..a4f6cab6034c 100644 --- a/toolkit/components/build/nsToolkitCompsModule.cpp +++ b/toolkit/components/build/nsToolkitCompsModule.cpp @@ -45,10 +45,16 @@ #endif #ifndef MOZ_THUNDERBIRD +#include "nsDocShellCID.h" #ifdef MOZ_XPINSTALL #include "nsDownloadManager.h" #include "nsDownloadProxy.h" #endif +#include "nsFormHistory.h" +#include "nsFormFillController.h" +#include "nsGlobalHistory.h" +#include "nsPasswordManager.h" +#include "nsSingleSignonPrompt.h" #include "nsTypeAheadFind.h" #endif @@ -63,12 +69,30 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAlertsService) #ifndef MOZ_THUNDERBIRD NS_GENERIC_FACTORY_CONSTRUCTOR(nsTypeAheadFind) +NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsFormHistory, nsFormHistory::GetInstance) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsFormFillController) +#ifndef MOZ_PLACES +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGlobalHistory, Init) +#endif +NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsPasswordManager, nsPasswordManager::GetInstance) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsSingleSignonPrompt) #ifdef MOZ_XPINSTALL NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDownloadManager, Init) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy) #endif #endif +///////////////////////////////////////////////////////////////////////////// +//// Module Destructor + +static void PR_CALLBACK nsToolkitCompModuleDtor(nsIModule* self) +{ +#ifndef MOZ_THUNDERBIRD + nsFormHistory::ReleaseInstance(); + nsPasswordManager::Shutdown(); +#endif +} + ///////////////////////////////////////////////////////////////////////////// static const nsModuleComponentInfo components[] = @@ -100,10 +124,55 @@ static const nsModuleComponentInfo components[] = nsDownloadProxyConstructor }, #endif + { "HTML Form History", + NS_FORMHISTORY_CID, + NS_FORMHISTORY_CONTRACTID, + nsFormHistoryConstructor }, + + { "HTML Form Fill Controller", + NS_FORMFILLCONTROLLER_CID, + "@mozilla.org/satchel/form-fill-controller;1", + nsFormFillControllerConstructor }, + + { "HTML Form History AutoComplete", + NS_FORMFILLCONTROLLER_CID, + NS_FORMHISTORYAUTOCOMPLETE_CONTRACTID, + nsFormFillControllerConstructor }, + +#ifndef MOZ_PLACES + // "places" replaces global history + { "Global History", + NS_GLOBALHISTORY_CID, + NS_GLOBALHISTORY2_CONTRACTID, + nsGlobalHistoryConstructor }, + + { "Global History", + NS_GLOBALHISTORY_CID, + NS_GLOBALHISTORY_DATASOURCE_CONTRACTID, + nsGlobalHistoryConstructor }, + + { "Global History", + NS_GLOBALHISTORY_CID, + NS_GLOBALHISTORY_AUTOCOMPLETE_CONTRACTID, + nsGlobalHistoryConstructor }, +#endif + + { "Password Manager", + NS_PASSWORDMANAGER_CID, + NS_PASSWORDMANAGER_CONTRACTID, + nsPasswordManagerConstructor, + nsPasswordManager::Register, + nsPasswordManager::Unregister }, + + { "Single Signon Prompt", + NS_SINGLE_SIGNON_PROMPT_CID, + "@mozilla.org/wallet/single-sign-on-prompt;1", + nsSingleSignonPromptConstructor }, + { "TypeAheadFind Component", NS_TYPEAHEADFIND_CID, NS_TYPEAHEADFIND_CONTRACTID, nsTypeAheadFindConstructor }, #endif }; -NS_IMPL_NSGETMODULE(nsToolkitCompsModule, components) +NS_IMPL_NSGETMODULE_WITH_DTOR(nsToolkitCompsModule, components, nsToolkitCompModuleDtor) diff --git a/toolkit/components/history/src/Makefile.in b/toolkit/components/history/src/Makefile.in index 7a6c5e02f316..36be1739bf2e 100644 --- a/toolkit/components/history/src/Makefile.in +++ b/toolkit/components/history/src/Makefile.in @@ -44,11 +44,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = history -LIBRARY_NAME = tkhstory -IS_COMPONENT = 1 -MODULE_NAME = nsToolkitHistory +LIBRARY_NAME = history_s +FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -EXPORT_LIBRARY = 1 REQUIRES = xpcom \ string \ @@ -61,7 +59,6 @@ REQUIRES = xpcom \ unicharutil \ autocomplete \ uconv \ - toolkitcomps \ $(NULL) CPPSRCS = nsGlobalHistory.cpp \ @@ -69,7 +66,3 @@ CPPSRCS = nsGlobalHistory.cpp \ include $(topsrcdir)/config/rules.mk -EXTRA_DSO_LDOPTS = \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(NULL) diff --git a/toolkit/components/history/src/nsGlobalHistory.cpp b/toolkit/components/history/src/nsGlobalHistory.cpp index bec271b03414..4026a80a512e 100644 --- a/toolkit/components/history/src/nsGlobalHistory.cpp +++ b/toolkit/components/history/src/nsGlobalHistory.cpp @@ -86,10 +86,6 @@ #include "nsIObserverService.h" #include "nsITextToSubURI.h" -#include "nsIGenericFactory.h" -#include "nsToolkitCompsCID.h" -#include "nsDocShellCID.h" - PRInt32 nsGlobalHistory::gRefCnt; nsIRDFService* nsGlobalHistory::gRDFService; nsIRDFResource* nsGlobalHistory::kNC_Page; @@ -4678,25 +4674,3 @@ nsGlobalHistory::AutoCompleteSortComparison(nsIMdbRow *row1, nsIMdbRow *row2, } return 0; } - -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGlobalHistory, Init) - -static const nsModuleComponentInfo components[] = -{ - { "Global History", - NS_GLOBALHISTORY_CID, - NS_GLOBALHISTORY2_CONTRACTID, - nsGlobalHistoryConstructor }, - - { "Global History", - NS_GLOBALHISTORY_CID, - NS_GLOBALHISTORY_DATASOURCE_CONTRACTID, - nsGlobalHistoryConstructor }, - - { "Global History", - NS_GLOBALHISTORY_CID, - NS_GLOBALHISTORY_AUTOCOMPLETE_CONTRACTID, - nsGlobalHistoryConstructor } -}; - -NS_IMPL_NSGETMODULE(nsToolkitHistory, components) diff --git a/toolkit/components/passwordmgr/base/Makefile.in b/toolkit/components/passwordmgr/base/Makefile.in index f80dcd45c034..2226bee8ca4b 100644 --- a/toolkit/components/passwordmgr/base/Makefile.in +++ b/toolkit/components/passwordmgr/base/Makefile.in @@ -44,11 +44,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = passwordmgr -LIBRARY_NAME = passwordmgr -MODULE_NAME = nsPasswordManager -IS_COMPONENT = 1 +LIBRARY_NAME = passwordmgr_s +FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -EXPORT_LIBRARY = 1 REQUIRES = \ necko \ @@ -64,7 +62,6 @@ REQUIRES = \ widget \ autocomplete \ pipnss \ - toolkitcomps \ $(NULL) XPIDLSRCS = \ @@ -77,9 +74,5 @@ CPPSRCS = \ nsSingleSignonPrompt.cpp \ $(NULL) -include $(topsrcdir)/config/rules.mk -EXTRA_DSO_LDOPTS = \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(NULL) +include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/passwordmgr/base/nsPasswordManager.cpp b/toolkit/components/passwordmgr/base/nsPasswordManager.cpp index c55899107608..1cb7e0cbb27d 100644 --- a/toolkit/components/passwordmgr/base/nsPasswordManager.cpp +++ b/toolkit/components/passwordmgr/base/nsPasswordManager.cpp @@ -70,9 +70,6 @@ #include "nsIAutoCompleteResult.h" #include "nsIPK11TokenDB.h" #include "nsIPK11Token.h" -#include "nsIGenericFactory.h" -#include "nsToolkitCompsCID.h" -#include "nsSingleSignonPrompt.h" static const char kPMPropertiesURL[] = "chrome://passwordmgr/locale/passwordmgr.properties"; static PRBool sRememberPasswords = PR_FALSE; @@ -2010,29 +2007,3 @@ nsPasswordManager::GetLocalizedString(const nsAString& key, getter_Copies(str)); aResult.Assign(str); } - -NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsPasswordManager, nsPasswordManager::GetInstance) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsSingleSignonPrompt) - -static void PR_CALLBACK nsPasswordManagerShutdown(nsIModule* self) -{ - nsPasswordManager::Shutdown(); -} - -static const nsModuleComponentInfo components[] = -{ - { "Password Manager", - NS_PASSWORDMANAGER_CID, - NS_PASSWORDMANAGER_CONTRACTID, - nsPasswordManagerConstructor, - nsPasswordManager::Register, - nsPasswordManager::Unregister }, - - { "Single Signon Prompt", - NS_SINGLE_SIGNON_PROMPT_CID, - "@mozilla.org/wallet/single-sign-on-prompt;1", - nsSingleSignonPromptConstructor } -}; - -NS_IMPL_NSGETMODULE_WITH_DTOR(nsPasswordManager, components, - nsPasswordManagerShutdown) diff --git a/toolkit/components/satchel/src/Makefile.in b/toolkit/components/satchel/src/Makefile.in index 3d2aff5d9f21..d1e983d562d7 100644 --- a/toolkit/components/satchel/src/Makefile.in +++ b/toolkit/components/satchel/src/Makefile.in @@ -44,11 +44,9 @@ VPATH=@srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = satchel -LIBRARY_NAME = satchel -MODULE_NAME = satchel -IS_COMPONENT = 1 +LIBRARY_NAME = satchel_s +FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -EXPORT_LIBRARY = 1 REQUIRES = \ xpcom \ @@ -68,7 +66,6 @@ REQUIRES = \ unicharutil \ intl \ pref \ - toolkitcomps \ $(NULL) CPPSRCS = nsFormFillController.cpp \ @@ -78,8 +75,3 @@ CPPSRCS = nsFormFillController.cpp \ LOCAL_INCLUDES = -I$(srcdir)/../../passwordmgr/base include $(topsrcdir)/config/rules.mk - -EXTRA_DSO_LDOPTS = \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(NULL) diff --git a/toolkit/components/satchel/src/nsFormFillController.cpp b/toolkit/components/satchel/src/nsFormFillController.cpp index 3b33dcf8a593..0d115f0e1e1a 100644 --- a/toolkit/components/satchel/src/nsFormFillController.cpp +++ b/toolkit/components/satchel/src/nsFormFillController.cpp @@ -70,8 +70,6 @@ #include "nsIDOMHTMLFormElement.h" #include "nsPasswordManager.h" #include "nsIDOMMouseEvent.h" -#include "nsIGenericFactory.h" -#include "nsToolkitCompsCID.h" NS_INTERFACE_MAP_BEGIN(nsFormFillController) NS_INTERFACE_MAP_ENTRY(nsIFormFillController) @@ -1104,31 +1102,3 @@ nsFormFillController::GetIndexOfDocShell(nsIDocShell *aDocShell) return -1; } - -NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsFormHistory, nsFormHistory::GetInstance) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsFormFillController) - -static void PR_CALLBACK nsFormHistoryModuleDtor(nsIModule* self) -{ - nsFormHistory::ReleaseInstance(); -} - -static const nsModuleComponentInfo components[] = -{ - { "HTML Form History", - NS_FORMHISTORY_CID, - NS_FORMHISTORY_CONTRACTID, - nsFormHistoryConstructor }, - - { "HTML Form Fill Controller", - NS_FORMFILLCONTROLLER_CID, - "@mozilla.org/satchel/form-fill-controller;1", - nsFormFillControllerConstructor }, - - { "HTML Form History AutoComplete", - NS_FORMFILLCONTROLLER_CID, - NS_FORMHISTORYAUTOCOMPLETE_CONTRACTID, - nsFormFillControllerConstructor } -}; - -NS_IMPL_NSGETMODULE_WITH_DTOR(satchel, components, nsFormHistoryModuleDtor) diff --git a/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk index a85b2995b2f5..50aab3ac1731 100644 --- a/toolkit/library/libxul-config.mk +++ b/toolkit/library/libxul-config.mk @@ -103,24 +103,16 @@ COMPONENT_LIBS += \ mozfind \ appcomps \ commandlines \ + tkautocomplete \ toolkitcomps \ xpinstall \ jsd \ + pippki \ pipboot \ pipnss \ autoconfig \ $(NULL) -ifdef MOZ_XUL -COMPONENT_LIBS += \ - tkautocomplete \ - tkhstory \ - passwordmgr \ - satchel \ - pippki \ - $(NULL) -endif - ifeq ($(OS_ARCH),WINNT) COMPONENT_LIBS += intlcmpt endif diff --git a/toolkit/library/nsStaticXULComponents.cpp b/toolkit/library/nsStaticXULComponents.cpp index 61f7c065a0f9..197e9d149305 100644 --- a/toolkit/library/nsStaticXULComponents.cpp +++ b/toolkit/library/nsStaticXULComponents.cpp @@ -151,17 +151,6 @@ #define SYSTEMPREF_MODULES #endif -#ifdef MOZ_XUL -#define XULENABLED_MODULES \ - MODULE(tkAutoCompleteModule) \ - MODULE(nsToolkitHistory) \ - MODULE(nsPasswordManager) \ - MODULE(satchel) \ - MODULE(PKI) -#else -#define XULENABLED_MODULES -#endif - #define XUL_MODULES \ MODULE(xpcomObsoleteModule) \ MODULE(xpconnect) \ @@ -202,11 +191,12 @@ MODULE(application) \ MODULE(Apprunner) \ MODULE(CommandLineModule) \ - XULENABLED_MODULES \ + MODULE(tkAutoCompleteModule) \ MODULE(nsToolkitCompsModule) \ XREMOTE_MODULES \ MODULE(nsSoftwareUpdate) \ MODULE(JavaScript_Debugger) \ + MODULE(PKI) \ MODULE(BOOT) \ MODULE(NSS) \ MODULE(nsAutoConfigModule) \