From 566187925136d98f2d5e18edb597eceea77aca16 Mon Sep 17 00:00:00 2001 From: "gordon%netscape.com" Date: Tue, 17 Apr 2001 10:47:22 +0000 Subject: [PATCH] bug 72528, remove old cache from build. sr=darin. git-svn-id: svn://10.0.0.236/trunk@92549 18797224-902f-48f8-a5cc-f745e15eee43 --- .../plugin/base/src/nsPluginHostImpl.cpp | 13 +---- .../plugin/nglsrc/nsPluginHostImpl.cpp | 13 +---- mozilla/netwerk/base/public/nsIDownloader.idl | 13 +---- mozilla/netwerk/base/src/nsDownloader.cpp | 45 ++++-------------- mozilla/netwerk/base/src/nsDownloader.h | 1 - mozilla/netwerk/build/Makefile.in | 23 ++++++--- mozilla/netwerk/build/makefile.win | 12 +++-- mozilla/netwerk/build/nsNetCID.h | 12 +++++ mozilla/netwerk/build/nsNetModule.cpp | 10 ++-- mozilla/netwerk/cache/Makefile.in | 13 +++-- mozilla/netwerk/cache/Makefile.win | 4 +- mozilla/netwerk/cache/public/Makefile.in | 6 ++- mozilla/netwerk/cache/public/Makefile.win | 6 ++- mozilla/netwerk/macbuild/netwerk.mcp | Bin 190932 -> 174252 bytes mozilla/netwerk/macbuild/netwerkIDL.mcp | Bin 92576 -> 92496 bytes mozilla/netwerk/test/makefile.win | 8 +--- 16 files changed, 78 insertions(+), 101 deletions(-) diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index 469e2683e39..194a7716ba5 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -47,16 +47,13 @@ #include "nsIURL.h" #include "nsIChannel.h" #include "nsIHTTPChannel.h" -#include "nsIStreamAsFile.h" #include "nsIFileStream.h" // for nsIRandomAccessStore #include "nsNetUtil.h" #include "nsIProgressEventSink.h" #include "nsIDocument.h" #include "nsIScriptablePlugin.h" - -#if MOZ_NEW_CACHE #include "nsICachingChannel.h" -#endif + // Friggin' X11 has to "#define None". Lame! #ifdef None #undef None @@ -1329,7 +1326,6 @@ nsPluginStreamListenerPeer::OnStartRequest(nsIRequest *request, nsISupports* aCo if (!channel) return NS_ERROR_FAILURE; -#if MOZ_NEW_CACHE nsCOMPtr cacheChannel = do_QueryInterface(channel); if (cacheChannel) { rv = cacheChannel->SetCacheAsFile(PR_TRUE); @@ -1339,7 +1335,6 @@ nsPluginStreamListenerPeer::OnStartRequest(nsIRequest *request, nsISupports* aCo NS_ASSERTION(PR_FALSE, "No Disk Cache Aval. Some plugins wont work."); } } -#endif char* aContentType = nsnull; rv = channel->GetContentType(&aContentType); @@ -1498,15 +1493,9 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest(nsIRequest *request, char* urlString; nsCOMPtr localFile; -#if MOZ_NEW_CACHE nsCOMPtr cacheChannel = do_QueryInterface(channel); if (cacheChannel) rv = cacheChannel->GetCacheFile(getter_AddRefs(localFile)); -#else - nsCOMPtr streamAsFile = do_QueryInterface(channel); - if (streamAsFile) - rv = streamAsFile->GetFile(getter_AddRefs(localFile)); -#endif if (NS_SUCCEEDED(rv) && localFile) { char* pathAndFilename; diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp index 469e2683e39..194a7716ba5 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -47,16 +47,13 @@ #include "nsIURL.h" #include "nsIChannel.h" #include "nsIHTTPChannel.h" -#include "nsIStreamAsFile.h" #include "nsIFileStream.h" // for nsIRandomAccessStore #include "nsNetUtil.h" #include "nsIProgressEventSink.h" #include "nsIDocument.h" #include "nsIScriptablePlugin.h" - -#if MOZ_NEW_CACHE #include "nsICachingChannel.h" -#endif + // Friggin' X11 has to "#define None". Lame! #ifdef None #undef None @@ -1329,7 +1326,6 @@ nsPluginStreamListenerPeer::OnStartRequest(nsIRequest *request, nsISupports* aCo if (!channel) return NS_ERROR_FAILURE; -#if MOZ_NEW_CACHE nsCOMPtr cacheChannel = do_QueryInterface(channel); if (cacheChannel) { rv = cacheChannel->SetCacheAsFile(PR_TRUE); @@ -1339,7 +1335,6 @@ nsPluginStreamListenerPeer::OnStartRequest(nsIRequest *request, nsISupports* aCo NS_ASSERTION(PR_FALSE, "No Disk Cache Aval. Some plugins wont work."); } } -#endif char* aContentType = nsnull; rv = channel->GetContentType(&aContentType); @@ -1498,15 +1493,9 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest(nsIRequest *request, char* urlString; nsCOMPtr localFile; -#if MOZ_NEW_CACHE nsCOMPtr cacheChannel = do_QueryInterface(channel); if (cacheChannel) rv = cacheChannel->GetCacheFile(getter_AddRefs(localFile)); -#else - nsCOMPtr streamAsFile = do_QueryInterface(channel); - if (streamAsFile) - rv = streamAsFile->GetFile(getter_AddRefs(localFile)); -#endif if (NS_SUCCEEDED(rv) && localFile) { char* pathAndFilename; diff --git a/mozilla/netwerk/base/public/nsIDownloader.idl b/mozilla/netwerk/base/public/nsIDownloader.idl index 4698b872dec..95983409997 100644 --- a/mozilla/netwerk/base/public/nsIDownloader.idl +++ b/mozilla/netwerk/base/public/nsIDownloader.idl @@ -20,12 +20,10 @@ * Contributor(s): */ -#include "nsISupports.idl" -#include "nsIChannel.idl" +#include "nsIRequest.idl" interface nsIURI; interface nsILoadGroup; -interface nsIStreamLoader; interface nsIInterfaceRequestor; interface nsIFile; interface nsIDownloader; @@ -50,12 +48,3 @@ interface nsIDownloader : nsISupports in nsIInterfaceRequestor notificationCallbacks, in nsLoadFlags loadAttributes); }; - -%{C++ - -#define NS_DOWNLOADER_CID \ -{ /* 510a86bb-6019-4ed1-bb4f-965cffd23ece*/ \ - 0x510a86bb, 0x6019, 0x4ed1, { 0xbb, 0x4f, 0x96, 0x5c, 0xff, 0xd2, 0x3e, 0xce } \ -} - -%} diff --git a/mozilla/netwerk/base/src/nsDownloader.cpp b/mozilla/netwerk/base/src/nsDownloader.cpp index 18c6fb60422..77bfdd9a2c7 100644 --- a/mozilla/netwerk/base/src/nsDownloader.cpp +++ b/mozilla/netwerk/base/src/nsDownloader.cpp @@ -26,16 +26,12 @@ #include "nsNetUtil.h" #include "nsIChannel.h" #include "nsIFileChannel.h" +#include "nsICachingChannel.h" #include "nsProxiedService.h" #include "nsIFile.h" #include "nsXPIDLString.h" -#include "nsCacheManager.h" -#include "nsICachedNetData.h" -#include "nsIStreamAsFile.h" - static NS_DEFINE_CID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); -static NS_DEFINE_CID(kNetworkCacheManagerCID, NS_CACHE_MANAGER_CID); NS_IMETHODIMP nsDownloader::Init(nsIURI* aURL, @@ -52,7 +48,6 @@ nsDownloader::Init(nsIURI* aURL, nsCOMPtr localFile; nsCOMPtr channel; - aLoadAttributes |= nsIChannel::CACHE_AS_FILE; rv = NS_OpenURI(getter_AddRefs(channel), aURL, nsnull, aGroup, aNotificationCallbacks, aLoadAttributes); if (NS_SUCCEEDED(rv) && channel) @@ -106,7 +101,12 @@ NS_IMPL_ISUPPORTS3(nsDownloader, nsIDownloader, NS_IMETHODIMP nsDownloader::OnStartRequest(nsIRequest *request, nsISupports *ctxt) { - return NS_OK; + nsresult rv; + nsCOMPtr caching = do_QueryInterface(request, &rv); + if (caching) + rv = caching->SetCacheAsFile(PR_TRUE); + // Returning failure from here will cancel the load + return rv; } NS_IMETHODIMP @@ -116,34 +116,9 @@ nsDownloader::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsCOMPtr file; if (NS_SUCCEEDED(aStatus)) { - nsresult rv; - nsCOMPtr uri; - - nsCOMPtr channel = do_QueryInterface(request, &rv); - if (NS_FAILED(rv)) return rv; - - rv = channel->GetURI(getter_AddRefs(uri)); - if (NS_FAILED(rv)) return rv; - nsXPIDLCString spec; - rv = uri->GetSpec(getter_Copies(spec)); - if (NS_FAILED(rv)) return rv; - - NS_WITH_SERVICE(nsINetDataCacheManager, cacheMgr, kNetworkCacheManagerCID, &rv); - if (NS_FAILED(rv)) return rv; - nsCOMPtr cachedData; - rv = cacheMgr->GetCachedNetData(spec, nsnull, 0, nsINetDataCacheManager::CACHE_AS_FILE, - getter_AddRefs(cachedData)); - - - if (NS_SUCCEEDED(rv)) - { - nsCOMPtr streamAsFile; - streamAsFile = do_QueryInterface(cachedData, &rv); - if (NS_FAILED(rv)) return rv; - - rv = streamAsFile->GetFile(getter_AddRefs(file)); - if (NS_FAILED(rv)) return rv; - } + nsCOMPtr caching = do_QueryInterface(request, &aStatus); + if (caching) + aStatus = caching->GetCacheFile(getter_AddRefs(file)); } return mObserver->OnDownloadComplete(this, mContext, aStatus, file); diff --git a/mozilla/netwerk/base/src/nsDownloader.h b/mozilla/netwerk/base/src/nsDownloader.h index c4f8acd3b1a..c0d04724985 100644 --- a/mozilla/netwerk/base/src/nsDownloader.h +++ b/mozilla/netwerk/base/src/nsDownloader.h @@ -47,7 +47,6 @@ public: protected: nsCOMPtr mObserver; nsCOMPtr mContext; // the observer's context -/// nsCOMPtr mLoadGroup; }; #endif // nsDownloader_h__ diff --git a/mozilla/netwerk/build/Makefile.in b/mozilla/netwerk/build/Makefile.in index aff4c9c993f..c7a6748c913 100644 --- a/mozilla/netwerk/build/Makefile.in +++ b/mozilla/netwerk/build/Makefile.in @@ -40,9 +40,6 @@ SHARED_LIBRARY_LIBS = \ $(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/libnkmime_s.$(LIB_SUFFIX) \ $(DIST)/lib/libnkhttp_s.$(LIB_SUFFIX) \ $(DIST)/lib/libnkfile_s.$(LIB_SUFFIX) \ @@ -53,6 +50,14 @@ SHARED_LIBRARY_LIBS = \ $(DIST)/lib/libnkkwd_s.$(LIB_SUFFIX) \ $(NULL) +ifdef OLD_CACHE +SHARED_LIBRARY_LIBS += \ + $(DIST)/lib/libnkcachemgr_s.$(LIB_SUFFIX) \ + $(DIST)/lib/libnkfilecache_s.$(LIB_SUFFIX) \ + $(DIST)/lib/libnkmemcache_s.$(LIB_SUFFIX) \ + $(NULL) +endif + ifeq ($(MOZ_WIDGET_TOOLKIT),os2) SHARED_LIBRARY_LIBS += $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX) endif @@ -67,9 +72,6 @@ LOCAL_INCLUDES = \ -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 \ @@ -80,6 +82,15 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../protocol/keyword/src \ $(NULL) +ifdef OLD_CACHE +LOCAL_INCLUDES += \ + -I$(srcdir)/../cache/memcache \ + -I$(srcdir)/../cache/filecache \ + -I$(srcdir)/../cache/mgr \ + $(NULL) +endif + + EXTRA_DSO_LDOPTS = \ $(MOZ_COMPONENT_LIBS) \ $(ZLIB_LIBS) \ diff --git a/mozilla/netwerk/build/makefile.win b/mozilla/netwerk/build/makefile.win index e3aa8864c56..466ad1ef90b 100644 --- a/mozilla/netwerk/build/makefile.win +++ b/mozilla/netwerk/build/makefile.win @@ -44,11 +44,13 @@ LLIBS= \ $(DIST)\lib\neckosocket_s.lib \ $(DIST)\lib\nkconv_s.lib \ $(DIST)\lib\nkcnvts_s.lib \ - $(DIST)\lib\xpcom.lib \ + $(DIST)\lib\xpcom.lib \ +!ifdef MOZ_OLD_CACHE $(DIST)\lib\nkcachemgr_s.lib \ $(DIST)\lib\nkfilecache_s.lib \ $(DIST)\lib\nkmemcache_s.lib \ - $(DIST)\lib\dbm32.lib \ + $(DIST)\lib\dbm32.lib \ +!endif $(DIST)\lib\nkmime_s.lib \ $(DIST)\lib\nkhttp_s.lib \ $(DIST)\lib\nkfile_s.lib \ @@ -69,10 +71,12 @@ INCS = $(INCS) \ -I$(DEPTH)\netwerk\dns\src \ -I$(DEPTH)\netwerk\socket\base \ -I$(DEPTH)\netwerk\streamconv\src \ - -I$(DEPTH)\netwerk\streamconv\converters \ + -I$(DEPTH)\netwerk\streamconv\converters \ +!ifdef MOZ_OLD_CACHE -I$(DEPTH)\netwerk\cache\memcache \ -I$(DEPTH)\netwerk\cache\filecache \ - -I$(DEPTH)\netwerk\cache\mgr \ + -I$(DEPTH)\netwerk\cache\mgr \ +!endif -I$(DEPTH)\netwerk\mime\src \ -I$(DEPTH)\netwerk\protocol\http\src \ -I$(DEPTH)\netwerk\protocol\file\src \ diff --git a/mozilla/netwerk/build/nsNetCID.h b/mozilla/netwerk/build/nsNetCID.h index acf9892f20b..bc25dba3ce3 100644 --- a/mozilla/netwerk/build/nsNetCID.h +++ b/mozilla/netwerk/build/nsNetCID.h @@ -185,6 +185,18 @@ {0x98, 0x6e, 0x00, 0xc0, 0x4f, 0xa0, 0xcf, 0x4a} \ } +#define NS_DOWNLOADER_CLASSNAME \ + "File Downloader" +#define NS_DOWNLOADER_CONTRACTID \ + "@mozilla.org/network/downloader;1" +#define NS_DOWNLOADER_CID \ +{ /* 510a86bb-6019-4ed1-bb4f-965cffd23ece */ \ + 0x510a86bb, \ + 0x6019, \ + 0x4ed1, \ + {0xbb, 0x4f, 0x96, 0x5c, 0xff, 0xd2, 0x3e, 0xce} \ +} + /****************************************************************************** * netwerk/cache/ classes diff --git a/mozilla/netwerk/build/nsNetModule.cpp b/mozilla/netwerk/build/nsNetModule.cpp index 4654fc609de..c2d36d7b560 100644 --- a/mozilla/netwerk/build/nsNetModule.cpp +++ b/mozilla/netwerk/build/nsNetModule.cpp @@ -56,6 +56,7 @@ /////////////////////////////////////////////////////////////////////////////// +#if defined(OLD_CACHE) #include "nsINetDataCache.h" #include "nsINetDataCacheManager.h" #include "nsMemCacheCID.h" @@ -69,6 +70,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMemCache, Init) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNetDiskCache, Init) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsCacheManager, Init) +#endif /////////////////////////////////////////////////////////////////////////////// @@ -569,9 +571,9 @@ static nsModuleComponentInfo gNetModuleInfo[] = { NS_STREAMLOADER_CID, "@mozilla.org/network/stream-loader;1", nsStreamLoader::Create }, - { "Stream-As-File Downloader", + { NS_DOWNLOADER_CLASSNAME, NS_DOWNLOADER_CID, - "@mozilla.org/network/downloader;1", + NS_DOWNLOADER_CONTRACTID, nsDownloader::Create }, { NS_REQUESTOBSERVERPROXY_CLASSNAME, NS_REQUESTOBSERVERPROXY_CID, @@ -750,12 +752,12 @@ static nsModuleComponentInfo gNetModuleInfo[] = { NS_ISTREAMCONVERTER_KEY, CreateNewTXTToHTMLConvFactory }, - +#if defined(OLD_CACHE) // from netwerk/cache: { "Memory Cache", NS_MEM_CACHE_FACTORY_CID, NS_NETWORK_MEMORY_CACHE_CONTRACTID, nsMemCacheConstructor }, { "File Cache", NS_NETDISKCACHE_CID, NS_NETWORK_FILE_CACHE_CONTRACTID, nsNetDiskCacheConstructor }, { "Cache Manager",NS_CACHE_MANAGER_CID, NS_NETWORK_CACHE_MANAGER_CONTRACTID,nsCacheManagerConstructor }, - +#endif // from netwerk/mime: { "The MIME mapping service", NS_MIMESERVICE_CID, diff --git a/mozilla/netwerk/cache/Makefile.in b/mozilla/netwerk/cache/Makefile.in index 1a4ab99e820..4e3d6140d92 100644 --- a/mozilla/netwerk/cache/Makefile.in +++ b/mozilla/netwerk/cache/Makefile.in @@ -27,12 +27,17 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk DIRS = \ - public \ - memcache \ - filecache \ - mgr \ + public \ $(NULL) +ifdef OLD_CACHE +DIRS += \ + memcache \ + filecache \ + mgr \ + $(NULL) +endif + ifdef MOZ_NEW_CACHE DIRS += src endif diff --git a/mozilla/netwerk/cache/Makefile.win b/mozilla/netwerk/cache/Makefile.win index 4fa098374a7..7bb8739f999 100755 --- a/mozilla/netwerk/cache/Makefile.win +++ b/mozilla/netwerk/cache/Makefile.win @@ -24,10 +24,12 @@ DEPTH=..\.. include <$(DEPTH)/config/config.mak> DIRS= \ - public \ + public \ +!ifdef MOZ_OLD_CACHE mgr \ memcache \ filecache \ +!endif !ifdef MOZ_NEW_CACHE src \ !endif diff --git a/mozilla/netwerk/cache/public/Makefile.in b/mozilla/netwerk/cache/public/Makefile.in index 04aea67e379..cf711bc244c 100644 --- a/mozilla/netwerk/cache/public/Makefile.in +++ b/mozilla/netwerk/cache/public/Makefile.in @@ -29,7 +29,10 @@ XPIDL_MODULE = necko_cache include $(DEPTH)/config/autoconf.mk -XPIDLSRCS = \ +XPIDLSRCS = $(NULL) + +ifdef OLD_CACHE +XPIDLSRCS += \ nsICachedNetData.idl \ nsINetDataCacheManager.idl \ nsINetDataCache.idl \ @@ -37,6 +40,7 @@ XPIDLSRCS = \ nsINetDataDiskCache.idl \ nsIStreamAsFile.idl \ $(NULL) +endif ifdef MOZ_NEW_CACHE diff --git a/mozilla/netwerk/cache/public/Makefile.win b/mozilla/netwerk/cache/public/Makefile.win index 2d93f5e53fd..7264a99d55a 100755 --- a/mozilla/netwerk/cache/public/Makefile.win +++ b/mozilla/netwerk/cache/public/Makefile.win @@ -29,13 +29,15 @@ include <$(DEPTH)/config/config.mak> EXPORTS = \ $(NULL) -XPIDLSRCS = \ +XPIDLSRCS = \ +!ifdef MOZ_OLD_CACHE .\nsICachedNetData.idl \ .\nsINetDataCacheManager.idl \ .\nsINetDataCache.idl \ .\nsINetDataCacheRecord.idl \ .\nsINetDataDiskCache.idl \ - .\nsIStreamAsFile.idl \ + .\nsIStreamAsFile.idl \ +!endif !ifdef MOZ_NEW_CACHE .\nsICache.idl \ .\nsICacheEntryDescriptor.idl \ diff --git a/mozilla/netwerk/macbuild/netwerk.mcp b/mozilla/netwerk/macbuild/netwerk.mcp index 0ca124c9474c476ffaf27dde0a46809e5e0671a1..56d12bb7da50be7fe44787058153dc8f2c02648d 100644 GIT binary patch delta 1950 zcmbW2T})g>6vywGy}Qful`XO?3)|f-h3)N686jR~5@_@Gf^sro`qjK(x3ElMJZ4eOb^hq5n5bZ%yT zGygd=b7ts3Dx43 z1y+Jzq*%dg3!q+zxrqB7c$gmxJR#0oAs<3~CQz}w4m%nF3(Ug^qs_2_d6-`}uTI`B zEpSD}#KH0?Wb*ZvZKf-V!jD=uiP@Ww!~e8g;ALt*|4EJV0dtidZH+-HRxl51%yt+4 zk9!-m;#48%D$@VK%2tMi^*6M@w6h@PwturQ=rS(@zhv5mmR2u)Aj6 zdxFg|afh?OQVKt31>#y0r0823SOv)aUN>pSf5|ZM&v$0>4=XeE1_vC^pP;%Z_Mv5>fe=qCDzUZRIs zMl2`xBb%gK2T8~yW)oe+Rm8Q#L&Qgj1H?7NLE@&z4$K4O%=x0gY{bcQq5WNGZ+S=aPf(=HU&&7wl zGw$AnL)uAwp4dU$M{FXt688|>h|R?yGZSft3lz#1LzRBHtY+>wKs%E zTKdWIrMUXB$dg~jHd1SeuM&3<>xhSmPZPHgYlz!}_O^2QRF`Cb7O#~Y8;HegvQ(7r zgfq)Ez1Y&j4~Z)<{r zpK}T19lXXaF>&T29RFVmzA5bh|069bO3Gnq$&m&lZ<%HZ&>~{WR$0*;y(cniu@^7 z#LO2(Xo_W7tfx?`7oDi(WUax^v$!kV(~c4L*M(7v5*gGdrr1hwUF_Op%(>VF>uzJT zpA^5{WQ8?w?nuJI_}wg|rijPB=QdxPt55{m}F5`l72^n1tMt)%xf( delta 3978 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 diff --git a/mozilla/netwerk/test/makefile.win b/mozilla/netwerk/test/makefile.win index e9adaf2e94e..ad1cd8e3d57 100644 --- a/mozilla/netwerk/test/makefile.win +++ b/mozilla/netwerk/test/makefile.win @@ -31,14 +31,12 @@ PROG6 = .\$(OBJDIR)\urltest.exe PROG7 = .\$(OBJDIR)\TestFileInput2.exe PROG8 = .\$(OBJDIR)\TestFileTransport.exe PROG9 = .\$(OBJDIR)\TestRes.exe -PROGA = .\$(OBJDIR)\TestRawCache.exe -PROGB = .\$(OBJDIR)\TestCacheMgr.exe PROGC = .\$(OBJDIR)\TestWriteStream.exe PROGD = .\$(OBJDIR)\TestWriteSpeed.exe PROGE = .\$(OBJDIR)\TestCallbacks.exe PROGRAMS = \ $(PROG1) $(PROG2) $(PROG3) $(PROG4) $(PROG5) $(PROG6) $(PROG7) $(PROG8) $(PROG9)\ - $(PROGA) $(PROGB) $(PROGC) $(PROGD) $(PROGE) + $(PROGC) $(PROGD) $(PROGE) LCFLAGS=-DUSE_NSREG -GX @@ -78,10 +76,6 @@ $(PROG8): $(OBJDIR) TestFileTransport.cpp $(PROG9): $(OBJDIR) TestRes.cpp -$(PROGA): $(OBJDIR) TestRawCache.cpp - -$(PROGB): $(OBJDIR) TestCacheMgr.cpp - $(PROGC): $(OBJDIR) TestWriteStream.cpp $(PROGD): $(OBJDIR) TestWriteSpeed.cpp