[patch 1/2] Make gdbtui a shell script

[patch 1/2] Make gdbtui a shell script

[Jan Kratochvil]

Hi,

it is discussed for years it is not great to have almost the same gdb and
gdbtui binaries, each ~5MB.  Make gdbtui a shell script.

I am not so sure how well is the shell script portable across Unices.
I assume MinGW is out of question anyway but that may not be a concern.

Fedora has been using gdb<->gdbtui hardlink but according to Tom argv[0]
should not be used.  GNU Coding Standards IMO do not say exactly this thing.


Thanks,
Jan


gdb/
2011-12-21  Jan Kratochvil  <jan.kratochvil@redhat.com>

	Replace gdbtui binary by a shell script.
	* Makefile.in (INSTALL_SCRIPT): New variable.
	(SUBDIR_TUI_OBS): Remove tui-main.o.
	(SUBDIR_TUI_SRCS): Remove tui/tui-main.c.
	(all-tui): Remove its $(TUI)$(EXEEXT) dependency.
	(install-tui): Change INSTALL_PROGRAM to INSTALL_SCRIPT, add .sh to
	source $(TUI) and remove $(EXEEXT) from the target.
	(uninstall-tui): Remove $(EXEEXT) from the target.
	($(TUI)$(EXEEXT)): Remove.
	(clean-tui): Remove its only recipe.
	(tui-main.o): Remove.
	(all_object_files): Remove tui-main.o.
	* gdbtui.sh: New file.
	* tui/tui-main.c: Remove.

--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -59,6 +59,7 @@ LN_S = @LN_S@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 DESTDIR =
 
@@ -237,7 +238,6 @@ SUBDIR_TUI_OBS = \
 	tui-io.o \
 	tui-layout.o \
 	tui-out.o \
-	tui-main.o \
 	tui-regs.o \
 	tui-source.o \
 	tui-stack.o \
@@ -256,7 +256,6 @@ SUBDIR_TUI_SRCS = \
 	tui/tui-interp.c \
 	tui/tui-io.c \
 	tui/tui-layout.c \
-	tui/tui-main.c \
 	tui/tui-out.c \
 	tui/tui-regs.c \
 	tui/tui-source.c \
@@ -961,7 +960,7 @@ generated_files = config.h observer.h observer.inc ada-lex.c jit-reader.h \
 all: gdb$(EXEEXT) $(CONFIG_ALL)
 	@$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=`echo $(SUBDIRS) | sed 's/testsuite//'`" subdir_do
 .PHONY: all-tui
-all-tui: $(TUI)$(EXEEXT)
+all-tui:
 
 installcheck:
 
@@ -1050,8 +1049,8 @@ install-tui:
 		  true ; \
 		fi ; \
 		$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) ; \
-		$(INSTALL_PROGRAM) $(TUI)$(EXEEXT) \
-			$(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) ; \
+		$(INSTALL_SCRIPT) $(TUI).sh \
+			$(DESTDIR)$(bindir)/$$transformed_name ; \
 		$(SHELL) $(srcdir)/../mkinstalldirs \
 			$(DESTDIR)$(man1dir) ; \
 		$(INSTALL_DATA) $(srcdir)/gdb.1 \
@@ -1080,7 +1079,7 @@ uninstall-tui:
 		else \
 		  true ; \
 		fi ; \
-		rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \
+		rm -f $(DESTDIR)$(bindir)/$$transformed_name \
 		      $(DESTDIR)$(man1dir)/$$transformed_name.1
 
 # The C++ name parser can be built standalone for testing.
@@ -1185,12 +1184,6 @@ gdb$(EXEEXT): gdb.o libgdb.a $(ADD_DEPS) $(CDEPS) $(TDEPLIBS)
 		-o gdb$(EXEEXT) gdb.o libgdb.a \
 		$(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES)
 
-$(TUI)$(EXEEXT): tui-main.o libgdb.a $(ADD_DEPS) $(CDEPS) $(TDEPLIBS)
-	rm -f $(TUI)$(EXEEXT)
-	$(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) \
-		-o $(TUI)$(EXEEXT) tui-main.o libgdb.a \
-		$(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES)
-
 # Convenience rule to handle recursion.
 $(LIBGNU) $(GNULIB_H): all-lib
 all-lib: gnulib/Makefile
@@ -1253,7 +1246,6 @@ clean mostlyclean: $(CONFIG_CLEAN)
 
 .PHONY: clean-tui
 clean-tui:
-	rm -f $(TUI)$(EXEEXT)
 
 # This used to depend on c-exp.c m2-exp.c TAGS
 # I believe this is wrong; the makefile standards for distclean just
@@ -2020,10 +2012,6 @@ tui-layout.o: $(srcdir)/tui/tui-layout.c
 	$(COMPILE) $(srcdir)/tui/tui-layout.c
 	$(POSTCOMPILE)
 
-tui-main.o: $(srcdir)/tui/tui-main.c
-	$(COMPILE) $(srcdir)/tui/tui-main.c
-	$(POSTCOMPILE)
-
 tui-out.o: $(srcdir)/tui/tui-out.c
 	$(COMPILE) $(srcdir)/tui/tui-out.c
 	$(POSTCOMPILE)
@@ -2205,7 +2193,7 @@ py-value.o: $(srcdir)/python/py-value.c
 
 # A list of all the objects we might care about in this build, for
 # dependency tracking.
-all_object_files = gdb.o tui-main.o $(LIBGDB_OBS) gdbtk-main.o \
+all_object_files = gdb.o $(LIBGDB_OBS) gdbtk-main.o \
 	test-cp-name-parser.o
 
 # Ensure that generated files are created early.  Use order-only
--- /dev/null
+++ b/gdb/gdbtui.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if [ "${0%/*}" != "$0" ]
+then
+  exec "${0%/*}/gdb" --tui "$@"
+else
+  exec gdb --tui "$@"
+fi
--- a/gdb/tui/tui-main.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Main function for TUI gdb.
-
-   Copyright (C) 2002, 2004, 2007, 2008, 2009, 2010, 2011
-   Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include "defs.h"
-#include "main.h"
-#include "gdb_string.h"
-#include "interps.h"
-
-int
-main (int argc, char **argv)
-{
-  struct captured_main_args args;
-
-  memset (&args, 0, sizeof args);
-  args.argc = argc;
-  args.argv = argv;
-  args.use_windows = 0;
-  args.interpreter_p = INTERP_TUI;
-  return gdb_main (&args);
-}

