X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=.Sanitize;h=e85d735aa949c5809dbfe5298727ea55441e619c;hb=06d408d2c1eae3a25538550d04257d647455fd97;hp=de82b5cdfc46ef2a4d8d229c6864e34f6cfd6bd8;hpb=b13a565e7515422cab2a77500a1d4d8d6efb6f49;p=deliverable%2Fbinutils-gdb.git

diff --git a/.Sanitize b/.Sanitize
index de82b5cdfc..e85d735aa9 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -16,9 +16,14 @@
 Do-first:
 
 if ( echo $* | grep keep\-chill > /dev/null ) ; then
-	keep_these_too="chillrt"
+	keep_these_too="chillrt test-chill"
 fi
 
+if ( echo $* | grep keep\-cygnus > /dev/null) ; then
+	keep_these_too="${keep_these_too} release release-info"
+fi
+
+
 # All files listed between the "Things-to-keep:" line and the
 # "Do-last:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
@@ -40,12 +45,14 @@ binutils
 build-all.mk
 byacc
 config
+config.guess
 config.sub
 configure
 configure.bat
 configure.in
 cvs
 deja-gnu
+dejagnu
 diff
 dvips
 emacs
@@ -62,7 +69,6 @@ glob
 gprof
 grep
 groff
-h8300sim
 include
 ispell
 ld
@@ -80,17 +86,20 @@ prms
 rcs
 readline
 sed
-send_pr
+send-pr
 shellutils
+sim
 tcl
 textutils
 tk
 test-build.mk
 texinfo
 tgas
+uudecode
 wdiff
 xiberty
-z8ksim
+
+Things-to-lose:
 
 # The lines between the "Do-last:" line and the end of the file
 # are executed as a /bin/sh shell script after everything else is
@@ -98,20 +107,32 @@ z8ksim
 
 Do-last:
 
-echo Looking for signs of \"v9\"...
+if ( echo $* | egrep verbose > /dev/null ) ; then
+	verbose=true
+else
+	verbose=
+fi
+
+if [ -n "${verbose}" ] ; then
+	echo Looking for signs of \"v9\"...
+fi
 
 # Don't try to clean directories here, as the 'mv' command will fail.
 # Also, grep fails on NFS mounted directories.
 if ( echo $* | grep keep\-v9 > /dev/null ) ; then
 	for i in * ; do
 		if test ! -d $i && (grep sanitize-v9 $i > /dev/null) ; then
-			echo Keeping v9 stuff in $i
+			if [ -n "${verbose}" ] ; then
+				echo Keeping v9 stuff in $i
+			fi
 		fi
 	done
 else
 	for i in * ; do
 		if test ! -d $i && (grep sanitize-v9 $i > /dev/null) ; then
-			echo Cleaning the \"v9\" out of $i...
+			if [ -n "${verbose}" ] ; then
+				echo Cleaning the \"v9\" out of $i...
+			fi
 			cp $i new
 			sed '/start\-sanitize\-v9/,/end-\sanitize\-v9/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
@@ -122,58 +143,42 @@ else
 	done
 fi
 
-echo Thawing away the \"chill\"...
+if [ -n "${verbose}" ] ; then
+	echo Thawing away the \"chill\"...
+fi
 
 # Don't try to clean directories here, as the 'mv' command will fail.
 # Also, grep fails on NFS mounted directories.
 if ( echo $* | grep keep\-chill > /dev/null ) ; then
 	for i in * ; do
 		if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then
-			echo Keeping chill stuff in $i
+			if [ -n "${verbose}" ] ; then
+				echo Keeping chill stuff in $i
+			fi
 		fi
 	done
 else
 	for i in * ; do
 		if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then
-			echo Thawing the \"chill\" out of $i...
+			if [ -n "${verbose}" ] ; then
+				echo Thawing the \"chill\" out of $i...
+			fi
 			cp $i new
 			sed '/start\-sanitize\-chill/,/end-\sanitize\-chill/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
-				echo Caching $i in .Recover...
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
 				mv $i .Recover
 			fi
 			mv new $i
 		fi
 	done
-	echo Thawing more \"chill\" out of Makefile.in...
-	cp Makefile.in new
-	sed -e 's/ chillrt / /g' \
-	    -e 's/newlib, chillrt/newlib/g' \
-	    -e 's/ all-chillrt / /g' \
-	    -e '/^[ 	]*install-chillrt[ 	]*\\$/d' \
-	    -e 's/ install-chillrt / /g' \
-	    -e 's/newlib \| chillrt/newlib/g' \
-	    -e 's/install-man install-libchill install-librmt/install-man/g' \
-	    < Makefile.in > new
-	if [ -n "${safe}" -a ! -f .Recover/Makefile.in ] ; then
-		echo Caching Makefile.in in .Recover...
-		mv Makefile.in .Recover
-	fi
-	mv new Makefile.in
-	echo Thawing the \"chill\" out of configure.in...
-	cp configure.in new
-	sed -e 's/ chillrt / /g' \
-	    < configure.in > new
-	if [ -n "${safe}" -a ! -f .Recover/configure.in ] ; then
-		echo Caching configure.in in .Recover...
-		mv configure.in .Recover
-	fi
-	mv new configure.in
 fi
 
 for i in * ; do
 	if test ! -d $i && (grep sanitize $i > /dev/null) ; then
-		echo Some mentions of Sanitize are still left in $i!
+		echo '***' Some mentions of Sanitize are still left in $i! 1>&2
 	fi
 done