Backing out my changes of NUCACHE. Gromit/Raptor were broken.

git-svn-id: svn://10.0.0.236/trunk@13196 18797224-902f-48f8-a5cc-f745e15eee43
1998-10-20 13:49:16 +00:00
parent 5279660a51
commit 31e3d18f62
8 changed files with 32 additions and 27 deletions
--- a/mozilla/cmd/winfe/mkfiles32/mozilla.mak
+++ b/mozilla/cmd/winfe/mkfiles32/mozilla.mak
@@ -186,7 +186,7 @@ CFLAGS_RELEASE=/DNDEBUG /DCookieManagement /DSingleSignon /DJS_THREADSAFE \
 !else
 CFLAGS_RELEASE=/DNDEBUG \
 !endif
-!ifdef NU_CACHE
+!ifndef NU_CACHE
 	/DNU_CACHE	\
 !endif
 !if defined(MOZ_FULLCIRCLE)
@@ -237,7 +237,7 @@ CFLAGS_DEBUG=$(MOZ_DEBUG_FLAG) /DDEBUG /D_DEBUG $(MOZ_USERDEBUG)\
 !if defined(VERBOSE)
 	/Bd \
 !endif
-!ifdef NU_CACHE
+!ifndef NU_CACHE
 	/DNU_CACHE	\
 !endif
 !if defined(MOZ_FULLCIRCLE)
@@ -478,7 +478,7 @@ LINK_LIBS= \
    $(DIST)\lib\marimurl.lib \
    $(DIST)\lib\remoturl.lib \
    $(DIST)\lib\netcache.lib \
-!ifdef NU_CACHE # TODO Remove later
+!ifndef NU_CACHE # TODO Remove later
    $(DIST)\lib\cache.lib \
 !endif
    $(DIST)\lib\netcnvts.lib \
--- a/mozilla/config/config.mak
+++ b/mozilla/config/config.mak
@@ -47,12 +47,6 @@ WINOS=$(WINOS: =)^
 !if [del osuname.inc]
 !endif

-!ifdef NO_NU_CACHE
-NU_CACHE=0
-!else
-NU_CACHE=1
-!endif
-
 # need this everywhere jsapi.h might be included
 LCFLAGS=$(LCFLAGS) -DJS_THREADSAFE

@@ -217,7 +211,7 @@ CFLAGS=$(CFLAGS) -DTRANSACTION_RECEIPTS
 !endif

 # TODO Cleanup later -Gagan
-!ifdef NU_CACHE 
+!ifndef NU_CACHE 
 CFLAGS=$(CFLAGS) -DNU_CACHE
 !endif

--- a/mozilla/modules/libimg/src/makefile.win
+++ b/mozilla/modules/libimg/src/makefile.win
@@ -54,7 +54,9 @@ LLIBS=$(DIST)\lib\png.lib \
 	$(DIST)\lib\util.lib            \
 	$(DIST)\lib\zip$(MOZ_BITS)$(VERSION_NUMBER).lib \
 	$(DIST)\lib\xpcom32.lib \
+!ifdef NU_CACHE
 	$(DIST)\lib\cache.lib \
+!endif
 	$(NULL)
 !else
 LLIBS=$(DIST)\lib\png.lib \
@@ -116,7 +118,7 @@ EXTRA_LIBS=$(DIST)/lib/libzlib.a $(DIST)/lib/libpng.a
 !ifdef STANDALONE_IMAGE_LIB
 CPPSRCS=color.cpp colormap.cpp dither.cpp gif.cpp if.cpp ilclient.cpp il_util.cpp \
    ilNetReader.cpp jpeg.cpp scale.cpp xbm.cpp ipng.cpp png_png.cpp xpcompat.cpp
-REQUIRES=zlib nspr jpeg util img png xpcom cache
+REQUIRES=zlib nspr jpeg util img png xpcom
 CPP_OBJS=.\$(OBJDIR)\color.obj .\$(OBJDIR)\colormap.obj \
    .\$(OBJDIR)\dither.obj .\$(OBJDIR)\gif.obj .\$(OBJDIR)\if.obj \
    .\$(OBJDIR)\ilclient.obj .\$(OBJDIR)\il_util.obj \
@@ -127,7 +129,9 @@ CPP_OBJS=.\$(OBJDIR)\color.obj .\$(OBJDIR)\colormap.obj \
 !if "$(MOZ_BITS)" != "16"
 LINCS=-I$(XPDIST)\public\zlib -I$(XPDIST)\public\nspr \
    -I$(XPDIST)\public\jpeg -I$(XPDIST)\public\util -I$(XPDIST)\public\img \
+!ifdef NU_CACHE
    -I$(XPDIST)\public\cache \
+!endif
    -I$(XPDIST)\public\png -I$(XPDIST)\public\xpcom 
 !endif

@@ -135,7 +139,7 @@ LINCS=-I$(XPDIST)\public\zlib -I$(XPDIST)\public\nspr \
 !else
 CPPSRCS=color.cpp colormap.cpp dither.cpp dummy_nc.cpp external.cpp gif.cpp if.cpp \
   ilclient.cpp il_util.cpp jpeg.cpp scale.cpp xbm.cpp ipng.cpp png_png.cpp ilNetReader.cpp 