Re: [patch 1/2] Make gdbtui a shell script

[Joel Brobecker]

> it is discussed for years it is not great to have almost the same gdb and
> gdbtui binaries, each ~5MB.  Make gdbtui a shell script.
> 
> I am not so sure how well is the shell script portable across Unices.
> I assume MinGW is out of question anyway but that may not be a concern.

How about not providing gdbtui at all, not even a shell script?
Hmmm, maybe a little extreme?

On the other hand, would it work if the script was called from
a MinGW shell as well? I am pretty sure it'd work on cygwin
platforms, and maybe it would be the same with MinGW shells?

(I haven't looked at the patch yet).

> Fedora has been using gdb<->gdbtui hardlink but according to Tom
> argv[0] should not be used.  GNU Coding Standards IMO do not say
> exactly this thing.

I remember reading the same as Tom, but that was a while ago.

-- 
Joel

Re: [patch 1/2] Make gdbtui a shell script

[Jan Kratochvil]

On Wed, 21 Dec 2011 13:23:30 +0100, Joel Brobecker wrote:
> How about not providing gdbtui at all, not even a shell script?

I am for it, `gdbtui' does not bring any more convenience than `gdb -tui'.

I will update the patch if there are no other opinions.


Thanks,
Jan

RE: [patch 1/2] Make gdbtui a shell script

[Pierre Muller]

> -----Message d'origine-----
> De : gdb-patches-owner@sourceware.org [mailto:gdb-patches-
> owner@sourceware.org] De la part de Jan Kratochvil
> Envoyé : mercredi 21 décembre 2011 15:23
> À : Joel Brobecker
> Cc : gdb-patches@sourceware.org; Sergio Durigan; Kai Tietz
> Objet : Re: [patch 1/2] Make gdbtui a shell script
> 
> On Wed, 21 Dec 2011 13:23:30 +0100, Joel Brobecker wrote:
> > How about not providing gdbtui at all, not even a shell script?
> 
> I am for it, `gdbtui' does not bring any more convenience than `gdb -tui'.

  Remember that some targets (like DJGPP)
have no symbolic links...
 
> I will update the patch if there are no other opinions.

Pierre Muller

Re: [patch 1/2] Make gdbtui a shell script

[Jan Kratochvil]

On Wed, 21 Dec 2011 15:26:54 +0100, Pierre Muller wrote:
> > I am for it, `gdbtui' does not bring any more convenience than `gdb -tui'.
> 
>   Remember that some targets (like DJGPP)
> have no symbolic links...

I understand the Joel's proposal as dropping gdbtui entirely and everywhere,
so that users will notice it.

Besides that I have ~70 convenience aliases in my ~/.bashrc, why not to have
also `gdbtui' if someone is really used to that name.


Regards,
Jan

Re: [patch 1/2] Make gdbtui a shell script

[Joel Brobecker]

> Besides that I have ~70 convenience aliases in my ~/.bashrc, why not to have
> also `gdbtui' if someone is really used to that name.

Actually, that's a very good point.

-- 
Joel

Re: [patch 1/2] Make gdbtui a shell script

[Tom Tromey]

>>>>> "Jan" == Jan Kratochvil <jan.kratochvil@redhat.com> writes:

Jan> Fedora has been using gdb<->gdbtui hardlink but according to Tom
Jan> argv[0] should not be used.  GNU Coding Standards IMO do not say
Jan> exactly this thing.

From '(standards) User Interfaces':

    Please don't make the behavior of a utility depend on the name used to
    invoke it.  It is useful sometimes to make a link to a utility with a
    different name, and that should not change what it does.

       Instead, use a run time option or a compilation switch or both to
    select among the alternate behaviors.

Tom

Re: [patch 1/2] Make gdbtui a shell script

[Tom Tromey]

>>>>> "Jan" == Jan Kratochvil <jan.kratochvil@redhat.com> writes:

Jan> I understand the Joel's proposal as dropping gdbtui entirely and
Jan> everywhere, so that users will notice it.

It would be fine by me.

Tom

[patch 1/2] Drop gdbtui [+doc changes]

[Jan Kratochvil]

On Wed, 21 Dec 2011 18:25:28 +0100, Tom Tromey wrote:
> >>>>> "Jan" == Jan Kratochvil <jan.kratochvil@redhat.com> writes:
> 
> Jan> I understand the Joel's proposal as dropping gdbtui entirely and
> Jan> everywhere, so that users will notice it.
> 
> It would be fine by me.

Here it is.

I will check it in in a day or so.


Thanks,
Jan


gdb/
2011-12-21  Jan Kratochvil  <jan.kratochvil@redhat.com>

	Remove the gdbtui binary.
	* .gitignore (/gdbtui): Remove.
	* Makefile.in (TUI): Remove.
	(SUBDIR_TUI_OBS): Remove tui-main.o.
	(SUBDIR_TUI_SRCS): Remove tui/tui-main.c.
	(all-tui, install-tui, uninstall-tui, $(TUI)$(EXEEXT), clean-tui)
	(tui-main.o): Remove.
	(all_object_files): Remove tui-main.o.
	* NEWS: New note for the gdbtui removal.
	* configure: Rebuilt.
	* configure.ac: No longer add all-tui, clean-tui, install-tui and
	uninstall-tui to CONFIG_ALL, CONFIG_CLEAN, CONFIG_INSTALL and
	CONFIG_UNINSTALL respectively.
	* gdb.c (main): Remove args.interpreter_p initialization.
	* main.c (captured_main): Set INTERPRETER_P directly by INTERP_CONSOLE.
	* main.h (struct captured_main_args): Remove interpreter_p.
	* tui/tui-main.c: Remove.

gdb/doc/
2011-12-21  Jan Kratochvil  <jan.kratochvil@redhat.com>

	Remove the gdbtui binary.
	* all-cfg.texi (GDBTUI): Remove.
	* gdb.texinfo (Mode Options): Remove the GDBTUI reference.
	(TUI): Remove GDBTUI pindex.  Remove the GDBTUI reference.
	* gdbint.texinfo (Testsuite): Replace `gdbtui' by `gdb -tui'.

--- a/gdb/.gitignore
+++ b/gdb/.gitignore
@@ -7,7 +7,6 @@
 /cp-name-parser.c
 /f-exp.c
 /gdb
-/gdbtui
 /init.c
 /jv-exp.c
 /m2-exp.c
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -224,9 +224,6 @@ SUBDIR_MI_CFLAGS=
 # TUI sub directory definitions
 #
 
-# Name of the TUI program
-TUI=gdbtui
-
 SUBDIR_TUI_OBS = \
 	tui-command.o \
 	tui-data.o \
@@ -237,7 +234,6 @@ SUBDIR_TUI_OBS = \
 	tui-io.o \
 	tui-layout.o \
 	tui-out.o \
-	tui-main.o \
 	tui-regs.o \
 	tui-source.o \
 	tui-stack.o \
@@ -256,7 +252,6 @@ SUBDIR_TUI_SRCS = \
 	tui/tui-interp.c \
 	tui/tui-io.c \
 	tui/tui-layout.c \
-	tui/tui-main.c \
 	tui/tui-out.c \
 	tui/tui-regs.c \
 	tui/tui-source.c \
@@ -960,8 +955,6 @@ generated_files = config.h observer.h observer.inc ada-lex.c jit-reader.h \
 
 all: gdb$(EXEEXT) $(CONFIG_ALL)
 	@$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=`echo $(SUBDIRS) | sed 's/testsuite//'`" subdir_do
-.PHONY: all-tui
-all-tui: $(TUI)$(EXEEXT)
 
 installcheck:
 
@@ -1040,22 +1033,6 @@ install-only: $(CONFIG_INSTALL)
 		$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(includedir)/gdb ; \
 		$(INSTALL_DATA) jit-reader.h $(DESTDIR)$(includedir)/gdb/jit-reader.h
 	@$(MAKE) DO=install "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do
-.PHONY: install-tui
-install-tui:
-	transformed_name=`t='$(program_transform_name)'; \
-			  echo $(TUI) | sed -e "$$t"` ; \
-		if test "x$$transformed_name" = x; then \
-		  transformed_name=$(TUI) ; \
-		else \
-		  true ; \
-		fi ; \
-		$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) ; \
-		$(INSTALL_PROGRAM) $(TUI)$(EXEEXT) \
-			$(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) ; \
-		$(SHELL) $(srcdir)/../mkinstalldirs \
-			$(DESTDIR)$(man1dir) ; \
-		$(INSTALL_DATA) $(srcdir)/gdb.1 \
-			$(DESTDIR)$(man1dir)/$$transformed_name.1
 
 install-python:
 	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(GDB_DATADIR)/python/gdb
