mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-28 23:31:56 +00:00
Bug 341406 - Build bookmarks as a separate component, r+sr=Neil
This commit is contained in:
benjamin%smedbergs.us
parent
1dbfc65b62
commit
53ac0b7a23
@ -389,7 +389,10 @@ tier_99_dirs += calendar/sunbird
|
||||
endif
|
||||
|
||||
ifdef MOZ_SUITE
|
||||
tier_99_dirs += xpfe/components/search
|
||||
tier_99_dirs += \
|
||||
xpfe/components/search \
|
||||
xpfe/components/bookmarks \
|
||||
$(NULL)
|
||||
|
||||
# When Suite becomes a full MOZ_XUL_APP we can remove this ifdef
|
||||
ifdef MOZ_XUL_APP
|
||||
|
||||
@ -84,7 +84,6 @@ DIRS += \
|
||||
related \
|
||||
console \
|
||||
autocomplete \
|
||||
bookmarks \
|
||||
download-manager \
|
||||
history \
|
||||
sidebar \
|
||||
|
||||
@ -42,9 +42,12 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = appcomps
|
||||
LIBRARY_NAME = bookmarks_s
|
||||
MODULE = appcomps
|
||||
LIBRARY_NAME = bookmark
|
||||
MODULE_NAME = BookmarkModule
|
||||
MOZILLA_INTERNAL_API = 1
|
||||
IS_COMPONENT = 1
|
||||
EXPORT_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
@ -68,9 +71,9 @@ REQUIRES = xpcom \
|
||||
|
||||
CPPSRCS = nsBookmarksService.cpp
|
||||
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(MOZ_UNICHARUTIL_LIBS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
@ -73,6 +73,7 @@
|
||||
#include "nsIURL.h"
|
||||
#include "nsIFileURL.h"
|
||||
#include "nsIFile.h"
|
||||
#include "nsIGenericFactory.h"
|
||||
#include "nsIInputStream.h"
|
||||
#include "nsILineInputStream.h"
|
||||
#include "nsIOutputStream.h"
|
||||
@ -6051,3 +6052,17 @@ nsBookmarksService::OnEndUpdateBatch(nsIRDFDataSource* aDataSource)
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsBookmarksService, Init)
|
||||
|
||||
static const nsModuleComponentInfo components[] = {
|
||||
{ "Bookmarks", NS_BOOKMARKS_SERVICE_CID, NS_BOOKMARKS_SERVICE_CONTRACTID,
|
||||
nsBookmarksServiceConstructor },
|
||||
{ "Bookmarks", NS_BOOKMARKS_SERVICE_CID,
|
||||
"@mozilla.org/embeddor.implemented/bookmark-charset-resolver;1",
|
||||
nsBookmarksServiceConstructor },
|
||||
{ "Bookmarks", NS_BOOKMARKS_SERVICE_CID, NS_BOOKMARKS_DATASOURCE_CONTRACTID,
|
||||
nsBookmarksServiceConstructor }
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE(BookmarkModule, components)
|
||||
|
||||
@ -110,13 +110,11 @@ 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)
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(srcdir)/../bookmarks/src \
|
||||
-I$(srcdir)/../download-manager/src \
|
||||
-I$(srcdir)/../history/src \
|
||||
-I$(srcdir)/../related/src \
|
||||
|
||||
@ -43,7 +43,6 @@
|
||||
#include "nsRDFCID.h"
|
||||
|
||||
#ifdef MOZ_SUITE
|
||||
#include "nsBookmarksService.h"
|
||||
#include "nsRelatedLinksHandlerImpl.h"
|
||||
#include "nsGlobalHistory.h"
|
||||
#include "nsDocShellCID.h"
|
||||
@ -93,7 +92,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserInstance)
|
||||
|
||||
#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)
|
||||
@ -164,13 +162,6 @@ static const nsModuleComponentInfo components[] = {
|
||||
nsHTTPIndexConstructor },
|
||||
|
||||
#ifdef MOZ_SUITE
|
||||
{ "Bookmarks", NS_BOOKMARKS_SERVICE_CID, NS_BOOKMARKS_SERVICE_CONTRACTID,
|
||||
nsBookmarksServiceConstructor },
|
||||
{ "Bookmarks", NS_BOOKMARKS_SERVICE_CID,
|
||||
"@mozilla.org/embeddor.implemented/bookmark-charset-resolver;1",
|
||||
nsBookmarksServiceConstructor },
|
||||
{ "Bookmarks", NS_BOOKMARKS_SERVICE_CID, NS_BOOKMARKS_DATASOURCE_CONTRACTID,
|
||||
nsBookmarksServiceConstructor },
|
||||
{ "Download Manager", NS_DOWNLOADMANAGER_CID, NS_DOWNLOADMANAGER_CONTRACTID,
|
||||
nsDownloadManagerConstructor },
|
||||
{ "Download", NS_DOWNLOAD_CID, NS_TRANSFER_CONTRACTID,
|
||||
|
||||
@ -80,6 +80,7 @@ bin/components/accessibility.xpt
|
||||
bin/components/appshell.xpt
|
||||
bin/components/appshell.dll
|
||||
bin/components/appcomps.dll
|
||||
bin/components/bookmark.dll
|
||||
bin/components/windowds.dll
|
||||
bin/components/intlapp.dll
|
||||
bin/components/xpautoc.dll
|
||||
|
||||
@ -80,6 +80,7 @@ bin/components/alerts.xpt
|
||||
bin/components/libaccessibility.so
|
||||
bin/components/accessibility.xpt
|
||||
bin/components/libappcomps.so
|
||||
bin/components/libbookmark.so
|
||||
bin/components/libwindowds.so
|
||||
bin/components/libintlapp.so
|
||||
bin/components/libxpautocomplete.so
|
||||
|
||||
@ -63,6 +63,7 @@ bin\xpicleanup.exe
|
||||
bin\components\AcctIdl.dll
|
||||
bin\components\AcctIdl.xpt
|
||||
bin\components\appcomps.dll
|
||||
bin\components\bookmark.dll
|
||||
bin\components\windowds.dll
|
||||
bin\components\intlapp.dll
|
||||
bin\components\xpautoc.dll
|
||||
|
||||
Loading…
Reference in New Issue
Block a user