Sanitize out gdbtk references unless keep-gdbtk specified

4 files changed, 93 insertions, 10 deletions

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index d707964..68e5c85 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -29,6 +29,20 @@ else
 	fi
 fi
 
+gdbtk_files="gdbtk.c gdbtk.tcl"
+
+if ( echo $* | grep keep\-gdbtk > /dev/null ) ; then
+	keep_these_too="${gdbtk_files} ${keep_these_too}"
+	if [ -n "${verbose}" ] ; then
+		echo Keeping ${gdbtk_files}
+	fi
+else
+	lose_these_too="${gdbtk_files} ${lose_these_too}"
+	if [ -n "${verbose}" ] ; then
+		echo Deleting ${gdbtk_files}
+	fi
+fi
+
 # All files listed between the "Things-to-keep:" line and the
 # "Files-to-sed:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
@@ -131,8 +145,6 @@ gdba.el
 gdbcmd.h
 gdbcore.h
 gdbserver
-gdbtk.c
-gdbtk.tcl
 gdbtypes.c
 gdbtypes.h
 go32-xdep.c
@@ -366,7 +378,32 @@ else
 	done
 fi
 
-r16_files = "configure.in"
+echo Catering to RMS by removing traces of \"gdbtk\"...
+
+# Don't try to clean directories here, as the 'mv' command will fail.
+# Also, grep fails on NFS mounted directories.
+if ( echo $* | grep keep\-gdbtk > /dev/null ) ; then
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-gdbtk $i > /dev/null) ; then
+			echo Keeping gdbtk stuff in $i
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-gdbtk $i > /dev/null) ; then
+			echo Removing traces of \"gdbtk\" out of $i...
+			cp $i new
+			sed '/start\-sanitize\-gdbtk/,/end-\sanitize\-gdbtk/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				echo Caching $i in .Recover...
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
+r16_files="configure.in"
 
 if ( echo $* | grep keep\-r16 > /dev/null ) ; then
 	for i in $r16_files ; do
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1e4505b..97f3045 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -92,8 +92,10 @@ Fri Dec 23 17:03:13 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
 Fri Dec 23 16:18:50 1994  Stu Grossman  (grossman@cygnus.com)
 
 	* Makefile.in (CLIBS):  Put LIBIBERTY last.
+start-sanitize-gdbtk
 	* gdbtk.c (gdbtk_wait gdbtk_init):  Portability improvements for
 	SIGIO handling.
+end-sanitize-gdbtk
 
 Thu Dec 22 09:27:16 1994  Jim Kingdon  <kingdon@deneb.cygnus.com>
 
@@ -112,7 +114,7 @@ Wed Dec 21 14:00:26 1994  Rob Savoye  <rob@darkstar.cygnus.com>
 Tue Dec 20 23:01:17 1994  Stu Grossman  (grossman@cygnus.com)
 
 	* config/mips/xm-irix4.h, config/mips/xm-irix5.h:  #define
-	_BSD_COMPAT to get reliable signal handling (needed for GDBtk).
+	_BSD_COMPAT to get reliable signal handling.
 
 Tue Dec 20 11:44:28 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
@@ -122,6 +124,7 @@ Tue Dec 20 11:44:28 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 	* value.h: Remove obsolete comments about FRAME vs struct
 	frame_info *.
 
+start-sanitize-gdbtk
 Mon Dec 19 09:55:47 1994  Stu Grossman  (grossman@cygnus.com)
 
 	* gdbtk.tcl (update_assembly):  Force update to make sure that pc