@@ -1071,17 +1048,6 @@ uninstall: force $(CONFIG_UNINSTALL)
 		rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \
 		      $(DESTDIR)$(man1dir)/$$transformed_name.1
 	@$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do
-.PHONY: uninstall-tui
-uninstall-tui:
-	transformed_name=`t='$(program_transform_name)'; \
-			  echo $(TUI) | sed -e $$t` ; \
-		if test "x$$transformed_name" = x; then \
-		  transformed_name=$(TUI) ; \
-		else \
-		  true ; \
-		fi ; \
-		rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \
-		      $(DESTDIR)$(man1dir)/$$transformed_name.1
 
 # The C++ name parser can be built standalone for testing.
 test-cp-name-parser.o: cp-name-parser.c
@@ -1185,12 +1151,6 @@ gdb$(EXEEXT): gdb.o libgdb.a $(ADD_DEPS) $(CDEPS) $(TDEPLIBS)
 		-o gdb$(EXEEXT) gdb.o libgdb.a \
 		$(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES)
 
-$(TUI)$(EXEEXT): tui-main.o libgdb.a $(ADD_DEPS) $(CDEPS) $(TDEPLIBS)
-	rm -f $(TUI)$(EXEEXT)
-	$(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) \
-		-o $(TUI)$(EXEEXT) tui-main.o libgdb.a \
-		$(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES)
-
 # Convenience rule to handle recursion.
 $(LIBGNU) $(GNULIB_H): all-lib
 all-lib: gnulib/Makefile
