X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=.Sanitize;h=15033a15e23a8c0a257b5671cf867297ffcc1eac;hb=1f302a3bd9dbeacd407ba6e454db1f72c5bb3ba4;hp=5de585dd1f59e7b6f960748ab2076990b318a75d;hpb=80cad9ccad693bf4d0293b2011800c2048714c4a;p=deliverable%2Fbinutils-gdb.git

diff --git a/.Sanitize b/.Sanitize
index 5de585dd1f..15033a15e2 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -1,6 +1,37 @@
+########################
+#
+#	 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
+# "cvs co gcc" won't get it), then don't, Don't, DON'T add it to the regular
+# things-to-keep or things-to-lose sections.  Instead, add it to the setting
+# of keep_these_too or lose_these_too before those variables are rescanned
+# to check for the existence of the items listed in them.
+#
+# Otherwise, somebody will check out some package that doesn't include your
+# 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 it's way into a release will need a file
+# 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
 # in the tree will be processed, top down, in the following order.
@@ -15,18 +46,97 @@
 
 Do-first:
 
-if ( echo $* | grep keep\-chill > /dev/null ) ; then
-	keep_these_too="chillrt test-chill"
+keep_these_too="${keep_these_too} .cvsignore CYGNUS autoconf
+	apache bash 
+	bfd binutils byacc cvs deja-gnu dejagnu diff dosrel dvips emacs emacs19
+	examples expect fileutils findutils flex
+	gas gawk gcc gdb gdbm gdbtest glob gprof grep grez groff guile gzip
+	include inet install-sh ispell
+	ld less libg++ libgcc libgloss libiberty libio librx libstdc++
+	m4 make mkinstalldirs mmalloc move-if-change newlib ncurses opcodes
+	pagas patch perl prms
+	rcs readline sed send-pr shellutils sim tar textutils time
+	texinfo tgas utils uudecode wdiff xiberty
+	configure.bat makeall.bat setup.com makefile.vms winsup
+	mpw-README mpw-configure mpw-config.in mpw-build.in mpw-install
+	ltconfig ltmain.sh missing ylwrap"
+
+lose_these_too="${lose_these_too} testsuite"
+
+cygnus_files="release release-info build-all.mk test-build.mk COPYING.NEWLIB"
+
+if ( echo $* | grep keep\-cygnus > /dev/null) ; then
+	keep_these_too="${keep_these_too} ${cygnus_files}"
 else
-	lose_these_too="chillrt test-chill"
+	lose_these_too="${lose_these_too} ${cygnus_files}"
 fi
 
-if ( echo $* | grep keep\-cygnus > /dev/null) ; then
-	keep_these_too="${keep_these_too} release release-info"
+gdbtk_files="tcl tk itcl tix"
+
+if ( echo $* | grep lose\-gdbtk > /dev/null) ; then
+	lose_these_too="${lose_these_too} ${gdbtk_files}"
+	if [ -n "${verbose}" ] ; then
+		echo Deleting ${gdbtk_files}
+	fi
+else
+	keep_these_too="${keep_these_too} ${gdbtk_files}"
+	if [ -n "${verbose}" ] ; then
+		echo Keeping ${gdbtk_files}
+	fi
+fi
+
+# This is for newlib net releases.
+newlib_file="COPYING.NEWLIB"
+
+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} release release-info"
+	true; # Let keep-cygnus handle it.
 fi
 
+# IDK releases don't include files which only matter to CDK.
+inet_files="COPYING.LIB config config-ml.in etc symlink-tree"
+
+if (echo $* | grep keep\-inet > /dev/null); then
+	lose_these_too="${lose_these_too} ${inet_files}"
+else
+	keep_these_too="${keep_these_too} ${inet_files}"
+fi
+
+ide_files="itcl libide vmake"
+
+if (echo $* | grep keep\-ide > /dev/null); then
+	keep_these_too="${keep_these_too} ${ide_files}"
+	test -n "$verbose" && echo Keeping ${ide_files}
+else
+	lose_these_too="${lose_these_too} ${ide_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
+# check out just gets obnoxious.
+
+list="`(for i in ${keep_these_too}; do echo $i ; done) | sort -u`"
+keep_these_too=
+
+for file in $list ; do
+	if [ -r $file ] || [ -d $file ] ; then
+		keep_these_too="${keep_these_too} $file"
+	fi
+done
+
+list="`(for i in ${lose_these_too}; do echo $i ; done) | sort -u` "
+lose_these_too=
+
+for file in $list ; do
+	if [ -r $file ] || [ -d $file ] ; then
+		lose_these_too="${lose_these_too} $file"
+	fi
+done
 
 # All files listed between the "Things-to-keep:" line and the
 # "Do-last:" line will be kept.  All other files will be removed.
@@ -36,74 +146,14 @@ fi
 
 Things-to-keep:
 
-.cvsignore
 COPYING
-COPYING.LIB
-CYGNUS
 ChangeLog
 Makefile.in
 README
-autoconf
-bfd
-binutils
-build-all.mk
-byacc
-config
 config.guess
 config.sub
 configure
-configure.bat
 configure.in
-cvs
-deja-gnu
-dejagnu
-diff
-dvips
-emacs
-etc
-expect
-fileutils
-flex
-gas
-gcc
-gdb
-gdbm
-gdbtest
-glob
-gprof
-grep
-groff
-include
-install.sh
-ispell
-ld
-libg++
-libgcc
-libiberty
-libio
-m4
-make
-mmalloc
-move-if-change
-newlib
-opcodes
-patch
-prms
-rcs
-readline
-sed
-send-pr
-shellutils
-sim
-tcl
-textutils
-tk
-test-build.mk
-texinfo
-tgas
-uudecode
-wdiff
-xiberty
 
 Things-to-lose:
 