@@ -159,6 +162,7 @@ Sun Dec 18 23:31:20 1994  Stu Grossman  (grossman@cygnus.com)
 	* (create_source_window):  Add source file selection to View menu.
 	* (create_command_window (<Key-Return> binding):  Quote text fed
 	into gdb_cmd to prevent eval errors.
+end-sanitize-gdbtk
 
 Sun Dec 18 11:52:58 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
@@ -247,20 +251,23 @@ Thu Dec 15 16:55:35 1994  Stan Shebs  <shebs@andros.cygnus.com>
 
 Thu Dec 15 16:40:10 1994  Stu Grossman  (grossman@cygnus.com)
 
-	* defs.h, gdbtk.c (gdbtk_fputs), main.c (gdb_fputs), top.c: Add
-	stream arg to fputs_unfiltered_hook.  Differentiate stdout from
-	stderr when passing text into tcl land.
+	* defs.h, main.c (gdb_fputs), top.c: Add stream arg to
+	fputs_unfiltered_hook.
 	* defs.h, top.c, utils.c (error): Add error_hook.
+start-sanitize-gdbtk
 	* gdbtk.c: Improve mechanism for capturing output values.
 	(full_filename): Remove.
 	(gdb_cmd call_wrapper gdbtk_init): Protect all calls from tcl land
 	with call_wrapper.  This prevents longjmps (usually via error())
 	from jumping out of tcl/tk and leaving things in an indeterminate
 	state.
+	(gdbtk_fputs): Differentiate stdout from stderr when passing text
+	into tcl land.
 	* gdbtk.tcl: New view option to disable line numbers.  Put catch
 	around most uses of gdb_cmd.  Add update button to reg config
 	window.  Stop doing immediate updates when selecting registers.
 	Change register view values into checkbuttons.
+end-sanitize-gdbtk
 
 Tue Dec 13 15:15:33 1994  Stan Shebs  <shebs@andros.cygnus.com>
 
@@ -281,6 +288,7 @@ Mon Dec 12 17:08:02 1994  Stan Shebs  <shebs@andros.cygnus.com>
 	(INIT_EXTRA_FRAME_INFO): Call sparc_init_extra_frame_info.
 	(PRINT_EXTRA_FRAME_INFO): Define.
 
+start-sanitize-gdbtk
 Mon Dec 12 16:59:29 1994  Stu Grossman  (grossman@cygnus.com)
 
 	* gdbtk.tcl (reg_config_menu create_registers_window
@@ -288,6 +296,7 @@ Mon Dec 12 16:59:29 1994  Stu Grossman  (grossman@cygnus.com)
 	for register display list.
 	* (recompute_reg_display_list update_registers):  Fix bug with not
 	displaying all registers.
+end-sanitize-gdbtk
 
 Mon Dec 12 13:06:59 1994  Jim Kingdon  <kingdon@deneb.cygnus.com>
 
@@ -299,6 +308,7 @@ Mon Dec 12 13:06:59 1994  Jim Kingdon  <kingdon@deneb.cygnus.com>
 	not OBJ_UNWIND_INFO.  Assigning to a cast is a GCC-ism which
 	the HP compiler doesn't like.
 
+start-sanitize-gdbtk
 Mon Dec 12 12:22:21 1994  Stu Grossman  (grossman@cygnus.com)
 
 	* gdbtk.c:  New tcl commands:  gdb_fetch_registers,
@@ -313,6 +323,7 @@ Mon Dec 12 12:22:21 1994  Stu Grossman  (grossman@cygnus.com)
 	populate_reg_window update_registers):  Revamp register window.
 	Allow selection of registers to be displayed.  Highlight changed
 	registers.
+end-sanitize-gdbtk
 
 Fri Dec  9 15:50:05 1994  Stan Shebs  <shebs@andros.cygnus.com>
 
@@ -431,6 +442,7 @@ Mon Nov 28 11:03:14 1994  J.T. Conklin  (jtc@rtl.cygnus.com)
 	* config/rs6000/tm-rs6000.h (setpgrp): move defn from here...
 	* config/rs6000/xm-rs6000.h: ...to here.
 
+start-sanitize-gdbtk
 Mon Nov 28 09:17:20 1994  Stu Grossman  (grossman@cygnus.com)
 
 	* gdbtk.tcl (build_framework):  Fix bug with setting window titles.
@@ -439,6 +451,7 @@ Mon Nov 28 09:17:20 1994  Stu Grossman  (grossman@cygnus.com)
 
 	* gdbtk.tcl:  Re-arrange windows using new, consistent layout. Clean
 	up lots of code and centralize framework initialization.
+end-sanitize-gdbtk
 
 Fri Nov 25 21:26:02 1994  Jeff Law  (law@snake.cs.utah.edu)
 
@@ -572,7 +585,9 @@ Wed Nov 16 16:41:52 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
 Wed Nov 16 15:28:29 1994  Rob Savoye  (rob@cygnus.com)
 
+start-sanitize-gdbtk
 	* Makefile.in: Fix the test for installing gdbtk.
+end-sanitize-gdbtk
 
 	* hppa-tdep.c: Remove including sys/dir.h from a target file.
 
@@ -606,12 +621,14 @@ Tue Nov 15 01:03:56 1994  Rob Savoye  (rob@slipknot.cygnus.com)
 	to set remote load type and protocol.
 	* rom68k-rom.c: Add to_stop in target_ops.
 
+start-sanitize-gdbtk
 Mon Nov 14 08:51:29 1994  Stu Grossman  (grossman@cygnus.com)
 
 	* Makefile.in:  Install gdbtk.tcl.
 	* configure.in:  Add ENABLE_GDBTK flag.
 	* gdbtk.c (gdb_sourcelines):  Returns list of source lines
 	containing code.  (gdb_regnames):  Returns list of register names.
+end-sanitize-gdbtk
 
 Sat Nov 12 21:55:47 1994  Jeff Law  (law@snake.cs.utah.edu)
 
@@ -769,7 +786,7 @@ Thu Nov  3 15:19:17 1994  Stan Shebs  (shebs@andros.cygnus.com)
 	* frame.h (FRAME, FRAME_INFO_ID, FRAME_ADDR): Remove.
 	* blockframe.c (get_frame_info): Remove.
 	* a29k-tdep.c, alpha-tdep.c, blockframe.c, breakpoint.c,
-	breakpoint.h, energize.c, findvar.c, gdbtk.c, gould-pinsn.c,
+	breakpoint.h, energize.c, findvar.c, gould-pinsn.c,
 	h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, i386-tdep.c, i960-tdep.c,
 	infcmd.c, inferior.h, infrun.c, m68k-tdep.c, m88k-tdep.c,
 	mips-tdep.c, nindy-tdep.c, printcmd.c, pyr-tdep.c, rs6000-tdep.c,
@@ -792,7 +809,9 @@ Thu Nov  3 14:25:24 1994  Stu Grossman  (grossman@cygnus.com)
 	remote-nindy.c, remote-os9k.c, remote-pa.c, remote-sim.c,
 	remote-st.c, remote-udi.c, remote-vx.c, remote-z8k.c, remote.c,
 	w89k-rom.c, target.c, target.h:  Add support for target_stop().
+start-sanitize-gdbtk
 	* gdbtk.c (gdb_stop):  Switch to target_stop().
+end-sanitize-gdbtk
 
 Thu Nov  3 01:23:45 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
@@ -813,6 +832,7 @@ Wed Nov  2 11:01:55 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
 
 	* nlm/Makefile.in: install gdbserve.nlm.
 
+start-sanitize-gdbtk
 Tue Nov  1 16:41:12 1994  Stu Grossman  (grossman@cygnus.com)
 
 	* Makefile.in:  Use $(objdir)/tcl and $(objdir)/tk if they are
@@ -823,6 +843,7 @@ Tue Nov  1 16:41:12 1994  Stu Grossman  (grossman@cygnus.com)
 	* (gdbtk_init):  Use ConnectionNumber macro instead of referencing
 	Display structure directly.
 	* gdbtk.tcl:  Change exit button to quit button.
+end-sanitize-gdbtk
 
 Tue Nov  1 13:00:46 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
@@ -892,9 +913,12 @@ Fri Oct 28 16:16:52 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
 Wed Oct 26 15:41:07 1994  Stu Grossman  (grossman@cygnus.com)
 
-	* defs.h, gdbtk.c, main.c, top.c:  Change sense and name of
+	* defs.h, main.c, top.c:  Change sense and name of
 	no_windows variable.  Now called use_windows, and defaults to off
 	(for compatibility).
+start-sanitize-gdbtk
+	* gdbtk.c: Ditto.
+end-sanitize-gdbtk
 
 Wed Oct 26 12:20:53 1994  Jim Kingdon  <kingdon@cygnus.com>
 
@@ -923,6 +947,7 @@ Thu Oct 20 17:35:45 1994  Stu Grossman  (grossman@cygnus.com)
 	target_wait_hook to allow GUI to handle blocking for inferior.  Call
 	call_command_hook in execute_command to provide means for wrapping
 	commands with GUI state change updates.
+start-sanitize-gdbtk
 	* gdbtk.c (gdb_cmd):  Force GUI into idle mode when errors occur.
 	* (gdb_stop):  New tcl command to stop the target process.
 	* (x_event, gdbtk_wait):  Allow GUI to interrupt gdb out of target
@@ -940,9 +965,10 @@ Thu Oct 20 17:35:45 1994  Stu Grossman  (grossman@cygnus.com)
 	* Change bindings of mouse button 1 in assembly and source window
 	to just set or clear breakpoints when in the margin tag.
 	* Change shape of register window to be more vertical to better
-	reflect it's contents.
+	reflect its contents.
 	* Add stop button.
 	* Cleanup some code around command window bindings.
+end-sanitize-gdbtk
 
 	* infrun.c (wait_for_inferior):  Make sure
 	through_sigtramp_breakpoint is non-null before deleting.
@@ -1523,9 +1549,11 @@ Mon Sep 19 07:48:36 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 	char * (from const char *) before assigning.  Don't save string we
 	pass to record_minimal_symbol (it already saves it).
 
+start-sanitize-gdbtk
 Sat Sep 17 17:05:14 1994  Stu Grossman  (grossman@cygnus.com)
 
 	* gdbtk.tcl:  Let ^U delete lines in the command window.
+end-sanitize-gdbtk
 
 Sat Sep 17 02:26:58 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
@@ -1575,6 +1603,7 @@ Fri Sep 16 15:40:34 1994  Stu Grossman  (grossman@cygnus.com)
 
 	* defs.h (QUIT):  Call interactive_hook to allow GUI to interrupt.
 	Also, add decl for symtab_to_filename.
+start-sanitize-gdbtk
 	* gdbtk.c:  Replace calls to full_filename with symtab_to_filename.  
 	* gdbtk.tcl:  New routine pc_to_line replaces in line code.  New
 	routine decr replaces in line code.
@@ -1586,6 +1615,7 @@ Fri Sep 16 15:40:34 1994  Stu Grossman  (grossman@cygnus.com)
 	on PC instead of function name, since function names can be
 	ambiguous (usually seen with shared libs).  Also, use catch to
 	simplify code where we don't care about failures.
+end-sanitize-gdbtk
 	* source.c (symtab_to_filename):  New.  Returns the file
 	associated with a symtab.
 	* top.c:  Define interactive_hook.  Called during QUIT to animate
@@ -1632,6 +1662,7 @@ Wed Sep 14 14:26:21 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 	Having the objfile point to bfd_asymbol_name directly doesn't work
 	if we save and restore a mapped symbol file.
 
+start-sanitize-gdbtk
 Wed Sep 14 00:55:26 1994  Stu Grossman  (grossman@cygnus.com)
 
 	* gdbtk.tcl:  Add ref counts to breakpoint tags.
@@ -1642,6 +1673,7 @@ Wed Sep 14 00:55:26 1994  Stu Grossman  (grossman@cygnus.com)
 	* Set names of top-level windows.
 	* Add register display window.
 	* Add PC to label of assembly window.
+end-sanitize-gdbtk
 
 Tue Sep 13 18:23:26 1994  Rob Savoye  (rob@darkstar.cygnus.com)
 
@@ -1649,6 +1681,7 @@ Tue Sep 13 18:23:26 1994  Rob Savoye  (rob@darkstar.cygnus.com)
 	to add a generic ROM monitor interface, and support file for the
 	WinBond W89K and the Oki OP50N PA based target boards.
 
+start-sanitize-gdbtk
 Tue Sep 13 08:59:04 1994  Stu Grossman  (grossman@cygnus.com)
 
 	* gdbtk.c (gdbtk_flush gdbtk_fputs):  Buffer up output to make
@@ -1666,6 +1699,7 @@ Tue Sep 13 08:59:04 1994  Stu Grossman  (grossman@cygnus.com)
 	* Add assembly window, and breapoint support.
 	* Make button 1 in margin toggle breakpoints.
 	* Use stippling to indicate breakpoint disabling.
+end-sanitize-gdbtk
 
 Sun Sep 11 22:34:57 1994  Jeff Law  (law@snake.cs.utah.edu)
 
@@ -1793,9 +1827,11 @@ Sun Sep  4 16:06:34 1994  Stan Shebs  (shebs@andros.cygnus.com)
 	* config/mips/nm-sysv4.h: New file, includes config/nm-sysv4.h.
 	* config/sparc/nm-sysv4.h: New file, includes config/nm-sysv4.h.
 
+start-sanitize-gdbtk
 Fri Sep  2 19:11:40 1994  Stu Grossman  (grossman@cygnus.com)
 
 	* configure.in: Don't symlink to gdbtk.tcl if it's already there.
+end-sanitize-gdbtk
 
 Fri Sep  2 17:35:55 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
 
@@ -2449,11 +2485,13 @@ Thu Jul 28 14:37:36 1994  Stu Grossman  (grossman@cygnus.com)
 	* Change _initialize_utils to initialize_utils cuz we don't use
 	automatic initialization of utils.c anymore.
 
+start-sanitize-gdbtk
 	* Support for TK GUI.
 	* Makefile.in:  Add rule for gdbtk.o.
 	* configure.in:  Add support for --enable-gdbtk.
 	* gdbtk.c:  New file.  Contains support routines for TK interface.
 	* gdbtk.tcl:  New file.  Implements GUI policy.
+end-sanitize-gdbtk
 
 	* remote.c:  Get rid of #ifdef DONT_USE_REMOTE.  It's no longer
 	necessary.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 782ee45..1917703 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -513,9 +513,11 @@ install-only:
 	fi ; \
 	$(INSTALL_PROGRAM) gdb $(bindir)/$$transformed_name ; \
 	$(INSTALL_DATA) $(srcdir)/gdb.1 $(man1dir)/$$transformed_name.1
+	# start-sanitize-gdbtk
 	if [ x"$(ENABLE_GDBTK)" != x ] ; then \
 		$(INSTALL_DATA) $(srcdir)/gdbtk.tcl $(libdir)/gdbtk.tcl ; \
 	fi
+	# end-sanitize-gdbtk
 	@$(MAKE) DO=install "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do 
 
 uninstall: force
@@ -1103,10 +1105,12 @@ findvar.o: findvar.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h
 fork-child.o: fork-child.c $(wait_h) $(defs_h) $(gdbcore_h) \
 	$(inferior_h) target.h terminal.h thread.h
 
+# start-sanitize-gdbtk
 gdbtk.o: gdbtk.c $(defs_h) $(symtab_h) $(inferior_h) $(command_h) \
 	$(bfd_h) symfile.h objfiles.h target.h
 	$(CC) -c $(INTERNAL_CFLAGS) $(TCL_CFLAGS) $(TK_CFLAGS) $(srcdir)/gdbtk.c \
 		 -DGDBTK_FILENAME=\"$(libdir)/gdbtk.tcl\"
+# end-sanitize-gdbtk
 
 gdbtypes.o: gdbtypes.c $(bfd_h) complaints.h $(defs_h) $(expression_h) \
 	$(gdbtypes_h) language.h objfiles.h symfile.h $(symtab_h) target.h \
diff --git a/gdb/configure.in b/gdb/configure.in
index 29ee96f..0fed66c 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -398,11 +398,13 @@ else
 	links="${links} nm.h"
 fi
 
+# start-sanitize-gdbtk
 # Make it possible to use the GUI without doing a full install
 if [ "${enable_gdbtk}" = "yes" -a ! -f gdbtk.tcl ] ; then
 	files="${files} gdbtk.tcl"
 	links="${links} gdbtk.tcl"
 fi
+# end-sanitize-gdbtk
 
 # post-target:
 
@@ -420,6 +422,7 @@ if [ "${nativefile}" = "" ] ; then
 	mv -f Makefile.tem Makefile
 fi
 
+# start-sanitize-gdbtk
 if [ "${enable_gdbtk}" = "yes" ] ; then
 	sed -e '/# End of host and/i\
 \
@@ -429,6 +432,7 @@ ENABLE_CLIBS = $(TCL) $(TK) -lX11 -lm
 ' < Makefile > Makefile.tem
 	mv -f Makefile.tem Makefile
 fi
+# end-sanitize-gdbtk
 
 sed -e '/^TM_FILE[ 	]*=/s,^TM_FILE[ 	]*=[ 	]*,&config/'"${gdb_target_cpu}"'/,
 /^XM_FILE[ 	]*=/s,^XM_FILE[ 	]*=[ 	]*,&config/'"${gdb_host_cpu}"'/,