@@ -1251,10 +1211,6 @@ clean mostlyclean: $(CONFIG_CLEAN)
 	rm -f xml-builtin.c stamp-xml
 	rm -f $(DEPDIR)/*
 
-.PHONY: clean-tui
-clean-tui:
-	rm -f $(TUI)$(EXEEXT)
-
 # This used to depend on c-exp.c m2-exp.c TAGS
 # I believe this is wrong; the makefile standards for distclean just
 # describe removing files; the only sort of "re-create a distribution"
@@ -2020,10 +1976,6 @@ tui-layout.o: $(srcdir)/tui/tui-layout.c
 	$(COMPILE) $(srcdir)/tui/tui-layout.c
 	$(POSTCOMPILE)
 
-tui-main.o: $(srcdir)/tui/tui-main.c
-	$(COMPILE) $(srcdir)/tui/tui-main.c
-	$(POSTCOMPILE)
-
 tui-out.o: $(srcdir)/tui/tui-out.c
 	$(COMPILE) $(srcdir)/tui/tui-out.c
 	$(POSTCOMPILE)
@@ -2205,7 +2157,7 @@ py-value.o: $(srcdir)/python/py-value.c
 
 # A list of all the objects we might care about in this build, for
 # dependency tracking.
-all_object_files = gdb.o tui-main.o $(LIBGDB_OBS) gdbtk-main.o \
+all_object_files = gdb.o $(LIBGDB_OBS) gdbtk-main.o \
 	test-cp-name-parser.o
 
 # Ensure that generated files are created early.  Use order-only
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -6,6 +6,8 @@
 * GDBserver now supports stdio connections.
   E.g. (gdb) target remote | ssh myhost gdbserver - hello
 
+* The binary "gdbtui" has been removed.  Use "gdb -tui" instead.
+
 *** Changes in GDB 7.4
 
 * GDB now handles ambiguous linespecs more consistently; the existing
--- a/gdb/configure
+++ b/gdb/configure
@@ -9770,10 +9770,6 @@ if test x"$enable_tui" != xno; then
       CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_TUI_DEPS)"
       CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_TUI_SRCS)"
       ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_TUI_CFLAGS)"
-      CONFIG_ALL="${CONFIG_ALL} all-tui"
-      CONFIG_CLEAN="${CONFIG_CLEAN} clean-tui"
-      CONFIG_INSTALL="${CONFIG_INSTALL} install-tui"
-      CONFIG_UNINSTALL="${CONFIG_UNINSTALL} uninstall-tui"
     else
       if test x"$enable_tui" = xyes; then
 	as_fn_error "no enhanced curses library found; disable TUI" "$LINENO" 5
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -545,10 +545,6 @@ if test x"$enable_tui" != xno; then
       CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_TUI_DEPS)"
       CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_TUI_SRCS)"
       ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_TUI_CFLAGS)"
-      CONFIG_ALL="${CONFIG_ALL} all-tui"
-      CONFIG_CLEAN="${CONFIG_CLEAN} clean-tui"
-      CONFIG_INSTALL="${CONFIG_INSTALL} install-tui"
-      CONFIG_UNINSTALL="${CONFIG_UNINSTALL} uninstall-tui"
     else
       if test x"$enable_tui" = xyes; then
 	AC_MSG_ERROR([no enhanced curses library found; disable TUI])
--- a/gdb/doc/all-cfg.texi
+++ b/gdb/doc/all-cfg.texi
@@ -31,9 +31,6 @@
 @c Name of GDB program.  Used also for (gdb) prompt string.
 @set GDBP gdb
 @c 
-@c Name of GDBTUI program.
-@set GDBTUI gdbtui
-@c 
 @c Name of GDB product.  Used in running text.
 @set GDBN @sc{gdb}
 @c
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -1181,10 +1181,9 @@ Run using @var{device} for your program's standard input and output.
 Activate the @dfn{Text User Interface} when starting.  The Text User
 Interface manages several text windows on the terminal, showing
 source, assembly, registers and @value{GDBN} command outputs
-(@pxref{TUI, ,@value{GDBN} Text User Interface}).  Alternatively, the
-Text User Interface can be enabled by invoking the program
-@samp{@value{GDBTUI}}.  Do not use this option if you run @value{GDBN} from
-Emacs (@pxref{Emacs, ,Using @value{GDBN} under @sc{gnu} Emacs}).
+(@pxref{TUI, ,@value{GDBN} Text User Interface}).  Do not use this
+option if you run @value{GDBN} from Emacs (@pxref{Emacs, ,
+Using @value{GDBN} under @sc{gnu} Emacs}).
 
 @c @item -xdb
 @c @cindex @code{--xdb}
@@ -24932,9 +24931,8 @@ commands in separate text windows.  The TUI mode is supported only
 on platforms where a suitable version of the @code{curses} library
 is available.
 
-@pindex @value{GDBTUI}
 The TUI mode is enabled by default when you invoke @value{GDBN} as
-either @samp{@value{GDBTUI}} or @samp{@value{GDBP} -tui}.
+@samp{@value{GDBP} -tui}.
 You can also switch in and out of TUI mode while @value{GDBN} runs by
 using various TUI commands and key bindings, such as @kbd{C-x C-a}. 
 @xref{TUI Keys, ,TUI Key Bindings}.
--- a/gdb/doc/gdbint.texinfo
+++ b/gdb/doc/gdbint.texinfo
@@ -7690,7 +7690,7 @@ make check RUNTESTFLAGS="GDB=/usr/bin/gdb GDBSERVER=/usr/bin/gdbserver"
 When running the testsuite normally one doesn't want whatever is in
 @file{~/.gdbinit} to interfere with the tests, therefore the test harness
 passes @option{-nx} to @value{GDBN}.  One also doesn't want any windowed
-version of @value{GDBN}, e.g., @command{gdbtui}, to run.
+version of @value{GDBN}, e.g., @command{gdb -tui}, to run.
 This is achieved via @code{INTERNAL_GDBFLAGS}.  
 
 @smallexample
--- a/gdb/gdb.c
+++ b/gdb/gdb.c
@@ -31,6 +31,5 @@ main (int argc, char **argv)
   args.argc = argc;
   args.argv = argv;
   args.use_windows = 0;
-  args.interpreter_p = INTERP_CONSOLE;
   return gdb_main (&args);
 }
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -380,7 +380,7 @@ captured_main (void *data)
      this captured main, or one specified by the user at start up, or
      the console.  Initialize the interpreter to the one requested by 
      the application.  */
-  interpreter_p = xstrdup (context->interpreter_p);
+  interpreter_p = xstrdup (INTERP_CONSOLE);
 
   /* Parse arguments and options.  */
   {
--- a/gdb/main.h
+++ b/gdb/main.h
@@ -26,7 +26,6 @@ struct captured_main_args
   int argc;
   char **argv;
   int use_windows;
-  const char *interpreter_p;
 };
 
 extern int gdb_main (struct captured_main_args *);
--- a/gdb/tui/tui-main.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Main function for TUI gdb.
-
-   Copyright (C) 2002, 2004, 2007, 2008, 2009, 2010, 2011
-   Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include "defs.h"
-#include "main.h"
-#include "gdb_string.h"
-#include "interps.h"
-
-int
-main (int argc, char **argv)
-{
-  struct captured_main_args args;
-
-  memset (&args, 0, sizeof args);
-  args.argc = argc;
-  args.argv = argv;
-  args.use_windows = 0;
-  args.interpreter_p = INTERP_TUI;
-  return gdb_main (&args);
-}

Re: [patch 1/2] Make gdbtui a shell script

[Stan Shebs]

On 12/21/11 4:23 AM, Joel Brobecker wrote:
>> it is discussed for years it is not great to have almost the same gdb and
>> gdbtui binaries, each ~5MB.  Make gdbtui a shell script.
>>
>> I am not so sure how well is the shell script portable across Unices.
>> I assume MinGW is out of question anyway but that may not be a concern.
> How about not providing gdbtui at all, not even a shell script?
> Hmmm, maybe a little extreme?
>
>

Googling around, I see quite a few references to "gdbtui" out in the 
world, including ones with target prefixes and the like - for example, 
at http://fun-tech.se/stm32/OpenOCD/gdb.php .  It seems a little 
disruptive to our users and repackagers to have the name disappear 
altogether with no prior warning.

Assuming that this patch is only going into trunk, then it seems 
sufficient to add a news item to 7.4 warning of the coming change, or 
even adding a deprecation warning to the branch's tui-main, which will 
give everybody the 7.4 - 7.5 interval to update their usages.

Stan

Re: [patch 1/2] Make gdbtui a shell script

[Joel Brobecker]

> Assuming that this patch is only going into trunk, then it seems
> sufficient to add a news item to 7.4 warning of the coming change,
> or even adding a deprecation warning to the branch's tui-main, which
> will give everybody the 7.4 - 7.5 interval to update their usages.

Works for me!

-- 
Joel

Re: [patch 1/2] Drop gdbtui [+doc changes]

[Eli Zaretskii]