@@ -113,35 +163,50 @@ Things-to-lose:
 
 Do-last:
 
+# Don't try to clean directories here, as the 'mv' command will fail.
+# Also, grep fails on NFS mounted directories.
+
 if ( echo $* | egrep verbose > /dev/null ) ; then
 	verbose=true
 else
 	verbose=
 fi
 
+# Remove "sanitize-Sanitize" lines.
 if [ -n "${verbose}" ] ; then
-	echo Looking for signs of \"v9\"...
+	echo Cleaning unconditional sanitizations out of Makefile.in...
+fi
+cp Makefile.in new
+sed '/start\-sanitize\-Sanitize/,/end-\sanitize\-Sanitize/d' < Makefile.in > new
+if [ -n "${safe}" -a ! -f .Recover/Makefile.in ] ; then
+	mv Makefile.in .Recover
 fi
+mv new Makefile.in
 
-# 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
+if [ -n "${verbose}" ] ; then
+	echo Thawing away the \"chill\"...
+fi
+
+if ( echo $* | grep keep\-chill > /dev/null ) ; then
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-v9 $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping v9 stuff in $i
+				echo Keeping chill stuff in $i
 			fi
 		fi
 	done
 else
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-v9 $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Cleaning the \"v9\" out of $i...
+				echo Thawing the \"chill\" out of $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-v9/,/end-\sanitize\-v9/d' < $i > new
+			sed '/start\-sanitize\-chill/,/end-\sanitize\-chill/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
@@ -150,27 +215,112 @@ else
 fi
 
 if [ -n "${verbose}" ] ; then
-	echo Thawing away the \"chill\"...
+	echo Processing \"d30v\"...
 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
+d30v_files="ChangeLog config.sub configure.in"
+
+if ( echo $* | grep keep\-d30v > /dev/null ) ; then
+	for i in $d30v_files ; do
+		if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping d30v stuff in $i
+			fi
+		fi
+	done
+else
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping chill stuff in $i
+				echo Removing traces of \"d30v\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-d30v/,/end-\sanitize\-d30v/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
+
+if [ -n "${verbose}" ] ; then
+	echo Processing \"v850\"...
+fi
+
+v850_files="ChangeLog config.sub configure.in"
+
+if ( echo $* | grep keep\-v850 > /dev/null ) ; then
+	for i in $v850_files ; do
+		if test ! -d $i && (grep sanitize-v850 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping v850 stuff in $i
 			fi
 		fi
 	done
 else
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-v850 $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Thawing the \"chill\" out of $i...
+				echo Removing traces of \"v850\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-chill/,/end-\sanitize\-chill/d' < $i > new
+			sed '/start\-sanitize\-v850/,/end-\sanitize\-v850/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
+if ( echo $* | grep keep\-v850e > /dev/null ) ; then
+	for i in $v850_files ; do
+		if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping v850e stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"v850e\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-v850e/,/end-\sanitize\-v850e/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
+if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
+	for i in $v850_files ; do
+		if test ! -d $i && (grep sanitize-v850eq $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping v850eq stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-v850eq $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"v850eq\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-v850eq/,/end-\sanitize\-v850eq/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -182,35 +332,139 @@ else
 	done
 fi
 
-if ( echo $* | grep for\-fsf > /dev/null ) ; then
-	if [ -n "${verbose}" ]; then
-		echo Cleaning up configure.in for FSF release...
-	fi
-	sed '/start\-sanitize\-for\-fsf/,/end\-sanitize\-for\-fsf/d' < configure.in > new
-	if [ -n "${safe}" -a ! -f .Recover/$i ]; then
-		if [ -n "${verbose}" ]; then
-			echo Caching configure.in in .Recover...
+r5900_files="ChangeLog config.sub configure.in"
+
+if ( echo $* | grep keep\-r5900 > /dev/null ) ; then
+	for i in $r5900_files ; do
+		if test ! -d $i && (grep sanitize-r5900 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping r5900 stuff in $i
+			fi
 		fi
-		mv configure.in .Recover
-	fi
-	mv new configure.in
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-r5900 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"r5900\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-r5900/,/end-\sanitize\-r5900/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
+
+tic80_files="ChangeLog config.sub configure.in"
+
+if ( echo $* | grep keep\-tic80 > /dev/null ) ; then
+	for i in $tic80_files ; do
+		if test ! -d $i && (grep sanitize-tic80 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping tic80 stuff in $i
+			fi
+		fi
+	done
 else
-	if [ -n "${verbose}" ]; then
-		echo Removing sanitize-for-fsf markers from configure.in...
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-tic80 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"tic80\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-tic80/,/end-\sanitize\-tic80/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
+
+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 gm stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-gm $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"gm\" from $i...
+			fi
+			cp $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...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
+if ( echo $* | grep keep\-ide > /dev/null ) ; then
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-ide $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping ide stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-ide $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"ide\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-ide/,/end-\sanitize\-ide/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
+
+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
-	grep -v sanitize-for-fsf < configure.in > new
-	if [ -n "${safe}" ]; then
-		if [ -n "${verbose}" ]; then
-			echo Caching configure.in in .Recover...
+	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 configure.in .Recover
+		mv Makefile.in .Recover
 	fi
-	mv new configure.in
+	mv new Makefile.in
 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