mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-04-02 12:32:55 +00:00
Combined all necko dlls into two. Bug 17031.
This commit is contained in:
warren%netscape.com
parent
eb6959f7b7
commit
185c96de20
@ -27,16 +27,16 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = necko_datetime
|
||||
SHORT_LIBNAME = neckodtm
|
||||
IS_COMPONENT = 1
|
||||
LIBRARY_NAME = nkdatetm_s
|
||||
|
||||
CPPSRCS = \
|
||||
nsDateTimeHandler.cpp \
|
||||
nsDateTimeChannel.cpp \
|
||||
nsDateTimeModule.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -27,15 +27,16 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = necko_finger
|
||||
IS_COMPONENT = 1
|
||||
LIBRARY_NAME = nkfinger_s
|
||||
|
||||
CPPSRCS = \
|
||||
nsFingerHandler.cpp \
|
||||
nsFingerChannel.cpp \
|
||||
nsFingerModule.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -27,15 +27,16 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = \
|
||||
cache \
|
||||
base \
|
||||
cache \
|
||||
dns \
|
||||
socket \
|
||||
build \
|
||||
protocol \
|
||||
resources \
|
||||
mime \
|
||||
streamconv \
|
||||
protocol \
|
||||
build \
|
||||
build2 \
|
||||
resources \
|
||||
$(NULL)
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
|
||||
@ -27,7 +27,6 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
XPIDL_MODULE = necko_base
|
||||
|
||||
XPIDLSRCS = \
|
||||
nsIFileStreams.idl \
|
||||
|
||||
@ -62,4 +62,4 @@ install:: $(LIBRARY)
|
||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
$(RM) $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
@ -121,7 +121,7 @@ nsFileTransport::Init(nsFileTransportService *aService, nsIStreamIO* io)
|
||||
|
||||
mService = aService;
|
||||
if (mService)
|
||||
PR_AtomicIncrement (&mService -> mTotalTransports);
|
||||
PR_AtomicIncrement(&mService->mTotalTransports);
|
||||
|
||||
return rv;
|
||||
}
|
||||
@ -508,7 +508,7 @@ nsFileTransport::Process(void)
|
||||
("nsFileTransport: OPENING [this=%x %s]",
|
||||
this, mStreamName.GetBuffer()));
|
||||
mStatus = mStreamIO->Open(&mContentType, &mTotalAmount);
|
||||
if (NS_SUCCEEDED(mStatus) && mOpenObserver) {
|
||||
if (mOpenObserver) {
|
||||
mStatus = mOpenObserver->OnStartRequest(this, mOpenContext);
|
||||
}
|
||||
switch (mCommand) {
|
||||
@ -531,7 +531,7 @@ nsFileTransport::Process(void)
|
||||
this, mStreamName.GetBuffer()));
|
||||
|
||||
if (mService)
|
||||
PR_AtomicIncrement (&mService -> mConnectedTransports);
|
||||
PR_AtomicIncrement(&mService->mConnectedTransports);
|
||||
|
||||
break;
|
||||
}
|
||||
@ -542,7 +542,7 @@ nsFileTransport::Process(void)
|
||||
this, mStreamName.GetBuffer()));
|
||||
|
||||
if (mService)
|
||||
PR_AtomicIncrement (&mService -> mInUseTransports);
|
||||
PR_AtomicIncrement(&mService->mInUseTransports);
|
||||
|
||||
mStatus = mStreamIO->GetInputStream(getter_AddRefs(mSource));
|
||||
if (NS_FAILED(mStatus)) {
|
||||
@ -641,8 +641,8 @@ nsFileTransport::Process(void)
|
||||
|
||||
case END_READ: {
|
||||
|
||||
if (mService)
|
||||
PR_AtomicDecrement (&mService -> mInUseTransports);
|
||||
if (mService)
|
||||
PR_AtomicDecrement(&mService->mInUseTransports);
|
||||
|
||||
PR_LOG(gFileTransportLog, PR_LOG_DEBUG,
|
||||
("nsFileTransport: END_READ [this=%x %s] status=%x",
|
||||
@ -685,7 +685,7 @@ nsFileTransport::Process(void)
|
||||
this, mStreamName.GetBuffer()));
|
||||
|
||||
if (mService)
|
||||
PR_AtomicIncrement (&mService -> mInUseTransports);
|
||||
PR_AtomicIncrement(&mService->mInUseTransports);
|
||||
|
||||
mStatus = mStreamIO->GetOutputStream(getter_AddRefs(mSink));
|
||||
if (NS_FAILED(mStatus)) {
|
||||
@ -789,7 +789,7 @@ nsFileTransport::Process(void)
|
||||
this, mStreamName.GetBuffer(), mStatus));
|
||||
|
||||
if (mService)
|
||||
PR_AtomicDecrement (&mService -> mInUseTransports);
|
||||
PR_AtomicDecrement(&mService->mInUseTransports);
|
||||
|
||||
if (mSink) {
|
||||
mSink->Flush();
|
||||
|
||||
@ -36,12 +36,40 @@ SHARED_LIBRARY_LIBS = \
|
||||
$(DIST)/lib/libneckobase_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libneckodns_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libneckosocket_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnkconv_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnkcnvts_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnkcachemgr_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnkfilecache_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnkmemcache_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnkmime_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnkhttp_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnkfile_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnkdata_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnkjar_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnkres_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnkabout_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnkkwd_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libzlib.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(srcdir)/../base/src \
|
||||
-I$(srcdir)/../dns/src \
|
||||
-I$(srcdir)/../socket/base \
|
||||
-I$(srcdir)/../streamconv/src \
|
||||
-I$(srcdir)/../streamconv/converters \
|
||||
-I$(srcdir)/../cache/memcache \
|
||||
-I$(srcdir)/../cache/filecache \
|
||||
-I$(srcdir)/../cache/mgr \
|
||||
-I$(srcdir)/../mime/src \
|
||||
-I$(srcdir)/../protocol/http/src \
|
||||
-I$(srcdir)/../protocol/file/src \
|
||||
-I$(srcdir)/../protocol/data/src \
|
||||
-I$(srcdir)/../protocol/jar/src \
|
||||
-I$(srcdir)/../protocol/res/src \
|
||||
-I$(srcdir)/../protocol/about/src \
|
||||
-I$(srcdir)/../protocol/keyword/src \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
|
||||
@ -32,18 +32,49 @@ CPP_OBJS= \
|
||||
.\$(OBJDIR)\nsNetModule.obj \
|
||||
$(NULL)
|
||||
|
||||
LLIBS= \
|
||||
$(DIST)\lib\neckobase_s.lib \
|
||||
$(DIST)\lib\neckodns_s.lib \
|
||||
$(DIST)\lib\neckosocket_s.lib \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
LLIBS= \
|
||||
$(DIST)\lib\neckobase_s.lib \
|
||||
$(DIST)\lib\neckodns_s.lib \
|
||||
$(DIST)\lib\neckosocket_s.lib \
|
||||
$(DIST)\lib\nkconv_s.lib \
|
||||
$(DIST)\lib\nkcnvts_s.lib \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\nkcachemgr_s.lib \
|
||||
$(DIST)\lib\nkfilecache_s.lib \
|
||||
$(DIST)\lib\nkmemcache_s.lib \
|
||||
$(DIST)\lib\dbm32.lib \
|
||||
$(DIST)\lib\nkmime_s.lib \
|
||||
$(DIST)\lib\nkhttp_s.lib \
|
||||
$(DIST)\lib\nkfile_s.lib \
|
||||
$(DIST)\lib\nkdata_s.lib \
|
||||
$(DIST)\lib\nkjar_s.lib \
|
||||
$(DIST)\lib\nkres_s.lib \
|
||||
$(DIST)\lib\nkabout_s.lib \
|
||||
$(DIST)\lib\nkkwd_s.lib \
|
||||
!ifdef MOZ_PERF
|
||||
$(DIST)\lib\util.lib \
|
||||
!endif
|
||||
$(DIST)\lib\zlib.lib \
|
||||
$(LIBNSPR)
|
||||
|
||||
INCS = $(INCS) \
|
||||
-I$(DEPTH)\dist\include \
|
||||
-I$(DEPTH)\netwerk\base\src \
|
||||
-I$(DEPTH)\netwerk\dns\src \
|
||||
-I$(DEPTH)\netwerk\socket\base \
|
||||
INCS = $(INCS) \
|
||||
-I$(DEPTH)\dist\include \
|
||||
-I$(DEPTH)\netwerk\base\src \
|
||||
-I$(DEPTH)\netwerk\dns\src \
|
||||
-I$(DEPTH)\netwerk\socket\base \
|
||||
-I$(DEPTH)\netwerk\streamconv\src \
|
||||
-I$(DEPTH)\netwerk\streamconv\converters \
|
||||
-I$(DEPTH)\netwerk\cache\memcache \
|
||||
-I$(DEPTH)\netwerk\cache\filecache \
|
||||
-I$(DEPTH)\netwerk\cache\mgr \
|
||||
-I$(DEPTH)\netwerk\mime\src \
|
||||
-I$(DEPTH)\netwerk\protocol\http\src \
|
||||
-I$(DEPTH)\netwerk\protocol\file\src \
|
||||
-I$(DEPTH)\netwerk\protocol\data\src \
|
||||
-I$(DEPTH)\netwerk\protocol\jar\src \
|
||||
-I$(DEPTH)\netwerk\protocol\res\src \
|
||||
-I$(DEPTH)\netwerk\protocol\about\src \
|
||||
-I$(DEPTH)\netwerk\protocol\keyword\src \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
@ -52,3 +83,6 @@ install:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
$(RM) $(DIST)\bin\components\$(DLLNAME).dll
|
||||
$(RM) $(DIST)\lib\$(DLLNAME).lib
|
||||
|
||||
@ -45,6 +45,255 @@
|
||||
#include "nsBufferedStreams.h"
|
||||
#include "nsProtocolProxyService.h"
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "nsStreamConverterService.h"
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "nsINetDataCache.h"
|
||||
#include "nsINetDataCacheManager.h"
|
||||
#include "nsMemCacheCID.h"
|
||||
#include "nsMemCache.h"
|
||||
#include "nsNetDiskCache.h"
|
||||
#include "nsNetDiskCacheCID.h"
|
||||
#include "nsCacheManager.h"
|
||||
|
||||
// Factory method to create a new nsMemCache instance. Used
|
||||
// by nsNetDataCacheModule
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMemCache, Init)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNetDiskCache, Init)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsCacheManager, Init)
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "nsMIMEService.h"
|
||||
#include "nsXMLMIMEDataSource.h"
|
||||
#include "nsMIMEInfoImpl.h"
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMIMEInfoImpl);
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "nsIHTTPProtocolHandler.h"
|
||||
#include "nsHTTPHandler.h"
|
||||
#include "nsHTTPSHandler.h"
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsHTTPHandler, Init);
|
||||
//NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTTPSHandler);
|
||||
|
||||
#define NS_HTTPS_HANDLER_FACTORY_CID { 0xd2771480, 0xcac4, 0x11d3, { 0x8c, 0xaf, 0x0, 0x0, 0x64, 0x65, 0x73, 0x74 } }
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "nsFileChannel.h"
|
||||
#include "nsFileProtocolHandler.h"
|
||||
#include "nsDataHandler.h"
|
||||
#include "nsJARProtocolHandler.h"
|
||||
#include "nsResProtocolHandler.h"
|
||||
|
||||
#include "nsAboutProtocolHandler.h"
|
||||
#include "nsAboutBlank.h"
|
||||
#include "nsAboutBloat.h"
|
||||
#include "nsAboutCredits.h"
|
||||
#include "mzAboutMozilla.h"
|
||||
#include "nsKeywordProtocolHandler.h"
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "nsFTPDirListingConv.h"
|
||||
#include "nsMultiMixedConv.h"
|
||||
#include "nsHTTPChunkConv.h"
|
||||
#include "nsHTTPCompressConv.h"
|
||||
#include "mozTXTToHTMLConv.h"
|
||||
#include "nsUnknownDecoder.h"
|
||||
#include "nsTXTToHTMLConv.h"
|
||||
|
||||
nsresult NS_NewFTPDirListingConv(nsFTPDirListingConv** result);
|
||||
nsresult NS_NewMultiMixedConv (nsMultiMixedConv** result);
|
||||
nsresult MOZ_NewTXTToHTMLConv (mozTXTToHTMLConv** result);
|
||||
nsresult NS_NewHTTPChunkConv (nsHTTPChunkConv ** result);
|
||||
nsresult NS_NewHTTPCompressConv (nsHTTPCompressConv ** result);
|
||||
nsresult NS_NewNSTXTToHTMLConv(nsTXTToHTMLConv** result);
|
||||
|
||||
static NS_IMETHODIMP
|
||||
CreateNewFTPDirListingConv(nsISupports* aOuter, REFNSIID aIID, void **aResult)
|
||||
{
|
||||
if (!aResult) {
|
||||
return NS_ERROR_INVALID_POINTER;
|
||||
}
|
||||
if (aOuter) {
|
||||
*aResult = nsnull;
|
||||
return NS_ERROR_NO_AGGREGATION;
|
||||
}
|
||||
nsFTPDirListingConv* inst = nsnull;
|
||||
nsresult rv = NS_NewFTPDirListingConv(&inst);
|
||||
if (NS_FAILED(rv)) {
|
||||
*aResult = nsnull;
|
||||
return rv;
|
||||
}
|
||||
rv = inst->QueryInterface(aIID, aResult);
|
||||
if (NS_FAILED(rv)) {
|
||||
*aResult = nsnull;
|
||||
}
|
||||
NS_RELEASE(inst); /* get rid of extra refcnt */
|
||||
return rv;
|
||||
}
|
||||
|
||||
static NS_IMETHODIMP
|
||||
CreateNewMultiMixedConvFactory(nsISupports* aOuter, REFNSIID aIID, void **aResult)
|
||||
{
|
||||
if (!aResult) {
|
||||
return NS_ERROR_INVALID_POINTER;
|
||||
}
|
||||
if (aOuter) {
|
||||
*aResult = nsnull;
|
||||
return NS_ERROR_NO_AGGREGATION;
|
||||
}
|
||||
nsMultiMixedConv* inst = nsnull;
|
||||
nsresult rv = NS_NewMultiMixedConv(&inst);
|
||||
if (NS_FAILED(rv)) {
|
||||
*aResult = nsnull;
|
||||
return rv;
|
||||
}
|
||||
rv = inst->QueryInterface(aIID, aResult);
|
||||
if (NS_FAILED(rv)) {
|
||||
*aResult = nsnull;
|
||||
}
|
||||
NS_RELEASE(inst); /* get rid of extra refcnt */
|
||||
return rv;
|
||||
}
|
||||
|
||||
static NS_IMETHODIMP
|
||||
CreateNewTXTToHTMLConvFactory(nsISupports* aOuter, REFNSIID aIID, void **aResult)
|
||||
{
|
||||
if (!aResult) {
|
||||
return NS_ERROR_INVALID_POINTER;
|
||||
}
|
||||
if (aOuter) {
|
||||
*aResult = nsnull;
|
||||
return NS_ERROR_NO_AGGREGATION;
|
||||
}
|
||||
mozTXTToHTMLConv* inst = nsnull;
|
||||
nsresult rv = MOZ_NewTXTToHTMLConv(&inst);
|
||||
if (NS_FAILED(rv)) {
|
||||
*aResult = nsnull;
|
||||
return rv;
|
||||
}
|
||||
rv = inst->QueryInterface(aIID, aResult);
|
||||
if (NS_FAILED(rv)) {
|
||||
*aResult = nsnull;
|
||||
}
|
||||
NS_RELEASE(inst); /* get rid of extra refcnt */
|
||||
return rv;
|
||||
}
|
||||
|
||||
static NS_IMETHODIMP
|
||||
CreateNewHTTPChunkConvFactory (nsISupports* aOuter, REFNSIID aIID, void **aResult)
|
||||
{
|
||||
if (!aResult) {
|
||||
return NS_ERROR_INVALID_POINTER;
|
||||
}
|
||||
if (aOuter) {
|
||||
*aResult = nsnull;
|
||||
return NS_ERROR_NO_AGGREGATION;
|
||||
}
|
||||
nsHTTPChunkConv* inst = nsnull;
|
||||
nsresult rv = NS_NewHTTPChunkConv (&inst);
|
||||
if (NS_FAILED(rv)) {
|
||||
*aResult = nsnull;
|
||||
return rv;
|
||||
}
|
||||
rv = inst->QueryInterface(aIID, aResult);
|
||||
if (NS_FAILED(rv)) {
|
||||
*aResult = nsnull;
|
||||
}
|
||||
NS_RELEASE(inst); /* get rid of extra refcnt */
|
||||
return rv;
|
||||
}
|
||||
|
||||
static NS_IMETHODIMP
|
||||
CreateNewHTTPCompressConvFactory (nsISupports* aOuter, REFNSIID aIID, void **aResult)
|
||||
{
|
||||
if (!aResult) {
|
||||
return NS_ERROR_INVALID_POINTER;
|
||||
}
|
||||
if (aOuter) {
|
||||
*aResult = nsnull;
|
||||
return NS_ERROR_NO_AGGREGATION;
|
||||
}
|
||||
nsHTTPCompressConv* inst = nsnull;
|
||||
nsresult rv = NS_NewHTTPCompressConv (&inst);
|
||||
if (NS_FAILED(rv)) {
|
||||
*aResult = nsnull;
|
||||
return rv;
|
||||
}
|
||||
rv = inst->QueryInterface(aIID, aResult);
|
||||
if (NS_FAILED(rv)) {
|
||||
*aResult = nsnull;
|
||||
}
|
||||
NS_RELEASE(inst); /* get rid of extra refcnt */
|
||||
return rv;
|
||||
}
|
||||
|
||||
static NS_IMETHODIMP
|
||||
CreateNewUnknownDecoderFactory(nsISupports *aOuter, REFNSIID aIID, void **aResult)
|
||||
{
|
||||
nsresult rv;
|
||||
|
||||
if (!aResult) {
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
}
|
||||
*aResult = nsnull;
|
||||
|
||||
if (aOuter) {
|
||||
return NS_ERROR_NO_AGGREGATION;
|
||||
}
|
||||
|
||||
nsUnknownDecoder *inst;
|
||||
|
||||
inst = new nsUnknownDecoder();
|
||||
if (!inst) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
NS_ADDREF(inst);
|
||||
rv = inst->QueryInterface(aIID, aResult);
|
||||
NS_RELEASE(inst);
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
static NS_IMETHODIMP
|
||||
CreateNewNSTXTToHTMLConvFactory(nsISupports *aOuter, REFNSIID aIID, void **aResult)
|
||||
{
|
||||
nsresult rv;
|
||||
|
||||
if (!aResult) {
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
}
|
||||
*aResult = nsnull;
|
||||
|
||||
if (aOuter) {
|
||||
return NS_ERROR_NO_AGGREGATION;
|
||||
}
|
||||
|
||||
nsTXTToHTMLConv *inst;
|
||||
|
||||
inst = new nsTXTToHTMLConv();
|
||||
if (!inst) return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
NS_ADDREF(inst);
|
||||
rv = inst->Init();
|
||||
if (NS_FAILED(rv)) {
|
||||
delete inst;
|
||||
return rv;
|
||||
}
|
||||
rv = inst->QueryInterface(aIID, aResult);
|
||||
NS_RELEASE(inst);
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Module implementation for the net library
|
||||
|
||||
@ -93,12 +342,6 @@ static nsModuleComponentInfo gNetModuleInfo[] = {
|
||||
NS_STREAMIOCHANNEL_CID,
|
||||
NS_STREAMIOCHANNEL_PROGID,
|
||||
nsStreamIOChannel::Create },
|
||||
#if 0
|
||||
{ NS_LOCALFILECHANNEL_CLASSNAME,
|
||||
NS_LOCALFILECHANNEL_CID,
|
||||
NS_LOCALFILECHANNEL_PROGID,
|
||||
nsLocalFileChannel::Create },
|
||||
#endif
|
||||
{ "Unichar Stream Loader",
|
||||
NS_STREAMLOADER_CID,
|
||||
"component://netscape/network/stream-loader",
|
||||
@ -150,7 +393,195 @@ static nsModuleComponentInfo gNetModuleInfo[] = {
|
||||
{ "Protocol Proxy Service",
|
||||
NS_PROTOCOLPROXYSERVICE_CID,
|
||||
"component::/netscape/network/protocol-proxy-service",
|
||||
nsProtocolProxyService::Create }
|
||||
nsProtocolProxyService::Create },
|
||||
|
||||
// from netwerk/streamconv:
|
||||
{ "Stream Converter Service",
|
||||
NS_STREAMCONVERTERSERVICE_CID,
|
||||
"component:||netscape|streamConverters",
|
||||
nsStreamConverterService::Create },
|
||||
|
||||
// from netwerk/streamconv/converters:
|
||||
{ "FTPDirListingConverter",
|
||||
NS_FTPDIRLISTINGCONVERTER_CID,
|
||||
NS_ISTREAMCONVERTER_KEY "?from=text/ftp-dir-unix?to=application/http-index-format",
|
||||
CreateNewFTPDirListingConv
|
||||
},
|
||||
|
||||
{ "FTPDirListingConverter",
|
||||
NS_FTPDIRLISTINGCONVERTER_CID,
|
||||
NS_ISTREAMCONVERTER_KEY "?from=text/ftp-dir-nt?to=application/http-index-format",
|
||||
CreateNewFTPDirListingConv
|
||||
},
|
||||
|
||||
{ "MultiMixedConverter",
|
||||
NS_MULTIMIXEDCONVERTER_CID,
|
||||
NS_ISTREAMCONVERTER_KEY "?from=multipart/x-mixed-replace?to=*/*",
|
||||
CreateNewMultiMixedConvFactory
|
||||
},
|
||||
|
||||
// There are servers that hand back "multipart/mixed" to
|
||||
// indicate they want x-mixed-replace behavior.
|
||||
{ "MultiMixedConverter2",
|
||||
NS_MULTIMIXEDCONVERTER_CID,
|
||||
NS_ISTREAMCONVERTER_KEY "?from=multipart/mixed?to=*/*",
|
||||
CreateNewMultiMixedConvFactory
|
||||
},
|
||||
{ "Unknown Content-Type Decoder",
|
||||
NS_UNKNOWNDECODER_CID,
|
||||
NS_ISTREAMCONVERTER_KEY "?from=application/x-unknown-content-type?to=*/*",
|
||||
CreateNewUnknownDecoderFactory
|
||||
},
|
||||
|
||||
{ "HttpChunkConverter",
|
||||
NS_HTTPCHUNKCONVERTER_CID,
|
||||
NS_ISTREAMCONVERTER_KEY "?from=chunked?to=unchunked",
|
||||
CreateNewHTTPChunkConvFactory
|
||||
},
|
||||
|
||||
{ "HttpChunkConverter",
|
||||
NS_HTTPCHUNKCONVERTER_CID,
|
||||
NS_ISTREAMCONVERTER_KEY "?from=unchunked?to=chunked",
|
||||
CreateNewHTTPChunkConvFactory
|
||||
},
|
||||
|
||||
{ "HttpCompressConverter",
|
||||
NS_HTTPCOMPRESSCONVERTER_CID,
|
||||
NS_ISTREAMCONVERTER_KEY "?from=gzip?to=uncompressed",
|
||||
CreateNewHTTPCompressConvFactory
|
||||
},
|
||||
|
||||
{ "HttpCompressConverter",
|
||||
NS_HTTPCOMPRESSCONVERTER_CID,
|
||||
NS_ISTREAMCONVERTER_KEY "?from=x-gzip?to=uncompressed",
|
||||
CreateNewHTTPCompressConvFactory
|
||||
},
|
||||
{ "HttpCompressConverter",
|
||||
NS_HTTPCOMPRESSCONVERTER_CID,
|
||||
NS_ISTREAMCONVERTER_KEY "?from=compress?to=uncompressed",
|
||||
CreateNewHTTPCompressConvFactory
|
||||
},
|
||||
{ "HttpCompressConverter",
|
||||
NS_HTTPCOMPRESSCONVERTER_CID,
|
||||
NS_ISTREAMCONVERTER_KEY "?from=x-compress?to=uncompressed",
|
||||
CreateNewHTTPCompressConvFactory
|
||||
},
|
||||
{ "HttpCompressConverter",
|
||||
NS_HTTPCOMPRESSCONVERTER_CID,
|
||||
NS_ISTREAMCONVERTER_KEY "?from=deflate?to=uncompressed",
|
||||
CreateNewHTTPCompressConvFactory
|
||||
},
|
||||
{ "NSTXTToHTMLConverter",
|
||||
NS_NSTXTTOHTMLCONVERTER_CID,
|
||||
NS_ISTREAMCONVERTER_KEY "?from=text/plain?to=text/html",
|
||||
CreateNewNSTXTToHTMLConvFactory
|
||||
},
|
||||
// This is not a real stream converter, it's just
|
||||
// registering it's cid factory here.
|
||||
{ "HACK-TXTToHTMLConverter",
|
||||
MOZITXTTOHTMLCONV_CID,
|
||||
NS_ISTREAMCONVERTER_KEY,
|
||||
CreateNewTXTToHTMLConvFactory
|
||||
},
|
||||
|
||||
// from netwerk/cache:
|
||||
{ "Memory Cache", NS_MEM_CACHE_FACTORY_CID, NS_NETWORK_MEMORY_CACHE_PROGID, nsMemCacheConstructor },
|
||||
{ "File Cache", NS_NETDISKCACHE_CID, NS_NETWORK_FILE_CACHE_PROGID, nsNetDiskCacheConstructor },
|
||||
{ "Cache Manager",NS_CACHE_MANAGER_CID, NS_NETWORK_CACHE_MANAGER_PROGID,nsCacheManagerConstructor },
|
||||
|
||||
// from netwerk/mime:
|
||||
{ "The MIME mapping service",
|
||||
NS_MIMESERVICE_CID,
|
||||
"component:||netscape|mime",
|
||||
nsMIMEService::Create
|
||||
},
|
||||
{ "xml mime datasource",
|
||||
NS_XMLMIMEDATASOURCE_CID,
|
||||
NS_XMLMIMEDATASOURCE_PROGID,
|
||||
nsXMLMIMEDataSource::Create
|
||||
},
|
||||
{ "xml mime INFO",
|
||||
NS_MIMEINFO_CID,
|
||||
NS_MIMEINFO_PROGID,
|
||||
nsMIMEInfoImplConstructor
|
||||
},
|
||||
|
||||
// from netwerk/protocol/file:
|
||||
{ "File Protocol Handler",
|
||||
NS_FILEPROTOCOLHANDLER_CID,
|
||||
NS_NETWORK_PROTOCOL_PROGID_PREFIX "file",
|
||||
nsFileProtocolHandler::Create
|
||||
},
|
||||
{ NS_LOCALFILECHANNEL_CLASSNAME,
|
||||
NS_LOCALFILECHANNEL_CID,
|
||||
NS_LOCALFILECHANNEL_PROGID,
|
||||
nsFileChannel::Create
|
||||
},
|
||||
|
||||
// from netwerk/protocol/http:
|
||||
{ "HTTP Handler",
|
||||
NS_IHTTPHANDLER_CID,
|
||||
NS_NETWORK_PROTOCOL_PROGID_PREFIX "http",
|
||||
nsHTTPHandlerConstructor },
|
||||
{ "HTTPS Handler",
|
||||
NS_HTTPS_HANDLER_FACTORY_CID,
|
||||
NS_NETWORK_PROTOCOL_PROGID_PREFIX "https",
|
||||
nsHTTPSHandler::Create },
|
||||
|
||||
// from netwerk/protocol/data:
|
||||
{ "Data Protocol Handler",
|
||||
NS_DATAHANDLER_CID,
|
||||
NS_NETWORK_PROTOCOL_PROGID_PREFIX "data",
|
||||
nsDataHandler::Create},
|
||||
|
||||
// from netwerk/protocol/jar:
|
||||
{ "JAR Protocol Handler",
|
||||
NS_JARPROTOCOLHANDLER_CID,
|
||||
NS_NETWORK_PROTOCOL_PROGID_PREFIX "jar",
|
||||
nsJARProtocolHandler::Create
|
||||
},
|
||||
|
||||
// from netwerk/protocol/res:
|
||||
{ "The Resource Protocol Handler",
|
||||
NS_RESPROTOCOLHANDLER_CID,
|
||||
NS_NETWORK_PROTOCOL_PROGID_PREFIX "resource",
|
||||
nsResProtocolHandler::Create
|
||||
},
|
||||
|
||||
// from netwerk/protocol/about:
|
||||
{ "About Protocol Handler",
|
||||
NS_ABOUTPROTOCOLHANDLER_CID,
|
||||
NS_NETWORK_PROTOCOL_PROGID_PREFIX "about",
|
||||
nsAboutProtocolHandler::Create
|
||||
},
|
||||
{ "about:blank",
|
||||
NS_ABOUT_BLANK_MODULE_CID,
|
||||
NS_ABOUT_MODULE_PROGID_PREFIX "blank",
|
||||
nsAboutBlank::Create
|
||||
},
|
||||
{ "about:bloat",
|
||||
NS_ABOUT_BLOAT_MODULE_CID,
|
||||
NS_ABOUT_MODULE_PROGID_PREFIX "bloat",
|
||||
nsAboutBloat::Create
|
||||
},
|
||||
{ "about:credits",
|
||||
NS_ABOUT_CREDITS_MODULE_CID,
|
||||
NS_ABOUT_MODULE_PROGID_PREFIX "credits",
|
||||
nsAboutCredits::Create
|
||||
},
|
||||
{ "about:mozilla",
|
||||
MZ_ABOUT_MOZILLA_MODULE_CID,
|
||||
NS_ABOUT_MODULE_PROGID_PREFIX "mozilla",
|
||||
mzAboutMozilla::Create
|
||||
},
|
||||
|
||||
// from netwerk/protocol/keyword:
|
||||
{ "The Keyword Protocol Handler",
|
||||
NS_KEYWORDPROTOCOLHANDLER_CID,
|
||||
NS_NETWORK_PROTOCOL_PROGID_PREFIX "keyword",
|
||||
nsKeywordProtocolHandler::Create
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE("net", gNetModuleInfo)
|
||||
NS_IMPL_NSGETMODULE("necko core and primary protocols", gNetModuleInfo)
|
||||
|
||||
1
netwerk/cache/Makefile.win
vendored
1
netwerk/cache/Makefile.win
vendored
@ -26,7 +26,6 @@ DIRS= \
|
||||
mgr \
|
||||
memcache \
|
||||
filecache \
|
||||
build \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
4
netwerk/cache/build/makefile.win
vendored
4
netwerk/cache/build/makefile.win
vendored
@ -30,10 +30,6 @@ CPP_OBJS= \
|
||||
$(NULL)
|
||||
|
||||
LLIBS= \
|
||||
$(DIST)\lib\nkcachemgr_s.lib \
|
||||
$(DIST)\lib\nkfilecache_s.lib \
|
||||
$(DIST)\lib\nkmemcache_s.lib \
|
||||
$(DIST)\lib\dbm32.lib \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(LIBNSPR)
|
||||
|
||||
|
||||
3
netwerk/cache/public/Makefile.win
vendored
3
netwerk/cache/public/Makefile.win
vendored
@ -19,7 +19,8 @@
|
||||
#
|
||||
# Contributor(s):
|
||||
|
||||
MODULE = nkcache
|
||||
MODULE = necko
|
||||
XPIDL_MODULE = necko_cache
|
||||
|
||||
DEPTH = ..\..\..
|
||||
include <$(DEPTH)/config/config.mak>
|
||||
|
||||
Binary file not shown.
@ -24,14 +24,15 @@ DEPTH = ..
|
||||
MODULE = necko
|
||||
|
||||
DIRS= \
|
||||
cache \
|
||||
base \
|
||||
cache \
|
||||
dns \
|
||||
socket \
|
||||
mime \
|
||||
streamconv \
|
||||
build \
|
||||
protocol \
|
||||
build \
|
||||
build2 \
|
||||
resources \
|
||||
!if !defined(DISABLE_TESTS)
|
||||
test \
|
||||
|
||||
@ -34,11 +34,11 @@
|
||||
{ 0xa1, 0x2b, 0xa7, 0xae, 0xf7, 0xa2, 0xf2, 0xfc } \
|
||||
}
|
||||
#define NS_XMLMIMEDATASOURCE_PROGID \
|
||||
"component:||netscape|mimexmldatasource"
|
||||
"component://netscape/mime-xml-data-source"
|
||||
|
||||
|
||||
#define NS_NATIVEMIMEDATASOURCE_PROGID \
|
||||
"component:||netscape|mimenativedatasource"
|
||||
"component://netscape/mime-native-data-source"
|
||||
%}
|
||||
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
{ 0xa1, 0x2b, 0xa6, 0x6e, 0xf6, 0x62, 0xf0, 0xbc } \
|
||||
}
|
||||
#define NS_MIMEINFO_PROGID \
|
||||
"component:||netscape|mimeinfo"
|
||||
"component://netscape/mime-info"
|
||||
%}
|
||||
|
||||
[scriptable, uuid(6A57EAE0-2FE8-11d3-A164-0050041CAF44)]
|
||||
|
||||
@ -27,19 +27,20 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = mimetype
|
||||
LIBRARY_NAME = mimetype
|
||||
IS_COMPONENT = 1
|
||||
LIBRARY_NAME = nkmime_s
|
||||
|
||||
REQUIRES = xpcom
|
||||
|
||||
CPPSRCS = \
|
||||
nsMIMEInfoImpl.cpp \
|
||||
nsMIMEService.cpp \
|
||||
nsMIMEServiceModule.cpp \
|
||||
nsXMLMIMEDataSource.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -22,10 +22,7 @@ include <$(DEPTH)/config/config.mak>
|
||||
|
||||
MODULE = necko
|
||||
|
||||
IS_COMPONENT=1
|
||||
MAKE_OBJ_TYPE=DLL
|
||||
DLLNAME=mimetype
|
||||
DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
||||
LIBRARY_NAME = nkmime_s
|
||||
|
||||
LLIBS= $(LLIBS) \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
@ -34,10 +31,9 @@ LLIBS= $(LLIBS) \
|
||||
|
||||
LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
|
||||
|
||||
CPP_OBJS = \
|
||||
.\$(OBJDIR)\nsMIMEInfoImpl.obj \
|
||||
.\$(OBJDIR)\nsMIMEService.obj \
|
||||
.\$(OBJDIR)\nsMIMEServiceModule.obj \
|
||||
CPP_OBJS = \
|
||||
.\$(OBJDIR)\nsMIMEInfoImpl.obj \
|
||||
.\$(OBJDIR)\nsMIMEService.obj \
|
||||
.\$(OBJDIR)\nsXMLMIMEDataSource.obj \
|
||||
$(NULL)
|
||||
|
||||
@ -51,8 +47,8 @@ INCS = $(INCS) \
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
|
||||
install:: $(LIBRARY)
|
||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
@ -53,7 +53,7 @@ const char* kMacType="mactype";
|
||||
|
||||
static NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID);
|
||||
// Hash table helper functions
|
||||
PRBool DeleteEntry(nsHashKey *aKey, void *aData, void* closure) {
|
||||
static PRBool DeleteEntry(nsHashKey *aKey, void *aData, void* closure) {
|
||||
nsMIMEInfoImpl *entry = (nsMIMEInfoImpl*)aData;
|
||||
NS_ASSERTION(entry, "mapping problem");
|
||||
NS_RELEASE(entry);
|
||||
@ -193,7 +193,7 @@ nsXMLMIMEDataSource::Add( nsIMIMEInfo* aMapper )
|
||||
|
||||
// used to cleanup any file extension mappings when
|
||||
// a root MIME entry is removed.
|
||||
PRBool removeExts(nsCString& aElement, void *aData) {
|
||||
static PRBool removeExts(nsCString& aElement, void *aData) {
|
||||
nsHashtable* infoObjects = (nsHashtable*)aData;
|
||||
NS_ASSERTION(infoObjects, "hash table botched up");
|
||||
|
||||
|
||||
@ -27,22 +27,22 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = necko_about
|
||||
SHORT_LIBNAME = neckoabt
|
||||
IS_COMPONENT = 1
|
||||
LIBRARY_NAME = nkabout_s
|
||||
|
||||
REQUIRES = xpcom necko
|
||||
|
||||
CPPSRCS = \
|
||||
nsAboutProtocolHandler.cpp \
|
||||
nsAboutProtocolModule.cpp \
|
||||
nsAboutBlank.cpp \
|
||||
nsAboutBloat.cpp \
|
||||
nsAboutCredits.cpp \
|
||||
mzAboutMozilla.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -22,38 +22,22 @@
|
||||
DEPTH=..\..\..\..
|
||||
MODULE=necko
|
||||
|
||||
IS_COMPONENT=1
|
||||
MAKE_OBJ_TYPE=DLL
|
||||
DLLNAME=nkabout
|
||||
DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
||||
LIBRARY_NAME=nkabout_s
|
||||
|
||||
LLIBS= $(LLIBS) \
|
||||
$(LIBNSPR) \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(NULL)
|
||||
LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
|
||||
|
||||
CPP_OBJS= \
|
||||
.\$(OBJDIR)\nsAboutProtocolHandler.obj \
|
||||
.\$(OBJDIR)\nsAboutProtocolModule.obj \
|
||||
.\$(OBJDIR)\nsAboutBlank.obj \
|
||||
.\$(OBJDIR)\nsAboutBloat.obj \
|
||||
.\$(OBJDIR)\nsAboutCredits.obj \
|
||||
.\$(OBJDIR)\mzAboutMozilla.obj \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES=-I.
|
||||
|
||||
INCLUDES = $(LOCAL_INCLUDES)
|
||||
|
||||
REQUIRES= necko
|
||||
|
||||
INCS = $(INCS) \
|
||||
-I$(DEPTH)\dist\include \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
|
||||
install:: $(LIBRARY)
|
||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
@ -27,17 +27,17 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = necko_data
|
||||
SHORT_LIBNAME = neckodat
|
||||
IS_COMPONENT = 1
|
||||
LIBRARY_NAME = nkdata_s
|
||||
|
||||
CPPSRCS = \
|
||||
nsDataHandler.cpp \
|
||||
nsDataChannel.cpp \
|
||||
nsDataModule.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -21,29 +21,19 @@ MODULE = necko
|
||||
|
||||
DEPTH = ..\..\..\..
|
||||
|
||||
MAKE_OBJ_TYPE=DLL
|
||||
DLLNAME=nkdata
|
||||
DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
||||
LIBRARY_NAME=nkdata_s
|
||||
|
||||
LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
|
||||
|
||||
CPP_OBJS = \
|
||||
.\$(OBJDIR)\nsDataHandler.obj \
|
||||
.\$(OBJDIR)\nsDataChannel.obj \
|
||||
.\$(OBJDIR)\nsDataModule.obj \
|
||||
$(NULL)
|
||||
|
||||
LLIBS= \
|
||||
$(DIST)\lib\necko.lib \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(LIBNSPR)
|
||||
|
||||
INCS = $(INCS) \
|
||||
-I$(DEPTH)\dist\include \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
|
||||
install:: $(LIBRARY)
|
||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
@ -72,7 +72,7 @@ typedef struct _writeData {
|
||||
char *data;
|
||||
} writeData;
|
||||
|
||||
NS_METHOD
|
||||
static NS_METHOD
|
||||
nsReadData(void* closure, // the data from
|
||||
char* toRawSegment, // where to put the data
|
||||
PRUint32 offset, // where to start
|
||||
|
||||
@ -27,16 +27,16 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = necko_datetime
|
||||
SHORT_LIBNAME = neckodtm
|
||||
IS_COMPONENT = 1
|
||||
LIBRARY_NAME = nkdatetm_s
|
||||
|
||||
CPPSRCS = \
|
||||
nsDateTimeHandler.cpp \
|
||||
nsDateTimeChannel.cpp \
|
||||
nsDateTimeModule.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -21,29 +21,19 @@ MODULE = necko
|
||||
|
||||
DEPTH = ..\..\..\..
|
||||
|
||||
MAKE_OBJ_TYPE=DLL
|
||||
DLLNAME=nkdatetm
|
||||
DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
||||
LIBRARY_NAME=nkdatetm_s
|
||||
|
||||
LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
|
||||
|
||||
CPP_OBJS = \
|
||||
.\$(OBJDIR)\nsDateTimeHandler.obj \
|
||||
.\$(OBJDIR)\nsDateTimeChannel.obj \
|
||||
.\$(OBJDIR)\nsDateTimeModule.obj \
|
||||
$(NULL)
|
||||
|
||||
LLIBS= \
|
||||
$(DIST)\lib\necko.lib \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(LIBNSPR)
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
INCS = $(INCS) \
|
||||
-I$(DEPTH)\dist\include \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
|
||||
install:: $(LIBRARY)
|
||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
@ -27,19 +27,19 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = necko_file
|
||||
SHORT_LIBNAME = neckofil
|
||||
IS_COMPONENT = 1
|
||||
LIBRARY_NAME = nkfile_s
|
||||
|
||||
REQUIRES = xpcom necko raptor
|
||||
|
||||
CPPSRCS = \
|
||||
nsFileChannel.cpp \
|
||||
nsFileProtocolHandler.cpp \
|
||||
nsFileProtocolModule.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -23,35 +23,19 @@ DEPTH=..\..\..\..
|
||||
MODULE=necko
|
||||
include <$(DEPTH)/config/config.mak>
|
||||
|
||||
IS_COMPONENT=1
|
||||
MAKE_OBJ_TYPE=DLL
|
||||
DLLNAME=nkfile
|
||||
DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
||||
LIBRARY_NAME=nkfile_s
|
||||
|
||||
LLIBS= $(LLIBS) \
|
||||
$(LIBNSPR) \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(NULL)
|
||||
LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
|
||||
|
||||
CPP_OBJS= \
|
||||
.\$(OBJDIR)\nsFileChannel.obj \
|
||||
.\$(OBJDIR)\nsFileProtocolHandler.obj \
|
||||
.\$(OBJDIR)\nsFileProtocolModule.obj \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES=-I.
|
||||
|
||||
INCLUDES = $(LOCAL_INCLUDES)
|
||||
|
||||
REQUIRES= necko
|
||||
|
||||
INCS = $(INCS) \
|
||||
-I$(DEPTH)\dist\include \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
|
||||
install:: $(LIBRARY)
|
||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
@ -27,15 +27,16 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = necko_finger
|
||||
IS_COMPONENT = 1
|
||||
LIBRARY_NAME = nkfinger_s
|
||||
|
||||
CPPSRCS = \
|
||||
nsFingerHandler.cpp \
|
||||
nsFingerChannel.cpp \
|
||||
nsFingerModule.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -21,29 +21,19 @@ MODULE = necko
|
||||
|
||||
DEPTH = ..\..\..\..
|
||||
|
||||
MAKE_OBJ_TYPE=DLL
|
||||
DLLNAME=nkfinger
|
||||
DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
||||
LIBRARY_NAME=nkfinger_s
|
||||
|
||||
LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
|
||||
|
||||
CPP_OBJS = \
|
||||
.\$(OBJDIR)\nsFingerHandler.obj \
|
||||
.\$(OBJDIR)\nsFingerChannel.obj \
|
||||
.\$(OBJDIR)\nsFingerModule.obj \
|
||||
$(NULL)
|
||||
|
||||
LLIBS= \
|
||||
$(DIST)\lib\necko.lib \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(LIBNSPR)
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
INCS = $(INCS) \
|
||||
-I$(DEPTH)\dist\include \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
|
||||
install:: $(LIBRARY)
|
||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
@ -27,19 +27,19 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = necko_ftp
|
||||
SHORT_LIBNAME = neckoftp
|
||||
IS_COMPONENT = 1
|
||||
LIBRARY_NAME = nkftp_s
|
||||
|
||||
CPPSRCS = \
|
||||
nsFtpProtocolHandler.cpp \
|
||||
nsFTPChannel.cpp \
|
||||
nsFtpConnectionThread.cpp \
|
||||
nsFtpModule.cpp \
|
||||
nsAsyncEvent.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -21,9 +21,7 @@ MODULE = necko
|
||||
|
||||
DEPTH = ..\..\..\..
|
||||
|
||||
MAKE_OBJ_TYPE=DLL
|
||||
DLLNAME=nkftp
|
||||
DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
||||
LIBRARY_NAME=nkftp_s
|
||||
|
||||
LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
|
||||
|
||||
@ -35,20 +33,13 @@ CPP_OBJS = \
|
||||
.\$(OBJDIR)\nsFtpProtocolHandler.obj \
|
||||
.\$(OBJDIR)\nsFTPChannel.obj \
|
||||
.\$(OBJDIR)\nsFtpConnectionThread.obj \
|
||||
.\$(OBJDIR)\nsFtpModule.obj \
|
||||
.\$(OBJDIR)\nsAsyncEvent.obj \
|
||||
$(NULL)
|
||||
|
||||
LLIBS= \
|
||||
$(DIST)\lib\necko.lib \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(LIBNSPR)
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
INCS = $(INCS) \
|
||||
-I$(DEPTH)\dist\include \
|
||||
$(NULL)
|
||||
install:: $(LIBRARY)
|
||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
@ -27,15 +27,12 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = necko_http
|
||||
SHORT_LIBNAME = neckohtp
|
||||
IS_COMPONENT = 1
|
||||
LIBRARY_NAME = nkhttp_s
|
||||
|
||||
REQUIRES = xpcom necko raptor
|
||||
|
||||
CPPSRCS = \
|
||||
nsHTTPHandler.cpp \
|
||||
nsHTTPHandlerModule.cpp \
|
||||
nsHTTPChannel.cpp \
|
||||
nsHTTPRequest.cpp \
|
||||
nsHTTPResponseListener.cpp \
|
||||
@ -51,7 +48,10 @@ CPPSRCS = \
|
||||
|
||||
LOCAL_INCLUDES=-I$(srcdir)/../../../streamconv/converters
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -32,21 +32,13 @@ include <$(DEPTH)/config/config.mak>
|
||||
|
||||
MODULE=necko
|
||||
|
||||
IS_COMPONENT=1
|
||||
MAKE_OBJ_TYPE=DLL
|
||||
DLLNAME=nkhttp
|
||||
DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
||||
LIBRARY_NAME=nkhttp_s
|
||||
|
||||
LLIBS= $(LLIBS) \
|
||||
$(LIBNSPR) \
|
||||
$(DIST)\lib\necko.lib \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(NULL)
|
||||
LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
|
||||
|
||||
CPP_OBJS= \
|
||||
.\$(OBJDIR)\nsHTTPSHandler.obj \
|
||||
.\$(OBJDIR)\nsHTTPHandler.obj \
|
||||
.\$(OBJDIR)\nsHTTPHandlerModule.obj \
|
||||
.\$(OBJDIR)\nsHTTPChannel.obj \
|
||||
.\$(OBJDIR)\nsHTTPRequest.obj \
|
||||
.\$(OBJDIR)\nsHTTPResponseListener.obj \
|
||||
@ -59,21 +51,10 @@ CPP_OBJS= \
|
||||
.\$(OBJDIR)\nsAuthEngine.obj \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES=-I. -I../../../streamconv/converters
|
||||
|
||||
INCLUDES = $(LOCAL_INCLUDES)
|
||||
|
||||
REQUIRES= necko
|
||||
|
||||
INCS = $(INCS) \
|
||||
-I$(DEPTH)\dist\include \
|
||||
-I..\public \
|
||||
-I../../../streamconv/converters \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
|
||||
install:: $(LIBRARY)
|
||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
@ -426,7 +426,7 @@ nsresult nsHTTPResponse::ProcessHeader(nsIAtom* aHeader, nsCString& aValue)
|
||||
else
|
||||
if (nsHTTPAtoms::Content_Length == aHeader)
|
||||
{
|
||||
PRInt32 length, status;
|
||||
PRInt32 status;
|
||||
|
||||
mContentLength = aValue.ToInteger(&status);
|
||||
rv = (nsresult)status;
|
||||
|
||||
@ -27,20 +27,20 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = necko_jar
|
||||
SHORT_LIBNAME = neckojar
|
||||
IS_COMPONENT = 1
|
||||
LIBRARY_NAME = nkjar_s
|
||||
|
||||
REQUIRES = xpcom necko
|
||||
|
||||
CPPSRCS = \
|
||||
nsJARProtocolHandler.cpp \
|
||||
nsJARProtocolModule.cpp \
|
||||
nsJARChannel.cpp \
|
||||
nsJARURI.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -22,39 +22,21 @@
|
||||
DEPTH=..\..\..\..
|
||||
MODULE=necko
|
||||
|
||||
IS_COMPONENT=1
|
||||
MAKE_OBJ_TYPE=DLL
|
||||
DLLNAME=nkjar
|
||||
DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
||||
LIBRARY_NAME=nkjar_s
|
||||
|
||||
LLIBS= $(LLIBS) \
|
||||
$(LIBNSPR) \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\zlib.lib \
|
||||
$(NULL)
|
||||
LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
|
||||
|
||||
CPP_OBJS= \
|
||||
.\$(OBJDIR)\nsJARURI.obj \
|
||||
.\$(OBJDIR)\nsJARChannel.obj \
|
||||
.\$(OBJDIR)\nsJARProtocolHandler.obj \
|
||||
.\$(OBJDIR)\nsJARProtocolModule.obj \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES=-I.
|
||||
|
||||
INCLUDES = $(LOCAL_INCLUDES) \
|
||||
$(DIST)\include \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES= necko
|
||||
|
||||
INCS = $(INCS) \
|
||||
-I$(DEPTH)\dist\include \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
|
||||
install:: $(LIBRARY)
|
||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
|
||||
@ -27,17 +27,18 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = nkkyword
|
||||
IS_COMPONENT = 1
|
||||
LIBRARY_NAME = nkkwd_s
|
||||
|
||||
REQUIRES = xpcom necko
|
||||
|
||||
CPPSRCS = \
|
||||
nsKeywordProtocolHandler.cpp \
|
||||
nsKeywordModule.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -22,34 +22,16 @@
|
||||
DEPTH=..\..\..\..
|
||||
MODULE=necko
|
||||
|
||||
IS_COMPONENT=1
|
||||
MAKE_OBJ_TYPE=DLL
|
||||
DLLNAME=nkkyword
|
||||
DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
||||
|
||||
LLIBS= $(LLIBS) \
|
||||
$(LIBNSPR) \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(NULL)
|
||||
LIBRARY_NAME=nkkwd_s
|
||||
|
||||
CPP_OBJS= \
|
||||
.\$(OBJDIR)\nsKeywordProtocolHandler.obj \
|
||||
.\$(OBJDIR)\nsKeywordModule.obj \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES=-I.
|
||||
|
||||
INCLUDES = $(LOCAL_INCLUDES)
|
||||
|
||||
REQUIRES= necko
|
||||
|
||||
INCS = $(INCS) \
|
||||
-I$(DEPTH)\dist\include \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
|
||||
install:: $(LIBRARY)
|
||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
@ -27,20 +27,22 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = necko_res
|
||||
SHORT_LIBNAME = neckores
|
||||
IS_COMPONENT = 1
|
||||
LIBRARY_NAME = nkres_s
|
||||
|
||||
REQUIRES = xpcom necko
|
||||
|
||||
CPPSRCS = \
|
||||
nsResChannel.cpp \
|
||||
nsResProtocolHandler.cpp \
|
||||
nsResProtocolModule.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||||
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(OS_ARCH), Linux)
|
||||
|
||||
@ -22,35 +22,19 @@
|
||||
DEPTH=..\..\..\..
|
||||
MODULE=necko
|
||||
|
||||
IS_COMPONENT=1
|
||||
MAKE_OBJ_TYPE=DLL
|
||||
DLLNAME=nkres
|
||||
DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
||||
LIBRARY_NAME=nkres_s
|
||||
|
||||
LLIBS= $(LLIBS) \
|
||||
$(LIBNSPR) \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(NULL)
|
||||
LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
|
||||
|
||||
CPP_OBJS= \
|
||||
.\$(OBJDIR)\nsResChannel.obj \
|
||||
.\$(OBJDIR)\nsResProtocolHandler.obj \
|
||||
.\$(OBJDIR)\nsResProtocolModule.obj \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES=-I.
|
||||
|
||||
INCLUDES = $(LOCAL_INCLUDES)
|
||||
|
||||
REQUIRES= necko
|
||||
|
||||
INCS = $(INCS) \
|
||||
-I$(DEPTH)\dist\include \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
|
||||
install:: $(LIBRARY)
|
||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
@ -29,6 +29,6 @@ static nsModuleComponentInfo gResComponents[] = {
|
||||
NS_NETWORK_PROTOCOL_PROGID_PREFIX "resource",
|
||||
nsResProtocolHandler::Create
|
||||
}
|
||||
};
|
||||
2};
|
||||
|
||||
NS_IMPL_NSGETMODULE("res", gResComponents)
|
||||
|
||||
@ -26,17 +26,18 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = converters
|
||||
LIBRARY_NAME = converters
|
||||
SHORT_LIBNAME = convrtrs
|
||||
IS_COMPONENT = 1
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = nkcnvts_s
|
||||
|
||||
REQUIRES = xpcom zlib
|
||||
|
||||
EXPORTS = \
|
||||
nsHTTPChunkConv.h \
|
||||
$(NULL)
|
||||
|
||||
CPPSRCS = \
|
||||
nsMultiMixedConv.cpp \
|
||||
nsFTPDirListingConv.cpp \
|
||||
nsConvFactories.cpp \
|
||||
mozTXTToHTMLConv.cpp \
|
||||
nsUnknownDecoder.cpp \
|
||||
nsHTTPChunkConv.cpp \
|
||||
@ -44,8 +45,10 @@ CPPSRCS = \
|
||||
nsTXTToHTMLConv.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
|
||||
$(ZLIB_LIBS)
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -22,53 +22,29 @@ include <$(DEPTH)/config/config.mak>
|
||||
|
||||
MODULE = necko
|
||||
|
||||
IS_COMPONENT=1
|
||||
MAKE_OBJ_TYPE=DLL
|
||||
DLLNAME=cnvts
|
||||
DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
||||
|
||||
LLIBS= $(LLIBS) \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(LIBNSPR) \
|
||||
!ifdef MOZ_PERF
|
||||
$(DIST)\lib\util.lib \
|
||||
!endif
|
||||
$(DIST)\lib\zlib.lib \
|
||||
$(NULL)
|
||||
|
||||
#
|
||||
# Add these for perf info...
|
||||
#
|
||||
# $(DIST)\lib\timer_s.lib \
|
||||
|
||||
|
||||
LIBRARY_NAME=nkcnvts_s
|
||||
|
||||
LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
|
||||
# Add this for performance TXT-HTML performance #'s: -DMOZ_PERF_METRICS
|
||||
|
||||
CPP_OBJS = \
|
||||
.\$(OBJDIR)\nsMultiMixedConv.obj \
|
||||
.\$(OBJDIR)\nsFTPDirListingConv.obj \
|
||||
.\$(OBJDIR)\nsConvFactories.obj \
|
||||
.\$(OBJDIR)\mozTXTToHTMLConv.obj \
|
||||
.\$(OBJDIR)\nsHTTPChunkConv.obj \
|
||||
.\$(OBJDIR)\nsHTTPCompressConv.obj \
|
||||
.\$(OBJDIR)\nsUnknownDecoder.obj \
|
||||
.\$(OBJDIR)\nsTXTToHTMLConv.obj \
|
||||
EXPORTS = \
|
||||
nsHTTPChunkConv.h \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES=-I. -I$(XPDIST)\public\zlib
|
||||
|
||||
INCLUDES = $(LOCAL_INCLUDES)
|
||||
|
||||
INCS = $(INCS) \
|
||||
-I$(DEPTH)\dist\include \
|
||||
CPP_OBJS = \
|
||||
.\$(OBJDIR)\nsMultiMixedConv.obj \
|
||||
.\$(OBJDIR)\nsFTPDirListingConv.obj \
|
||||
.\$(OBJDIR)\mozTXTToHTMLConv.obj \
|
||||
.\$(OBJDIR)\nsHTTPChunkConv.obj \
|
||||
.\$(OBJDIR)\nsHTTPCompressConv.obj \
|
||||
.\$(OBJDIR)\nsUnknownDecoder.obj \
|
||||
.\$(OBJDIR)\nsTXTToHTMLConv.obj \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
|
||||
install:: $(LIBRARY)
|
||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
$(RM) $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
@ -1026,7 +1026,7 @@ mozTXTToHTMLConv::ScanHTML(nsString& aInString, PRUint32 whattodo, nsString &aOu
|
||||
// Look for simple entities not included in a tags and scan them.
|
||||
/* Skip all tags ("<[...]>") and content in an a tag ("<a[...]</a>").
|
||||
Unescape the rest (text between tags) and pass it to ScanTXT. */
|
||||
for (PRInt32 i = 0; i < aInString.Length();)
|
||||
for (PRUint32 i = 0; i < aInString.Length();)
|
||||
{
|
||||
if (aInString[i] == '<') // html tag
|
||||
{
|
||||
|
||||
@ -199,7 +199,7 @@ nsTXTToHTMLConv::nsTXTToHTMLConv() {
|
||||
mPreFormatHTML = PR_FALSE;
|
||||
}
|
||||
|
||||
PRBool CleanupTokens(void *aElement, void *aData) {
|
||||
static PRBool CleanupTokens(void *aElement, void *aData) {
|
||||
if (aElement) delete (convToken*)aElement;
|
||||
return PR_TRUE;
|
||||
}
|
||||
|
||||
@ -26,8 +26,8 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = streamconv
|
||||
XPIDL_MODULE = necko_stream_converter
|
||||
MODULE = necko
|
||||
XPIDL_MODULE = necko_strconv
|
||||
|
||||
XPIDLSRCS = \
|
||||
nsIStreamConverter.idl \
|
||||
|
||||
@ -19,7 +19,9 @@
|
||||
#
|
||||
# Contributor(s):
|
||||
|
||||
MODULE = streamconv
|
||||
MODULE = necko
|
||||
|
||||
XPIDL_MODULE = necko_strconv
|
||||
|
||||
DEPTH = ..\..\..
|
||||
|
||||
|
||||
@ -26,19 +26,19 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = streamconv
|
||||
LIBRARY_NAME = streamconv
|
||||
SHORT_LIBNAME = strmconv
|
||||
IS_COMPONENT = 1
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = nkconv_s
|
||||
|
||||
REQUIRES = xpcom
|
||||
|
||||
CPPSRCS = \
|
||||
nsStreamConverterService.cpp \
|
||||
nsStreamConvServiceFactory.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -18,38 +18,23 @@
|
||||
# Contributor(s):
|
||||
|
||||
DEPTH = ..\..\..
|
||||
include <$(DEPTH)/config/config.mak>
|
||||
|
||||
MODULE = streamconv
|
||||
MODULE = necko
|
||||
|
||||
IS_COMPONENT=1
|
||||
MAKE_OBJ_TYPE=DLL
|
||||
DLLNAME=stremcnv
|
||||
DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
||||
|
||||
LLIBS= $(LLIBS) \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(LIBNSPR) \
|
||||
$(NULL)
|
||||
LIBRARY_NAME=nkconv_s
|
||||
|
||||
LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
|
||||
|
||||
CPP_OBJS = \
|
||||
.\$(OBJDIR)\nsStreamConverterService.obj \
|
||||
.\$(OBJDIR)\nsStreamConvServiceFactory.obj \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES=-I.
|
||||
|
||||
INCLUDES = $(LOCAL_INCLUDES)
|
||||
|
||||
INCS = $(INCS) \
|
||||
-I$(DEPTH)\dist\include \
|
||||
CPP_OBJS = \
|
||||
.\$(OBJDIR)\nsStreamConverterService.obj \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
|
||||
install:: $(LIBRARY)
|
||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
|
||||
@ -62,7 +62,7 @@ nsStreamConverterService::nsStreamConverterService() {
|
||||
}
|
||||
|
||||
// Delete all the entries in the adjacency list
|
||||
PRBool PR_CALLBACK DeleteAdjacencyEntry(nsHashKey *aKey, void *aData, void* closure) {
|
||||
static PRBool PR_CALLBACK DeleteAdjacencyEntry(nsHashKey *aKey, void *aData, void* closure) {
|
||||
SCTableData *entry = (SCTableData*)aData;
|
||||
NS_ASSERTION(entry->key && entry->keyString && entry->data, "malformed adjacency list entry");
|
||||
delete entry->key;
|
||||
@ -291,7 +291,7 @@ nsStreamConverterService::ParseFromTo(const char *aProgID, nsCString &aFromRes,
|
||||
// nsHashtable enumerator functions.
|
||||
|
||||
// Initializes the BFS state table.
|
||||
PRBool PR_CALLBACK InitBFSTable(nsHashKey *aKey, void *aData, void* closure) {
|
||||
static PRBool PR_CALLBACK InitBFSTable(nsHashKey *aKey, void *aData, void* closure) {
|
||||
nsHashtable *BFSTable = (nsHashtable*)closure;
|
||||
if (!BFSTable) return PR_FALSE;
|
||||
|
||||
@ -316,7 +316,7 @@ PRBool PR_CALLBACK InitBFSTable(nsHashKey *aKey, void *aData, void* closure) {
|
||||
};
|
||||
|
||||
// cleans up the BFS state table
|
||||
PRBool PR_CALLBACK DeleteBFSEntry(nsHashKey *aKey, void *aData, void *closure) {
|
||||
static PRBool PR_CALLBACK DeleteBFSEntry(nsHashKey *aKey, void *aData, void *closure) {
|
||||
SCTableData *data = (SCTableData*)aData;
|
||||
delete data->key;
|
||||
delete data->keyString;
|
||||
|
||||
@ -48,8 +48,6 @@ viewer:Essential Files:RaptorShell.shlb
|
||||
viewer:Essential Files:webshell.shlb
|
||||
viewer:Essential Files:widget.shlb
|
||||
|
||||
viewer:Components:about.shlb
|
||||
viewer:Components:about.xpt
|
||||
viewer:Components:AppShell.shlb
|
||||
viewer:Components:appshell.xpt
|
||||
viewer:Components:bookmarks.shlb
|
||||
@ -60,9 +58,6 @@ viewer:Components:chardet.shlb
|
||||
viewer:Components:ChomeRegistry.shlb
|
||||
viewer:Components:chrome.xpt
|
||||
viewer:Components:Cookie.shlb
|
||||
viewer:Components:data.shlb
|
||||
viewer:Components:data.shlb
|
||||
viewer:Components:data.xpt
|
||||
viewer:Components:Directory.shlb
|
||||
viewer:Components:Directory.xpt
|
||||
viewer:Components:docshell.xpt
|
||||
@ -72,22 +67,11 @@ viewer:Components:domds.xpt
|
||||
viewer:Components:editor.xpt
|
||||
viewer:Components:EditorCore.shlb
|
||||
viewer:Components:EditorTxmgr.shlb
|
||||
viewer:Components:file.shlb
|
||||
viewer:Components:FindComponent.shlb
|
||||
viewer:Components:finger.shlb
|
||||
viewer:Components:ftp.shlb
|
||||
viewer:Components:ftp.xpt
|
||||
viewer:Components:gfx.xpt
|
||||
viewer:Components:gifdecoder.shlb
|
||||
viewer:Components:history.shlb
|
||||
viewer:Components:history.xpt
|
||||
viewer:Components:htmlparser.shlb
|
||||
viewer:Components:http.shlb
|
||||
viewer:Components:http.xpt
|
||||
viewer:Components:keyword.shlb
|
||||
viewer:Components:datetime.shlb
|
||||
viewer:Components:jar.shlb
|
||||
viewer:Components:jar.xpt
|
||||
viewer:Components:jpgdecoder.shlb
|
||||
viewer:Components:JSLoader.shlb
|
||||
viewer:Components:jsurl.shlb
|
||||
@ -99,15 +83,10 @@ viewer:Components:libpref.shlb
|
||||
viewer:Components:libpref.xpt
|
||||
viewer:Components:libutil.xpt
|
||||
viewer:Components:lwbrk.shlb
|
||||
viewer:Components:mimetype.shlb
|
||||
viewer:Components:mozBrowser.shlb
|
||||
viewer:Components:mozBrowser.xpt
|
||||
viewer:Components:mozcomps.xpt
|
||||
viewer:Components:multiMixedConv.shlb
|
||||
viewer:Components:netwerk.xpt
|
||||
viewer:Components:Network.shlb
|
||||
viewer:Components:nkcache.shlb
|
||||
viewer:Components:nkcache.xpt
|
||||
viewer:Components:gfx.xpt
|
||||
viewer:Components:nsIStringBundle.xpt
|
||||
viewer:Components:nslocale.shlb
|
||||
viewer:Components:nsLocale.xpt
|
||||
@ -124,14 +103,10 @@ viewer:Components:RegViewer.shlb
|
||||
viewer:Components:RegViewer.xpt
|
||||
viewer:Components:Related.shlb
|
||||
viewer:Components:related.xpt
|
||||
viewer:Components:res.shlb
|
||||
viewer:Components:res.xpt
|
||||
viewer:Components:Search.shlb
|
||||
viewer:Components:search.xpt
|
||||
viewer:Components:shistory.shlb
|
||||
viewer:Components:shistory.xpt
|
||||
viewer:Components:streamconv.shlb
|
||||
viewer:Components:streamconv.xpt
|
||||
viewer:Components:strres.shlb
|
||||
viewer:Components:TextServices.shlb
|
||||
viewer:Components:tmbm.shlb
|
||||
@ -164,6 +139,10 @@ viewer:Components:xpinstall.xpt
|
||||
viewer:Components:autocomplete.shlb
|
||||
viewer:Components:autocomplete.xpt
|
||||
|
||||
viewer:Components:Necko.shlb
|
||||
viewer:Components:Necko2.shlb
|
||||
viewer:Components:necko.xpt
|
||||
|
||||
viewer:chrome:editor:*
|
||||
-viewer:chrome:editor:content:EditorInitPage.html
|
||||
-viewer:chrome:editor:content:EditorInitPagePlain.html
|
||||
|
||||
@ -58,7 +58,6 @@ bin/components/libbookmarks.so
|
||||
bin/components/libcaps.so
|
||||
bin/components/libchardet.so
|
||||
bin/components/libchrome.so
|
||||
bin/components/libconverters.so
|
||||
bin/components/libcookie.so
|
||||
bin/components/libdirectory.so
|
||||
bin/components/libeditor.so
|
||||
@ -66,20 +65,10 @@ bin/components/libgfxps.so
|
||||
bin/components/libhistory.so
|
||||
bin/components/libjsurl.so
|
||||
bin/components/liblwbrk.so
|
||||
bin/components/libmimetype.so
|
||||
bin/components/libmozbrwsr.so
|
||||
bin/components/libmozfind.so
|
||||
bin/components/libmozucth.so
|
||||
bin/components/libmozxfer.so
|
||||
bin/components/libnecko.so
|
||||
bin/components/libnecko_about.so
|
||||
bin/components/libnecko_data.so
|
||||
bin/components/libnecko_file.so
|
||||
bin/components/libnecko_finger.so
|
||||
bin/components/libnecko_ftp.so
|
||||
bin/components/libnecko_http.so
|
||||
bin/components/libnecko_jar.so
|
||||
bin/components/libnecko_resource.so
|
||||
bin/components/libnsgif.so
|
||||
bin/components/libnsjpg.so
|
||||
bin/components/libnslocale.so
|
||||
@ -93,7 +82,6 @@ bin/components/libraptorview.so
|
||||
bin/components/librdf.so
|
||||
bin/components/librelated.so
|
||||
bin/components/libshistory.so
|
||||
bin/components/libstreamconv.so
|
||||
bin/components/libstrres.so
|
||||
bin/components/libtimer_gtk.so
|
||||
bin/components/libtoolkit_service.so
|
||||
@ -122,15 +110,19 @@ bin/components/mozcomps.xpt
|
||||
bin/components/mozfind.xpt
|
||||
bin/components/mozucth.xpt
|
||||
bin/components/mozxfer.xpt
|
||||
bin/components/libnecko.so
|
||||
bin/components/libnecko2.so
|
||||
bin/components/necko.xpt
|
||||
bin/components/necko_cache.xpt
|
||||
bin/components/necko_strconv.xpt
|
||||
bin/components/necko_about.xpt
|
||||
bin/components/necko_base.xpt
|
||||
bin/components/necko_data.xpt
|
||||
bin/components/necko_dns.xpt
|
||||
bin/components/necko_ftp.xpt
|
||||
bin/components/necko_http.xpt
|
||||
bin/components/necko_jar.xpt
|
||||
bin/components/necko_res.xpt
|
||||
bin/components/necko_socket.xpt
|
||||
bin/components/necko_stream_converter.xpt
|
||||
bin/components/nkcache.xpt
|
||||
bin/components/nsSidebar.js
|
||||
bin/components/xpinstall.xpt
|
||||
bin/components/oji.xpt
|
||||
@ -162,17 +154,10 @@ bin/components/layout.xpt
|
||||
; this is only there if you build the irc client
|
||||
; bin/components/libbs.so
|
||||
bin/components/libjsloader.so
|
||||
bin/components/libnecko_cache.so
|
||||
bin/components/libnecko_jar.so
|
||||
bin/components/libnecko_res.so
|
||||
bin/components/libnkkyword.so
|
||||
bin/components/libnecko_datetime.so
|
||||
bin/components/libnsprefm.so
|
||||
bin/components/libregviewer.so
|
||||
bin/components/libsample.so
|
||||
bin/components/libsearch.so
|
||||
bin/components/necko_jar.xpt
|
||||
bin/components/necko_res.xpt
|
||||
bin/components/nsSample.js
|
||||
bin/components/prefmigr.xpt
|
||||
bin/components/profile.xpt
|
||||
|
||||
@ -65,13 +65,11 @@ bin\components\gkview.dll
|
||||
bin\components\history.dll
|
||||
bin\components\history.xpt
|
||||
bin\components\intl.xpt
|
||||
bin\components\jar.xpt
|
||||
bin\components\jsloader.dll
|
||||
bin\components\jsurl.dll
|
||||
bin\components\jsurl.xpt
|
||||
bin\components\locale.xpt
|
||||
bin\components\lwbrk.dll
|
||||
bin\components\mimetype.dll
|
||||
bin\components\mozbrwsr.dll
|
||||
bin\components\mozbrwsr.xpt
|
||||
bin\components\mozcomps.xpt
|
||||
@ -83,24 +81,17 @@ bin\components\mozxfer.dll
|
||||
bin\components\mozxfer.xpt
|
||||
bin\components\nativapp.dll
|
||||
bin\components\necko.dll
|
||||
bin\components\necko2.dll
|
||||
bin\components\necko.xpt
|
||||
bin\components\necko_cache.xpt
|
||||
bin\components\necko_strconv.xpt
|
||||
bin\components\necko_about.xpt
|
||||
bin\components\necko_data.xpt
|
||||
bin\components\necko_dns.xpt
|
||||
bin\components\necko_ftp.xpt
|
||||
bin\components\necko_http.xpt
|
||||
bin\components\nkabout.dll
|
||||
bin\components\nkcache.dll
|
||||
bin\components\nkcache.xpt
|
||||
bin\components\nkdata.dll
|
||||
bin\components\nkfile.dll
|
||||
bin\components\nkfinger.dll
|
||||
bin\components\nkftp.dll
|
||||
bin\components\nkhttp.dll
|
||||
bin\components\nkjar.dll
|
||||
bin\components\nkres.dll
|
||||
bin\components\nkkyword.dll
|
||||
bin\components\nkdatetm.dll
|
||||
bin\components\necko_jar.xpt
|
||||
bin\components\necko_res.xpt
|
||||
bin\components\nsgif.dll
|
||||
bin\components\nsjpg.dll
|
||||
bin\components\nslocale.dll
|
||||
@ -128,8 +119,6 @@ bin\components\shistory.dll
|
||||
bin\components\shistory.xpt
|
||||
bin\components\sidebar.xpt
|
||||
bin\components\signonviewer.xpt
|
||||
bin\components\streamconv.xpt
|
||||
bin\components\stremcnv.dll
|
||||
bin\components\strres.dll
|
||||
bin\components\tbmb.dll
|
||||
bin\components\tbmb.xpt
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user