> Date: Wed, 21 Dec 2011 23:35:23 +0100
> From: Jan Kratochvil <jan.kratochvil@redhat.com>
> Cc: Pierre Muller <pierre.muller@ics-cnrs.unistra.fr>,        "'Joel Brobecker'" <brobecker@adacore.com>, gdb-patches@sourceware.org,        "'Sergio Durigan'" <sdurigan@redhat.com>,        "'Kai Tietz'" <ktietz@redhat.com>
> 
> On Wed, 21 Dec 2011 18:25:28 +0100, Tom Tromey wrote:
> > >>>>> "Jan" == Jan Kratochvil <jan.kratochvil@redhat.com> writes:
> > 
> > Jan> I understand the Joel's proposal as dropping gdbtui entirely and
> > Jan> everywhere, so that users will notice it.
> > 
> > It would be fine by me.
> 
> Here it is.

Thanks.  I have a couple of comments.

> -version of @value{GDBN}, e.g., @command{gdbtui}, to run.
> +version of @value{GDBN}, e.g., @command{gdb -tui}, to run.

@command is for names of commands, not for command lines.  Please use
@samp here.

> --- a/gdb/NEWS
> +++ b/gdb/NEWS
> @@ -6,6 +6,8 @@
>  * GDBserver now supports stdio connections.
>    E.g. (gdb) target remote | ssh myhost gdbserver - hello
>  
> +* The binary "gdbtui" has been removed.  Use "gdb -tui" instead.
> +

I think the first sentence should say

  The binary "gdbtui" is no longer built or installed.

because we didn't really "remove" anything ;-)

Thanks.

Re: [patch 1/2] Drop gdbtui [+doc changes]

[Jan Kratochvil]

On Thu, 22 Dec 2011 09:04:43 +0100, Eli Zaretskii wrote:
> > +* The binary "gdbtui" has been removed.  Use "gdb -tui" instead.
> 
> I think the first sentence should say
> 
>   The binary "gdbtui" is no longer built or installed.
> 
> because we didn't really "remove" anything ;-)

FYI I understand it the way that neither "make" nor "make install" builds
"gdbtui" now but if I enter "make gdbtui" then "gdbtui" is still built.

But it no longer can be built in any way, "make gdbtui" will now abort:
make: *** No rule to make target `gdbtui'.  Stop.

But my interpretation may not be right, I will use your text.


Thanks,
Jan

[NEWS patch] Re: [patch 1/2] Make gdbtui a shell script

[Jan Kratochvil]

On Thu, 22 Dec 2011 00:11:25 +0100, Stan Shebs wrote:
> It seems a little disruptive to our users and repackagers to have the name
> disappear altogether with no prior warning.

The deprecation NEWS items have been present but TBH as Fedora + RHEL
GDB packager I have no idea what I could do with it in advance.


On Thu, 22 Dec 2011 06:21:36 +0100, Joel Brobecker wrote:
> > Assuming that this patch is only going into trunk, then it seems
> > sufficient to add a news item to 7.4 warning of the coming change,
> > or even adding a deprecation warning to the branch's tui-main, which
> > will give everybody the 7.4 - 7.5 interval to update their usages.
> 
> Works for me!


Thanks,
Jan


gdb/
2011-12-22  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* NEWS (Changes in GDB 7.4): Add gdbtui deprecation note.
	* tui/tui-main.c: Likewise.

--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -259,6 +259,11 @@ Texas Instruments TMS320C6x		tic6x-*-*
 
 Renesas RL78				rl78-*-elf
 
+* The binary "gdbtui" is deprecated.
+
+The binary will be no longer built or installed in GDB 7.5.  Use "gdb -tui"
+instead.
+
 *** Changes in GDB 7.3.1
 
 * The build failure for NetBSD and OpenBSD targets have now been fixed.
--- a/gdb/tui/tui-main.c
+++ b/gdb/tui/tui-main.c
@@ -18,6 +18,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/* The binary "gdbtui" is deprecated.
+
+   The binary will be no longer built or installed in GDB 7.5.  Use "gdb -tui"
+   instead.  */
+
 #include "defs.h"
 #include "main.h"
 #include "gdb_string.h"

Re: [patch 1/2] Drop gdbtui [+doc changes]

[Eli Zaretskii]

> Date: Thu, 22 Dec 2011 10:32:22 +0100
> From: Jan Kratochvil <jan.kratochvil@redhat.com>
> Cc: tromey@redhat.com, pierre.muller@ics-cnrs.unistra.fr,
>         brobecker@adacore.com, gdb-patches@sourceware.org, sdurigan@redhat.com,
>         ktietz@redhat.com
> 
> On Thu, 22 Dec 2011 09:04:43 +0100, Eli Zaretskii wrote:
> > > +* The binary "gdbtui" has been removed.  Use "gdb -tui" instead.
> > 
> > I think the first sentence should say
> > 
> >   The binary "gdbtui" is no longer built or installed.
> > 
> > because we didn't really "remove" anything ;-)
> 
> FYI I understand it the way that neither "make" nor "make install" builds
> "gdbtui" now but if I enter "make gdbtui" then "gdbtui" is still built.
> 
> But it no longer can be built in any way, "make gdbtui" will now abort:
> make: *** No rule to make target `gdbtui'.  Stop.

Would it be better to say

  The binary "gdbtui" can no longer be built or installed.

?

Re: [patch 1/2] Drop gdbtui [+doc changes]

[Jan Kratochvil]

On Thu, 22 Dec 2011 12:00:02 +0100, Eli Zaretskii wrote:
> Would it be better to say
> 
>   The binary "gdbtui" can no longer be built or installed.

That is correctly understandable by me.


Thanks,
Jan

[commit 7.4] [NEWS patch] Re: [patch 1/2] Make gdbtui a shell script

[Jan Kratochvil]

On Thu, 22 Dec 2011 11:12:58 +0100, Jan Kratochvil wrote:
> On Thu, 22 Dec 2011 06:21:36 +0100, Joel Brobecker wrote:
> > Works for me!

Checked into 7.4.  Kept 2011 ChangeLog for the 2012 entry as AFAIK the
ChangeLogs do not rotate in the branched repositories.

(Not yet checked in the real patch to HEAD as I hope Joel will run the
year-rotating scripts soon.)


Thanks,
Jan


http://sourceware.org/ml/gdb-cvs/2012-01/msg00002.html

