mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 597789 - Remove --disable-rdf; r=ted

This commit is contained in:
Matheus Kerschbaum 2011-11-08 11:42:54 +00:00
Родитель 1d466d7f71
Коммит d57bd99869
13 изменённых файлов: 30 добавлений и 134 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
config/autoconf.mk.in
Просмотреть файл

@ -223,7 +223,6 @@ MOZ_POST_PROGRAM_COMMAND = @MOZ_POST_PROGRAM_COMMAND@
MOZ_BUILD_ROOT = @MOZ_BUILD_ROOT@
MOZ_XUL = @MOZ_XUL@
MOZ_RDF = @MOZ_RDF@
NECKO_PROTOCOLS = @NECKO_PROTOCOLS@
NECKO_COOKIES = @NECKO_COOKIES@

13
configure.in
Просмотреть файл

@ -4573,7 +4573,6 @@ MOZ_PLACES=1
MOZ_PREF_EXTENSIONS=1
MOZ_PROFILELOCKING=1
MOZ_PSM=1
MOZ_RDF=1
MOZ_REFLOW_PERF=
MOZ_SAFE_BROWSING=
MOZ_HELP_VIEWER=
@ -8139,18 +8138,6 @@ if test "$MOZ_PROFILELOCKING"; then
AC_DEFINE(MOZ_PROFILELOCKING)
fi
dnl ========================================================
dnl disable rdf services
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(rdf,
[ --disable-rdf Disable RDF],
MOZ_RDF= )
if test "$MOZ_RDF"; then
AC_DEFINE(MOZ_RDF)
fi
AC_SUBST(MOZ_RDF)
dnl ========================================================
dnl necko configuration options
dnl ========================================================

11
toolkit/components/Makefile.in
Просмотреть файл

@ -56,9 +56,11 @@ PARALLEL_DIRS += \
console \
contentprefs \
cookie \
downloads \
exthelper \
filepicker \
find \
intl \
microformats \
parentalcontrols \
passwordmgr \
@ -68,11 +70,11 @@ PARALLEL_DIRS += \
reflect \
startup \
statusfilter \
telemetry \
typeaheadfind \
urlformatter \
viewconfig \
viewsource \
telemetry \
$(NULL)
ifdef BUILD_CTYPES
@ -110,13 +112,6 @@ ifdef MOZ_TOOLKIT_SEARCH
PARALLEL_DIRS += search
endif
ifdef MOZ_RDF
PARALLEL_DIRS += \
downloads \
intl \
$(NULL)
endif
ifdef MOZ_URL_CLASSIFIER
PARALLEL_DIRS += url-classifier
endif

9
toolkit/components/build/Makefile.in
Просмотреть файл

@ -83,6 +83,8 @@ SHARED_LIBRARY_LIBS = \
../typeaheadfind/$(LIB_PREFIX)fastfind_s.$(LIB_SUFFIX) \
../startup/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
../statusfilter/$(LIB_PREFIX)mozbrwsr_s.$(LIB_SUFFIX) \
../downloads/$(LIB_PREFIX)download_s.$(LIB_SUFFIX) \
../intl/$(LIB_PREFIX)intl_s.$(LIB_SUFFIX) \
$(NULL)
ifndef MOZ_DISABLE_PARENTAL_CONTROLS
@ -94,13 +96,6 @@ LOCAL_INCLUDES += \
endif
endif
ifdef MOZ_RDF
SHARED_LIBRARY_LIBS += \
../downloads/$(LIB_PREFIX)download_s.$(LIB_SUFFIX) \
../intl/$(LIB_PREFIX)intl_s.$(LIB_SUFFIX) \
$(NULL)
endif
ifdef ALERTS_SERVICE
SHARED_LIBRARY_LIBS += ../alerts/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
endif

10
toolkit/components/build/nsToolkitCompsModule.cpp
Просмотреть файл

