X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=.Sanitize;h=f8fad1edd1b38ec1b338a3ea786dddb89b403a64;hb=e44d14910c888008e3bc1aa5147a981d3b5b6dc8;hp=3cd8e7aa261747f3ccdfca5fc75538bc852dc322;hpb=694ea471a208cf6d260b130156b836582d09bde2;p=deliverable%2Fbinutils-gdb.git

diff --git a/.Sanitize b/.Sanitize
index 3cd8e7aa26..f8fad1edd1 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -1,6 +1,15 @@
-# .Sanitize for devo.
-
 ########################
+#
+#	 H    H  EEEEEE Y     Y  !!
+#	 H    H  E       Y   Y   !!
+#	 H    H  E        Y Y    !!
+#	 H    H  E         Y     !!
+#	 HHHHHH  EEEEE     Y     !!
+#	 H    H  E         Y     !!
+#	 H    H  E         Y     !!
+#	 H    H  E         Y
+#	 H    H  EEEEEE    Y     !!
+#
 # YO!  READ ME!!!!!!!!!
 # If you're about to add a file or directory which isn't checked out as part
 # of every module in devo (e.g., if "cvs co gas+utils" won't get it, or if
@@ -13,8 +22,15 @@
 # new file, and will get warnings from Sanitize when everything is really
 # okay.  You don't want to get people in the habit of ignoring complaints from
 # Sanitize, do you?  No, I didn't think so.
+#
+# If you do add a file to the regular things-to-keep section, don't forget
+# to add the corresponding entry to the devo-support entry (or whatever) in
+# the modules file.
+#
 ########################
 
+# .Sanitize for devo.
+
 # Each directory to survive its way into a release will need a file
 # like this one called "./.Sanitize".  All keyword lines must exist,
 # and must exist in the order specified by this file.  Each directory
@@ -32,12 +48,15 @@ Do-first:
 
 keep_these_too="${keep_these_too} .cvsignore CYGNUS autoconf
 	bfd binutils byacc cvs deja-gnu dejagnu diff dosrel dvips emacs emacs19
-	examples expect fileutils flex gas gcc gdb gdbm gdbtest glob gprof grep
-	groff include install.sh ispell ld libg++ libgcc libgloss libiberty
-	libio librx libstdc++ m4 make mmalloc move-if-change newlib opcodes
-	pagas patch prms rcs readline sed send-pr shellutils sim tcl textutils
-	tk texinfo tgas utils uudecode wdiff xiberty
-	configure.bat makeall.bat
+	examples expect fileutils flex
+	gas gcc gdb gdbm gdbtest glob gprof grep grez groff
+	include install.sh ispell
+	ld libg++ libgcc libgloss libiberty libio librx libstdc++
+	m4 make mmalloc move-if-change newlib opcodes
+	pagas patch prms rcs readline sed send-pr shellutils sim textutils
+	texinfo tgas utils uudecode wdiff xiberty
+	configure.bat makeall.bat winsup
+	guile perl
 	mpw-README mpw-configure mpw-config.in mpw-build.in"
 
 lose_these_too="${lose_these_too} testsuite"
@@ -65,12 +84,15 @@ else
 fi
 
 # This is for newlib net releases.
-newlib_files="COPYING.NEWLIB"
+newlib_file="COPYING.NEWLIB"
 
-if ( echo $* | grep keep\-newlib > /dev/null) ; then
-	keep_these_too="${keep_these_too} ${newlib_files}"
+if (echo $* | grep keep\-newlib > /dev/null) ; then
+	if (echo $* | grep -v keep\-cygnus > /dev/null) ; then
+		keep_these_too="${keep_these_too} ${newlib_file}"
+		lose_these_too="`echo ${lose_these_too} | sed -e s/${newlib_file}//`"
+	fi
 else
-	lose_these_too="${lose_these_too} ${newlib_files}"
+	true; # Let keep-cygnus handle it.
 fi
 
 # This top-level directory is special.  We often check out only subsets
@@ -109,11 +131,13 @@ ChangeLog
 Makefile.in
 README
 config
+config-ml.in
 config.guess
 config.sub
 configure
 configure.in
 etc
+symlink-tree
 
 Things-to-lose:
 
@@ -178,7 +202,7 @@ if [ -n "${verbose}" ] ; then
 	echo Processing \"arc\"...
 fi
 
-arc_files="config.sub configure.in"
+arc_files="config.sub configure.in config-ml.in"
 
 if ( echo $* | grep keep\-arc > /dev/null ) ; then
 	for i in $arc_files ; do
@@ -207,24 +231,24 @@ else
 	done
 fi
 
-psion_files="config.sub configure.in"
+rce_files="config.sub"
 
-if ( echo $* | grep keep\-psion > /dev/null ) ; then
-	for i in $psion_files; do
-		if test ! -d $i && (grep sanitize-psion $i > /dev/null) ; then
+if ( echo $* | grep keep\-rce > /dev/null ) ; then
+	for i in $rce_files ; do
+		if test ! -d $i && (grep sanitize-rce $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping psion stuff in $i
+				echo Keeping rce stuff in $i
 			fi
 		fi
 	done
 else
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-psion $i > /dev/null) ; then
+	for i in $rce_files ; do
+		if test ! -d $i && (grep sanitize-rce $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"psion\" from $i...
+				echo Removing traces of \"rce\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-psion/,/end-\sanitize\-psion/d' < $i > new
+			sed '/start\-sanitize\-rce/,/end-\sanitize\-rce/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -236,24 +260,38 @@ else
 	done
 fi
 
-rce_files="config.sub"
+if ( echo $* | grep lose\-gdbtk > /dev/null ) ; then
+	echo Catering to RMS by removing traces of \"gdbtk\"...
+	if [ -n "${verbose}" ] ; then
+		echo Removing traces of \"gdbtk\" from Makefile.in...
+	fi
+	cp Makefile.in new
+	sed -e '/GDBTK_SUPPORT_DIRS=/d' -e 's/ $(GDBTK_SUPPORT_DIRS)//' < Makefile.in > new
+	if [ -n "${safe}" -a ! -f .Recover/Makefile.in ] ; then
+		if [ -n "${verbose}" ] ; then
+			echo Caching Makefile.in in .Recover...
+		fi
+		mv Makefile.in .Recover
+	fi
+	mv new Makefile.in
+fi
 
-if ( echo $* | grep keep\-rce > /dev/null ) ; then
-	for i in $rce_files ; do
-		if test ! -d $i && (grep sanitize-rce $i > /dev/null) ; then
+if ( echo $* | grep keep\-gm > /dev/null ) ; then
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-gm $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping rce stuff in $i
+				echo Keeping gm stuff in $i
 			fi
 		fi
 	done
 else
-	for i in $rce_files ; do
-		if test ! -d $i && (grep sanitize-rce $i > /dev/null) ; then
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-gm $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"rce\" from $i...
+				echo Removing traces of \"gm\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-rce/,/end-\sanitize\-rce/d' < $i > new
+			sed '/start\-sanitize\-gm/,/end-\sanitize\-gm/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -265,9 +303,11 @@ else
 	done
 fi
 
+# Do this check LAST!
 for i in * ; do
 	if test ! -d $i && (grep sanitize $i > /dev/null) ; then
 		echo '***' Some mentions of Sanitize are still left in $i! 1>&2
+		exit 1
 	fi
 done