--- src/gdb/ChangeLog	2011/12/23 17:55:16	1.13614.2.22
+++ src/gdb/ChangeLog	2012/01/01 21:47:07	1.13614.2.23
@@ -1,3 +1,8 @@
+2012-01-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* NEWS (Changes in GDB 7.4): Add gdbtui deprecation note.
+	* tui/tui-main.c: Likewise.
+
 2011-12-23  Kevin Pouget  <kevin.pouget@st.com>
 
 	Introduce gdb.FinishBreakpoint in Python
--- src/gdb/NEWS	2011/12/23 17:55:20	1.472.2.2
+++ src/gdb/NEWS	2012/01/01 21:47:08	1.472.2.3
@@ -258,6 +258,11 @@
 
 Renesas RL78				rl78-*-elf
 
+* The binary "gdbtui" is deprecated.
+
+  The binary will be no longer built or installed in GDB 7.5.
+  Use "gdb -tui" instead.
+
 *** Changes in GDB 7.3.1
 
 * The build failure for NetBSD and OpenBSD targets have now been fixed.
--- src/gdb/tui/tui-main.c	2011/01/01 15:33:53	1.9
+++ src/gdb/tui/tui-main.c	2012/01/01 21:47:08	1.9.4.1
@@ -18,6 +18,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/* The binary "gdbtui" is deprecated.
+
+   The binary will be no longer built or installed in GDB 7.5.
+   Use "gdb -tui" instead.  */
+
 #include "defs.h"
 #include "main.h"
 #include "gdb_string.h"

[commit] [patch 1/2] Drop gdbtui [+doc changes]

[Jan Kratochvil]

On Wed, 21 Dec 2011 23:35:23 +0100, Jan Kratochvil wrote:

Checked in with the doc changes.


Thanks,
Jan


http://sourceware.org/ml/gdb-cvs/2012-01/msg00010.html

--- src/gdb/ChangeLog	2012/01/02 01:23:40	1.13680
+++ src/gdb/ChangeLog	2012/01/02 02:28:56	1.13681
@@ -1,3 +1,23 @@
+2012-01-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Remove the gdbtui binary.
+	* .gitignore (/gdbtui): Remove.
+	* Makefile.in (TUI): Remove.
+	(SUBDIR_TUI_OBS): Remove tui-main.o.
+	(SUBDIR_TUI_SRCS): Remove tui/tui-main.c.
+	(all-tui, install-tui, uninstall-tui, $(TUI)$(EXEEXT), clean-tui)
+	(tui-main.o): Remove.
+	(all_object_files): Remove tui-main.o.
+	* NEWS: New note for the gdbtui removal.
+	* configure: Rebuilt.
+	* configure.ac: No longer add all-tui, clean-tui, install-tui and
+	uninstall-tui to CONFIG_ALL, CONFIG_CLEAN, CONFIG_INSTALL and
+	CONFIG_UNINSTALL respectively.
+	* gdb.c (main): Remove args.interpreter_p initialization.
+	* main.c (captured_main): Set INTERPRETER_P directly by INTERP_CONSOLE.
+	* main.h (struct captured_main_args): Remove interpreter_p.
+	* tui/tui-main.c: Remove.
+
 2012-01-01  Doug Evans  <dje@google.com>
 
 	* dwarf2read.c (dwarf2_compute_name): Simplify objfile references.
--- src/gdb/doc/ChangeLog	2011/12/23 17:06:12	1.1260
+++ src/gdb/doc/ChangeLog	2012/01/02 02:28:58	1.1261
@@ -1,3 +1,11 @@
+2012-01-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Remove the gdbtui binary.
+	* all-cfg.texi (GDBTUI): Remove.
+	* gdb.texinfo (Mode Options): Remove the GDBTUI reference.
+	(TUI): Remove GDBTUI pindex.  Remove the GDBTUI reference.
+	* gdbint.texinfo (Testsuite): Replace `gdbtui' by `gdb -tui'.
+
 2011-12-23  Kevin Pouget  <kevin.pouget@st.com>
 
 	Introduce gdb.FinishBreakpoint in Python.
--- src/gdb/.gitignore	2011/03/29 18:21:32	1.1
+++ src/gdb/.gitignore	2012/01/02 02:28:56	1.2
@@ -7,7 +7,6 @@
 /cp-name-parser.c
 /f-exp.c
 /gdb
-/gdbtui
 /init.c
 /jv-exp.c
 /m2-exp.c
--- src/gdb/Makefile.in	2011/12/23 17:06:10	1.1180
+++ src/gdb/Makefile.in	2012/01/02 02:28:56	1.1181
@@ -224,9 +224,6 @@
 # TUI sub directory definitions
 #
 
-# Name of the TUI program
-TUI=gdbtui
-
 SUBDIR_TUI_OBS = \
 	tui-command.o \
 	tui-data.o \
@@ -237,7 +234,6 @@
 	tui-io.o \
 	tui-layout.o \
 	tui-out.o \
-	tui-main.o \
 	tui-regs.o \
 	tui-source.o \
 	tui-stack.o \
@@ -256,7 +252,6 @@
 	tui/tui-interp.c \
 	tui/tui-io.c \
 	tui/tui-layout.c \
-	tui/tui-main.c \
 	tui/tui-out.c \
 	tui/tui-regs.c \
 	tui/tui-source.c \
@@ -962,8 +957,6 @@
 
 all: gdb$(EXEEXT) $(CONFIG_ALL)
 	@$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=`echo $(SUBDIRS) | sed 's/testsuite//'`" subdir_do
-.PHONY: all-tui
-all-tui: $(TUI)$(EXEEXT)
 
 installcheck:
 
@@ -1042,22 +1035,6 @@
 		$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(includedir)/gdb ; \
 		$(INSTALL_DATA) jit-reader.h $(DESTDIR)$(includedir)/gdb/jit-reader.h
 	@$(MAKE) DO=install "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do
-.PHONY: install-tui
-install-tui:
-	transformed_name=`t='$(program_transform_name)'; \
-			  echo $(TUI) | sed -e "$$t"` ; \
-		if test "x$$transformed_name" = x; then \
-		  transformed_name=$(TUI) ; \
-		else \
-		  true ; \
-		fi ; \
-		$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) ; \
-		$(INSTALL_PROGRAM) $(TUI)$(EXEEXT) \
-			$(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) ; \
-		$(SHELL) $(srcdir)/../mkinstalldirs \
-			$(DESTDIR)$(man1dir) ; \
-		$(INSTALL_DATA) $(srcdir)/gdb.1 \
-			$(DESTDIR)$(man1dir)/$$transformed_name.1
 
 install-python:
 	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(GDB_DATADIR)/python/gdb