@ -50,12 +50,10 @@
#include "nsAlertsService.h"
#endif
#ifdef MOZ_RDF
#include "nsDownloadManager.h"
#include "nsDownloadProxy.h"
#include "nsCharsetMenu.h"
#include "rdf.h"
#endif
#include "nsTypeAheadFind.h"
@ -86,11 +84,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsParentalControlsServiceWin)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAlertsService)
#endif
#ifdef MOZ_RDF
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsDownloadManager,
nsDownloadManager::GetSingleton)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy)
#endif
NS_GENERIC_FACTORY_CONSTRUCTOR(nsTypeAheadFind)
@ -133,10 +129,8 @@ NS_DEFINE_NAMED_CID(NS_ALERTSSERVICE_CID);
#if defined(XP_WIN) && !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
NS_DEFINE_NAMED_CID(NS_PARENTALCONTROLSSERVICE_CID);
#endif
#ifdef MOZ_RDF
NS_DEFINE_NAMED_CID(NS_DOWNLOADMANAGER_CID);
NS_DEFINE_NAMED_CID(NS_DOWNLOAD_CID);
#endif
NS_DEFINE_NAMED_CID(NS_FIND_SERVICE_CID);
NS_DEFINE_NAMED_CID(NS_TYPEAHEADFIND_CID);
#ifdef MOZ_URL_CLASSIFIER
@ -160,10 +154,8 @@ static const mozilla::Module::CIDEntry kToolkitCIDs[] = {
#if defined(XP_WIN) && !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
{ &kNS_PARENTALCONTROLSSERVICE_CID, false, NULL, nsParentalControlsServiceWinConstructor },
#endif
#ifdef MOZ_RDF
{ &kNS_DOWNLOADMANAGER_CID, false, NULL, nsDownloadManagerConstructor },
{ &kNS_DOWNLOAD_CID, false, NULL, nsDownloadProxyConstructor },
#endif
{ &kNS_FIND_SERVICE_CID, false, NULL, nsFindServiceConstructor },
{ &kNS_TYPEAHEADFIND_CID, false, NULL, nsTypeAheadFindConstructor },
#ifdef MOZ_URL_CLASSIFIER
@ -189,10 +181,8 @@ static const mozilla::Module::ContractIDEntry kToolkitContracts[] = {
#if defined(XP_WIN) && !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
{ NS_PARENTALCONTROLSSERVICE_CONTRACTID, &kNS_PARENTALCONTROLSSERVICE_CID },
#endif
#ifdef MOZ_RDF
{ NS_DOWNLOADMANAGER_CONTRACTID, &kNS_DOWNLOADMANAGER_CID },
{ NS_TRANSFER_CONTRACTID, &kNS_DOWNLOAD_CID },
#endif
{ NS_FIND_SERVICE_CONTRACTID, &kNS_FIND_SERVICE_CID },
{ NS_TYPEAHEADFIND_CONTRACTID, &kNS_TYPEAHEADFIND_CID },
#ifdef MOZ_URL_CLASSIFIER

39
toolkit/library/Makefile.in
Просмотреть файл

@ -42,9 +42,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifdef MOZ_RDF
include $(topsrcdir)/rdf/util/src/objs.mk
endif
include $(topsrcdir)/intl/unicharutil/util/objs.mk
MODULE = libxul
@ -90,39 +88,26 @@ SHARED_LIBRARY_LIBS += \
include $(srcdir)/libxul-config.mk
EXTRA_DEPS += \
$(srcdir)/libxul-config.mk \
$(srcdir)/libxul-rules.mk \
$(topsrcdir)/intl/unicharutil/util/objs.mk \
$(NULL)
$(srcdir)/libxul-config.mk \
$(srcdir)/libxul-rules.mk \
$(topsrcdir)/intl/unicharutil/util/objs.mk \
$(topsrcdir)/rdf/util/src/objs.mk \
$(NULL)
CPPSRCS += \
$(INTL_UNICHARUTIL_UTIL_LCPPSRCS) \
$(NULL)
$(INTL_UNICHARUTIL_UTIL_LCPPSRCS) \
$(RDF_UTIL_SRC_LCPPSRCS) \
$(NULL)
GARBAGE += \
$(INTL_UNICHARUTIL_UTIL_LCPPSRCS) \
$(wildcard *.$(OBJ_SUFFIX)) \
$(NULL)
$(INTL_UNICHARUTIL_UTIL_LCPPSRCS) \
$(wildcard *.$(OBJ_SUFFIX)) \
$(RDF_UTIL_SRC_LCPPSRCS) \
$(NULL)
LOCAL_INCLUDES += -I$(topsrcdir)/intl/unicharutil/util \
-I$(topsrcdir)/intl/unicharutil/src
ifdef MOZ_RDF
EXTRA_DEPS += \
$(topsrcdir)/rdf/util/src/objs.mk \
$(NULL)
CPPSRCS += \
$(RDF_UTIL_SRC_LCPPSRCS) \
$(NULL)
GARBAGE += \
$(RDF_UTIL_SRC_LCPPSRCS) \
$(NULL)
endif
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
SDK_LIBRARY = $(IMPORT_LIBRARY)
else

11
toolkit/library/libxul-config.mk
Просмотреть файл

@ -123,7 +123,7 @@ COMPONENT_LIBS += \
i18n \
chardet \
jar$(VERSION_NUMBER) \
startupcache \
startupcache \
pref \
htmlpars \
imglib2 \
@ -145,6 +145,8 @@ COMPONENT_LIBS += \
telemetry \
jsdebugger \
storagecomps \
rdf \
windowds \
$(NULL)
ifdef BUILD_CTYPES
@ -215,13 +217,6 @@ COMPONENT_LIBS += universalchardet
DEFINES += -DMOZ_UNIVERSALCHARDET
endif
ifdef MOZ_RDF
COMPONENT_LIBS += \
rdf \
windowds \
$(NULL)
endif
ifeq (,$(filter android qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
ifdef MOZ_XUL
COMPONENT_LIBS += fileview

28
toolkit/library/nsStaticXULComponents.cpp
Просмотреть файл

@ -65,8 +65,6 @@
#define UNIVERSALCHARDET_MODULE
#endif
#define GFX_MODULES MODULE(nsGfxModule)
#ifdef XP_WIN
# define WIDGET_MODULES MODULE(nsWidgetModule)
#elif defined(XP_MACOSX)
@ -89,14 +87,6 @@
#define ICON_MODULE
#endif
#ifdef MOZ_RDF
#define RDF_MODULES \
MODULE(nsRDFModule) \
MODULE(nsWindowDataSourceModule)
#else
#define RDF_MODULES
#endif
#ifdef ACCESSIBILITY
#define ACCESS_MODULES MODULE(nsAccessibilityModule)
#else
@ -134,9 +124,6 @@
#define JETPACK_MODULES
#endif
#define PLUGINS_MODULES \
MODULE(nsPluginModule)
#ifdef MOZ_JSDEBUGGER
#define JSDEBUGGER_MODULES \
MODULE(JavaScript_Debugger)
@ -208,10 +195,6 @@
#define JSCTYPES_MODULE
#endif
#define JSREFLECT_MODULE MODULE(jsreflect)
#define SERVICES_CRYPTO_MODULE MODULE(nsServicesCryptoModule)
#ifndef MOZ_APP_COMPONENT_MODULES
#if defined(MOZ_APP_COMPONENT_INCLUDE)
#include MOZ_APP_COMPONENT_INCLUDE
@ -233,14 +216,15 @@
ZIPWRITER_MODULE \
MODULE(StartupCacheModule) \
MODULE(nsPrefModule) \
RDF_MODULES \
MODULE(nsRDFModule) \
MODULE(nsWindowDataSourceModule) \
MODULE(nsParserModule) \
GFX_MODULES \
MODULE(nsGfxModule) \
WIDGET_MODULES \
MODULE(nsImageLib2Module) \
ICON_MODULE \
JETPACK_MODULES \
PLUGINS_MODULES \
MODULE(nsPluginModule) \
MODULE(nsLayoutModule) \
MODULE(docshell_provider) \
MODULE(embedcomponents) \
@ -268,9 +252,9 @@
OSXPROXY_MODULE \
WINDOWSPROXY_MODULE \
JSCTYPES_MODULE \
JSREFLECT_MODULE \
MODULE(jsreflect) \
MODULE(jsperf) \
SERVICES_CRYPTO_MODULE \
MODULE(nsServicesCryptoModule) \
MOZ_APP_COMPONENT_MODULES \
MODULE(nsTelemetryModule) \
MODULE(jsdebugger) \

2
toolkit/toolkit-tiers.mk
Просмотреть файл

@ -117,9 +117,7 @@ tier_platform_dirs += \
$(NULL)
endif
ifdef MOZ_RDF
tier_platform_dirs += rdf
endif
ifdef MOZ_JSDEBUGGER
tier_platform_dirs += js/jsd

14
xpfe/components/Makefile.in
Просмотреть файл

@ -46,16 +46,10 @@ MODULE = appcomps
include $(topsrcdir)/config/config.mk
ifdef MOZ_RDF
DIRS += \
windowds \
$(NULL)
endif
# build should be last
DIRS += \
directory \
build \
$(NULL)
windowds \
directory \
build \
$(NULL)
include $(topsrcdir)/config/rules.mk

11
xpfe/components/build/nsModule.cpp
Просмотреть файл

@ -38,38 +38,27 @@
#include "mozilla/ModuleUtils.h"
#include "nsNetUtil.h"
#include "nsDirectoryViewer.h"
#ifdef MOZ_RDF
#include "rdf.h"
#include "nsRDFCID.h"
#endif
#include "nsCURILoader.h"
#ifdef MOZ_RDF
// Factory constructors
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsHTTPIndex, Init)
#endif
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDirectoryViewerFactory)
NS_DEFINE_NAMED_CID(NS_DIRECTORYVIEWERFACTORY_CID);
#ifdef MOZ_RDF
NS_DEFINE_NAMED_CID(NS_HTTPINDEX_SERVICE_CID);
#endif
static const mozilla::Module::CIDEntry kXPFECIDs[] = {
{ &kNS_DIRECTORYVIEWERFACTORY_CID, false, NULL, nsDirectoryViewerFactoryConstructor },
#ifdef MOZ_RDF
{ &kNS_HTTPINDEX_SERVICE_CID, false, NULL, nsHTTPIndexConstructor },
#endif
{ NULL }
};
static const mozilla::Module::ContractIDEntry kXPFEContracts[] = {
{ "@mozilla.org/xpfe/http-index-format-factory-constructor", &kNS_DIRECTORYVIEWERFACTORY_CID },
#ifdef MOZ_RDF
{ NS_HTTPINDEX_SERVICE_CONTRACTID, &kNS_HTTPINDEX_SERVICE_CID },
{ NS_HTTPINDEX_DATASOURCE_CONTRACTID, &kNS_HTTPINDEX_SERVICE_CID },
#endif
{ NULL }
};

10
xpfe/components/directory/nsDirectoryViewer.cpp
Просмотреть файл

@ -58,11 +58,9 @@
#include "nsCRT.h"
#include "nsEscape.h"
#include "nsIEnumerator.h"
#ifdef MOZ_RDF
#include "nsIRDFService.h"
#include "nsRDFCID.h"
#include "rdf.h"
#endif
#include "nsIScriptContext.h"
#include "nsIScriptGlobalObject.h"
#include "nsIServiceManager.h"
@ -100,9 +98,7 @@ static const int FORMAT_XUL = 3;
// Common CIDs
//
#ifdef MOZ_RDF
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
#endif
// Various protocols we have to special case
static const char kFTPProtocol[] = "ftp://";
@ -112,7 +108,6 @@ static const char kFTPProtocol[] = "ftp://";
// nsHTTPIndex
//
#ifdef MOZ_RDF
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsHTTPIndex)
NS_INTERFACE_MAP_ENTRY(nsIHTTPIndex)
NS_INTERFACE_MAP_ENTRY(nsIRDFDataSource)
@ -1300,8 +1295,6 @@ nsHTTPIndex::GetAllCmds(nsIRDFResource *aSource, nsISimpleEnumerator **_retval)
return(rv);
}
#endif /* MOZ_RDF */
//----------------------------------------------------------------------
//
@ -1335,8 +1328,6 @@ nsDirectoryViewerFactory::CreateInstance(const char *aCommand,
nsresult rv;
bool viewSource = (PL_strstr(aContentType,"view-source") != 0);
#ifdef MOZ_RDF
if (!viewSource &&
Preferences::GetInt("network.dir.format", FORMAT_XUL) == FORMAT_XUL) {
@ -1397,7 +1388,6 @@ nsDirectoryViewerFactory::CreateInstance(const char *aCommand,
return NS_OK;
}
#endif
// setup the original channel's content type
(void)aChannel->SetContentType(NS_LITERAL_CSTRING("text/html"));

5
xpfe/components/directory/nsDirectoryViewer.h
Просмотреть файл

@ -43,12 +43,10 @@
#include "nsNetUtil.h"
#include "nsIStreamListener.h"
#include "nsIContentViewer.h"
#ifdef MOZ_RDF
#include "nsIHTTPIndex.h"
#include "nsIRDFService.h"
#include "nsIRDFDataSource.h"
#include "nsIRDFLiteral.h"
#endif
#include "nsIDocumentLoaderFactory.h"
#include "nsITimer.h"
#include "nsISupportsArray.h"
@ -68,7 +66,6 @@ public:
NS_DECL_NSIDOCUMENTLOADERFACTORY
};
#ifdef MOZ_RDF
class nsHTTPIndex : public nsIHTTPIndex,
public nsIRDFDataSource,
public nsIStreamListener,
@ -149,11 +146,9 @@ public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsHTTPIndex, nsIHTTPIndex)
};
#endif
// {82776710-5690-11d3-BE36-00104BDE6048}
#define NS_DIRECTORYVIEWERFACTORY_CID \
{ 0x82776710, 0x5690, 0x11d3, { 0xbe, 0x36, 0x0, 0x10, 0x4b, 0xde, 0x60, 0x48 } }
#endif // nsdirectoryviewer__h____