-REQUIRES=jtools java zlib nspr dbm jpeg util img png layer js xpcom cache
+REQUIRES=jtools java zlib nspr dbm jpeg util img png layer js xpcom
 EXPORTS=PIMGCB.h PPSIMGCB.h 
 JMC_HEADERS=$(JMC_GEN_DIR)\MIMGCB.h $(JMC_GEN_DIR)\MPSIMGCB.h 
 JMC_STUBS=$(JMC_GEN_DIR)\MIMGCB.c $(JMC_GEN_DIR)\MPSIMGCB.c 
@@ -154,7 +158,9 @@ LINCS=-I$(XPDIST)\public\jtools -I$(XPDIST)\public\java \
    -I$(XPDIST)\public\dbm -I$(XPDIST)\public\jpeg \
    -I$(XPDIST)\public\util -I$(XPDIST)\public\img \
    -I$(XPDIST)\public\png -I$(XPDIST)\public\layer \
+!ifdef NU_CACHE
    -I$(XPDIST)\public\cache \
+!endif
    -I$(XPDIST)\public\js -I$(XPDIST)\public\xpcom
 !endif
 !endif
--- a/mozilla/modules/rdf/src/makefile.win
+++ b/mozilla/modules/rdf/src/makefile.win
@@ -87,7 +87,9 @@ LINCS=-I$(XPDIST)\public\nspr -I$(XPDIST)\public\dbm \
    -I$(XPDIST)\public\htmldlgs -I$(XPDIST)\public\util \
    -I$(XPDIST)\public\img -I$(XPDIST)\public\layer \
    -I$(XPDIST)\public\ldap \
+!ifdef NU_CACHE
    -I$(XPDIST)\public\cache \
+!endif
    -I$(XPDIST)\public\pref \
    -I$(XPDIST)\public\network \
    -I$(XPDIST)\public\parse
--- a/mozilla/network/cache/makefile.win
+++ b/mozilla/network/cache/makefile.win
@@ -18,6 +18,10 @@
 IGNORE_MANIFEST=1
 #

+!ifndef NU_CACHE
+DIRS=nu
+!endif
+
 #------------------------------------------------------------------------
 #
 # Makefile to build the cache LIB
@@ -63,17 +67,13 @@ LIBRARY_NAME=netcache
 MODULE=netcache 
 DEPTH=..\..

-!ifdef NU_CACHE
-DIRS=nu
-!endif
-
 EXTRA_LIBS=

-#!ifdef NU_CACHE
+!ifdef NU_CACHE
 REQUIRES= network nspr2 cache
-#!else
-#REQUIRES= network nspr2
-#!endif
+!else
+REQUIRES= network nspr2
+!endif

 EXPORTS= netcache.h

@@ -93,7 +93,9 @@ LINCS= \
    -I$(XPDIST)\public\java 	\
    -I$(XPDIST)\public\fileurl 	\
    -I$(XPDIST)\public\security \
+!ifdef NU_CACHE
    -I$(XPDIST)\public\cache 	\
+!endif
    -I$(XPDIST)\public\jtools
 #!endif

--- a/mozilla/network/cache/nu/src/nsCachePref.cpp
+++ b/mozilla/network/cache/nu/src/nsCachePref.cpp
@@ -36,10 +36,10 @@ static const PRUint32 BKG_THREAD_SLEEP = 60;//TODO- Testing 15*60; /*in seconds,
 static const PRUint16 BUGS_FOUND_SO_FAR = 0;

 //Preferences
-static const char* MEM_CACHE_PREF   = "browser.cache.memory_cache_size";
-static const char* DISK_CACHE_PREF  = "browser.cache.disk_cache_size";
-static const char* CACHE_DIR_PREF   = "browser.cache.directory";
-static const char* FREQ_PREF        = "browser.cache.check_doc_frequency";
+static const char const* MEM_CACHE_PREF   = "browser.cache.memory_cache_size";
+static const char const* DISK_CACHE_PREF  = "browser.cache.disk_cache_size";
+static const char const* CACHE_DIR_PREF   = "browser.cache.directory";
+static const char const* FREQ_PREF        = "browser.cache.check_doc_frequency";

 /* Find a bug in NU_CACHE, get these many chocolates */
 static const PRUint16 CHOCOLATES_PER_BUG_FOUND = 2^BUGS_FOUND_SO_FAR; 
--- a/mozilla/network/makefile.win
+++ b/mozilla/network/makefile.win
@@ -30,7 +30,9 @@ DIRS= \
        util \
 	main \
 	mimetype \
-	cache\nu \
+!ifdef NU_CACHE
+	cache\nu	\
+!endif
 	cache \
 	protocol \
 	cnvts \
--- a/mozilla/network/protocol/about/mkabout.c
+++ b/mozilla/network/protocol/about/mkabout.c
@@ -152,8 +152,7 @@ net_OutputURLDocInfo(MWContext *ctxt, char *which, char **data, int32 *length)
 							  : URL_s->memory_copy ? 
 								XP_GetString(XP_CURRENTLY_IN_MEM_CACHE) 
 								: XP_GetString(XP_CURRENTLY_NO_CACHE));
-#endif 
-/* NU_CACHE */
+#endif /* NU_CACHE */

 	ADD_CELL(XP_GetString(XP_LOCAL_CACHE_FILE_), URL_s->cache_file 
 								 ? URL_s->cache_file