@@ -1073,17 +1050,6 @@
 		rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \
 		      $(DESTDIR)$(man1dir)/$$transformed_name.1
 	@$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do
-.PHONY: uninstall-tui
-uninstall-tui:
-	transformed_name=`t='$(program_transform_name)'; \
-			  echo $(TUI) | sed -e $$t` ; \
-		if test "x$$transformed_name" = x; then \
-		  transformed_name=$(TUI) ; \
-		else \
-		  true ; \
-		fi ; \
-		rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \
-		      $(DESTDIR)$(man1dir)/$$transformed_name.1
 
 # The C++ name parser can be built standalone for testing.
 test-cp-name-parser.o: cp-name-parser.c
@@ -1187,12 +1153,6 @@
 		-o gdb$(EXEEXT) gdb.o libgdb.a \
 		$(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES)
 
-$(TUI)$(EXEEXT): tui-main.o libgdb.a $(ADD_DEPS) $(CDEPS) $(TDEPLIBS)
-	rm -f $(TUI)$(EXEEXT)
-	$(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) \
-		-o $(TUI)$(EXEEXT) tui-main.o libgdb.a \
-		$(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES)
-
 # Convenience rule to handle recursion.
 $(LIBGNU) $(GNULIB_H): all-lib
 all-lib: gnulib/Makefile
@@ -1253,10 +1213,6 @@
 	rm -f xml-builtin.c stamp-xml
 	rm -f $(DEPDIR)/*
 
-.PHONY: clean-tui
-clean-tui:
-	rm -f $(TUI)$(EXEEXT)
-
 # This used to depend on c-exp.c m2-exp.c TAGS
 # I believe this is wrong; the makefile standards for distclean just
 # describe removing files; the only sort of "re-create a distribution"
@@ -2022,10 +1978,6 @@
 	$(COMPILE) $(srcdir)/tui/tui-layout.c
 	$(POSTCOMPILE)
 
-tui-main.o: $(srcdir)/tui/tui-main.c
-	$(COMPILE) $(srcdir)/tui/tui-main.c
-	$(POSTCOMPILE)
-
 tui-out.o: $(srcdir)/tui/tui-out.c
 	$(COMPILE) $(srcdir)/tui/tui-out.c
 	$(POSTCOMPILE)
@@ -2211,7 +2163,7 @@
 
 # A list of all the objects we might care about in this build, for
 # dependency tracking.
-all_object_files = gdb.o tui-main.o $(LIBGDB_OBS) gdbtk-main.o \
+all_object_files = gdb.o $(LIBGDB_OBS) gdbtk-main.o \
 	test-cp-name-parser.o
 
 # Ensure that generated files are created early.  Use order-only
--- src/gdb/NEWS	2011/12/23 17:06:10	1.477
+++ src/gdb/NEWS	2012/01/02 02:28:56	1.478
@@ -6,6 +6,9 @@
 * GDBserver now supports stdio connections.
   E.g. (gdb) target remote | ssh myhost gdbserver - hello
 
+* The binary "gdbtui" can no longer be built or installed.
+  Use "gdb -tui" instead.
+
 *** Changes in GDB 7.4
 
 * GDB now handles ambiguous linespecs more consistently; the existing
--- src/gdb/configure	2011/11/20 08:59:56	1.335
+++ src/gdb/configure	2012/01/02 02:28:56	1.336
@@ -9770,10 +9770,6 @@
       CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_TUI_DEPS)"
       CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_TUI_SRCS)"
       ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_TUI_CFLAGS)"
-      CONFIG_ALL="${CONFIG_ALL} all-tui"
-      CONFIG_CLEAN="${CONFIG_CLEAN} clean-tui"
-      CONFIG_INSTALL="${CONFIG_INSTALL} install-tui"
-      CONFIG_UNINSTALL="${CONFIG_UNINSTALL} uninstall-tui"
     else
       if test x"$enable_tui" = xyes; then
 	as_fn_error "no enhanced curses library found; disable TUI" "$LINENO" 5
--- src/gdb/configure.ac	2011/11/20 08:59:56	1.150
+++ src/gdb/configure.ac	2012/01/02 02:28:58	1.151
@@ -545,10 +545,6 @@
       CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_TUI_DEPS)"
       CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_TUI_SRCS)"
       ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_TUI_CFLAGS)"
-      CONFIG_ALL="${CONFIG_ALL} all-tui"
-      CONFIG_CLEAN="${CONFIG_CLEAN} clean-tui"
-      CONFIG_INSTALL="${CONFIG_INSTALL} install-tui"
-      CONFIG_UNINSTALL="${CONFIG_UNINSTALL} uninstall-tui"
     else
       if test x"$enable_tui" = xyes; then
 	AC_MSG_ERROR([no enhanced curses library found; disable TUI])
--- src/gdb/gdb.c	2011/01/01 15:33:05	1.12
+++ src/gdb/gdb.c	2012/01/02 02:28:58	1.13
@@ -31,6 +31,5 @@
   args.argc = argc;
   args.argv = argv;
   args.use_windows = 0;
-  args.interpreter_p = INTERP_CONSOLE;
   return gdb_main (&args);
 }
--- src/gdb/main.c	2011/11/05 17:08:30	1.97
+++ src/gdb/main.c	2012/01/02 02:28:58	1.98
@@ -380,7 +380,7 @@
      this captured main, or one specified by the user at start up, or
      the console.  Initialize the interpreter to the one requested by 
      the application.  */
-  interpreter_p = xstrdup (context->interpreter_p);
+  interpreter_p = xstrdup (INTERP_CONSOLE);
 
   /* Parse arguments and options.  */
   {
--- src/gdb/main.h	2011/01/01 15:33:10	1.12
+++ src/gdb/main.h	2012/01/02 02:28:58	1.13
@@ -26,7 +26,6 @@
   int argc;
   char **argv;
   int use_windows;
-  const char *interpreter_p;
 };
 
 extern int gdb_main (struct captured_main_args *);
--- src/gdb/doc/all-cfg.texi	2011/01/05 05:09:52	1.6
+++ src/gdb/doc/all-cfg.texi	2012/01/02 02:28:58	1.7
@@ -31,9 +31,6 @@
 @c Name of GDB program.  Used also for (gdb) prompt string.
 @set GDBP gdb
 @c 
