X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=.Sanitize;h=426cc4cd94ededfa4cc09f0b4f516d7c0e989c26;hb=6d138e6f4ebd4c147a9dfbeed7dda44bccec9c16;hp=26b678f8eeed6ee9a5416f05a485dffc97c09d59;hpb=7df9e1165533b51dd3a7a2aeddb26c94fd6aa8f6;p=deliverable%2Fbinutils-gdb.git

diff --git a/.Sanitize b/.Sanitize
index 26b678f8ee..426cc4cd94 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -52,7 +52,7 @@ keep_these_too="${keep_these_too} .cvsignore autoconf automake
 	emacs emacs19 examples expect fileutils findutils flex
 	gas gawk gcc gdb gdbm gdbtest glob gperf gprof grep grez groff
 	guile gzip
-	include inet install-sh ispell
+	include inet install-sh intl ispell
 	ld less libgcc libgloss libiberty libio
 	libstdc++ libtool
 	m4 make mkinstalldirs mmalloc move-if-change newlib ncurses opcodes
@@ -63,7 +63,7 @@ keep_these_too="${keep_these_too} .cvsignore autoconf automake
 	mpw-README mpw-configure mpw-config.in mpw-build.in mpw-install
 	ltconfig ltmain.sh missing ylwrap"
 
-lose_these_too="${lose_these_too} testsuite"
+lose_these_too="${lose_these_too} libg++ librx testsuite"
 
 cygnus_files="release release-info build-all.mk test-build.mk CYGNUS COPYING.NEWLIB"
 
@@ -108,7 +108,7 @@ else
 	keep_these_too="${keep_these_too} ${inet_files}"
 fi
 
-ide_files="libide vmake jstools"
+ide_files="libide libidetcl vmake jstools"
 
 if (echo $* | grep keep\-ide > /dev/null); then
 	keep_these_too="${keep_these_too} ${ide_files}"
@@ -117,6 +117,34 @@ else
 	lose_these_too="${lose_these_too} ${ide_files}"
 fi
 
+flexlm_files="flexlm"
+
+if (echo $* | grep keep\-cygnus > /dev/null); then
+	keep_these_too="${keep_these_too} ${flexlm_files}"
+	test -n "$verbose" && echo Keeping ${flexlm_files}
+else
+	lose_these_too="${lose_these_too} ${flexlm_files}"
+fi
+
+# CGEN files:
+# It is not yet clear if the cgen package will be shipped with the
+# simulators.
+cgen_files="cgen"
+
+if (echo $* | grep keep\-cgen > /dev/null); then
+	keep_these_too="${keep_these_too} ${cgen_files}"
+else
+	lose_these_too="${lose_these_too} ${cgen_files}"
+fi
+
+# Java stuff
+java_files="boehm-gc libjava"
+
+if (echo $* | grep keep\-java > /dev/null); then
+	keep_these_too="${keep_these_too} ${java_files}"
+else
+	lose_these_too="${lose_these_too} ${java_files}"
+fi
 
 # This top-level directory is special.  We often check out only subsets
 # of this directory, and complaining about directories or files we didn't
@@ -636,7 +664,35 @@ else
 	done
 fi
 
-kcygnus_files="configure"
+java_files="ChangeLog Makefile.in configure.in"
+if ( echo $* | grep keep\-java > /dev/null ) ; then
+	for i in $java_files ; do
+		if test ! -d $i && (grep sanitize-java $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping java stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-java $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"java\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-java/,/end-\sanitize\-java/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
+kcygnus_files="ChangeLog configure configure.in Makefile.in"
 if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
 	for i in $kcygnus_files ; do
 		if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then