-@c Name of GDBTUI program.
-@set GDBTUI gdbtui
-@c 
 @c Name of GDB product.  Used in running text.
 @set GDBN @sc{gdb}
 @c
--- src/gdb/doc/gdb.texinfo	2011/12/23 17:06:13	1.908
+++ src/gdb/doc/gdb.texinfo	2012/01/02 02:28:58	1.909
@@ -1181,10 +1181,9 @@
 Activate the @dfn{Text User Interface} when starting.  The Text User
 Interface manages several text windows on the terminal, showing
 source, assembly, registers and @value{GDBN} command outputs
-(@pxref{TUI, ,@value{GDBN} Text User Interface}).  Alternatively, the
-Text User Interface can be enabled by invoking the program
-@samp{@value{GDBTUI}}.  Do not use this option if you run @value{GDBN} from
-Emacs (@pxref{Emacs, ,Using @value{GDBN} under @sc{gnu} Emacs}).
+(@pxref{TUI, ,@value{GDBN} Text User Interface}).  Do not use this
+option if you run @value{GDBN} from Emacs (@pxref{Emacs, ,
+Using @value{GDBN} under @sc{gnu} Emacs}).
 
 @c @item -xdb
 @c @cindex @code{--xdb}
@@ -24985,9 +24984,8 @@
 on platforms where a suitable version of the @code{curses} library
 is available.
 
-@pindex @value{GDBTUI}
 The TUI mode is enabled by default when you invoke @value{GDBN} as
-either @samp{@value{GDBTUI}} or @samp{@value{GDBP} -tui}.
+@samp{@value{GDBP} -tui}.
 You can also switch in and out of TUI mode while @value{GDBN} runs by
 using various TUI commands and key bindings, such as @kbd{C-x C-a}. 
 @xref{TUI Keys, ,TUI Key Bindings}.
--- src/gdb/doc/gdbint.texinfo	2011/12/19 13:37:33	1.331
+++ src/gdb/doc/gdbint.texinfo	2012/01/02 02:28:58	1.332
@@ -7690,7 +7690,7 @@
 When running the testsuite normally one doesn't want whatever is in
 @file{~/.gdbinit} to interfere with the tests, therefore the test harness
 passes @option{-nx} to @value{GDBN}.  One also doesn't want any windowed
-version of @value{GDBN}, e.g., @command{gdbtui}, to run.
+version of @value{GDBN}, e.g., @samp{gdb -tui}, to run.
 This is achieved via @code{INTERNAL_GDBFLAGS}.  
 
 @smallexample

Re: [commit] [patch 1/2] Drop gdbtui [+doc changes]

[Pedro Alves]

On 01/02/2012 02:30 AM, Jan Kratochvil wrote:
> --- src/gdb/main.c	2011/11/05 17:08:30	1.97
> +++ src/gdb/main.c	2012/01/02 02:28:58	1.98
> @@ -380,7 +380,7 @@
>        this captured main, or one specified by the user at start up, or
>        the console.  Initialize the interpreter to the one requested by
>        the application.  */
> -  interpreter_p = xstrdup (context->interpreter_p);
> +  interpreter_p = xstrdup (INTERP_CONSOLE);
>
>     /* Parse arguments and options.  */
>     {
> --- src/gdb/main.h	2011/01/01 15:33:10	1.12
> +++ src/gdb/main.h	2012/01/02 02:28:58	1.13
> @@ -26,7 +26,6 @@
>     int argc;
>     char **argv;
>     int use_windows;
> -  const char *interpreter_p;
>   };

This breaks 'insight' the binary, which similarly to gdbtui,
starts gdb with the "insight" interpreter.

gdbtk-main.c:
int
main (int argc, char **argv)
{
   struct captured_main_args args;
   memset (&args, 0, sizeof args);
   args.argc = argc;
   args.argv = argv;
   args.use_windows = 1;
   args.interpreter_p = "insight";
   return gdb_main (&args);
}

-- 
Pedro Alves

[commit] Fix/revert insight build regression by me [Re: [commit] [patch 1/2] Drop gdbtui [+doc changes]]

[Jan Kratochvil]

On Mon, 02 Jan 2012 14:03:15 +0100, Pedro Alves wrote:
> This breaks 'insight' the binary, which similarly to gdbtui,
> starts gdb with the "insight" interpreter.

./gdbtk/generic/gdbtk-main.c: In function ‘main’:
./gdbtk/generic/gdbtk-main.c:35:7: error: ‘struct captured_main_args’ has no member named ‘interpreter_p’

Thanks for catching it.  Checked in the revert below.


Regards,
Jan


http://sourceware.org/ml/gdb-cvs/2012-01/msg00019.html

--- src/gdb/ChangeLog	2012/01/02 09:03:07	1.13688
+++ src/gdb/ChangeLog	2012/01/02 13:29:55	1.13689
@@ -1,3 +1,12 @@
+2012-01-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Revert this part of:
+	2012-01-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
+	Remove the gdbtui binary.
+	* gdb.c (main): Remove args.interpreter_p initialization.
+	* main.c (captured_main): Set INTERPRETER_P directly by INTERP_CONSOLE.
+	* main.h (struct captured_main_args): Remove interpreter_p.
+
 2012-01-02  Joel Brobecker  <brobecker@adacore.com>
 
 	* config/djgpp/fnchange.lst: Add entry for ChangeLog-2011.
--- src/gdb/gdb.c	2012/01/02 02:28:58	1.13
+++ src/gdb/gdb.c	2012/01/02 13:29:57	1.14
@@ -31,5 +31,6 @@
   args.argc = argc;
   args.argv = argv;
   args.use_windows = 0;
+  args.interpreter_p = INTERP_CONSOLE;
   return gdb_main (&args);
 }
--- src/gdb/main.c	2012/01/02 02:28:58	1.98
+++ src/gdb/main.c	2012/01/02 13:29:57	1.99
@@ -380,7 +380,7 @@
      this captured main, or one specified by the user at start up, or
      the console.  Initialize the interpreter to the one requested by 
      the application.  */
-  interpreter_p = xstrdup (INTERP_CONSOLE);
+  interpreter_p = xstrdup (context->interpreter_p);
 
   /* Parse arguments and options.  */
   {
--- src/gdb/main.h	2012/01/02 02:28:58	1.13
+++ src/gdb/main.h	2012/01/02 13:29:57	1.14
@@ -26,6 +26,7 @@
   int argc;
   char **argv;
   int use_windows;
+  const char *interpreter_p;
 };
 
 extern int gdb_main (struct captured_main_args *);