From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1572 invoked by alias); 2 Jan 2012 02:30:57 -0000 Received: (qmail 1562 invoked by uid 22791); 2 Jan 2012 02:30:56 -0000 X-SWARE-Spam-Status: No, hits=-3.2 required=5.0 tests=AWL,BAYES_00,KAM_MX3,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,SPF_HELO_PASS,TW_BJ,TW_BT,TW_DB,TW_XD,URIBL_BLACK X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 02 Jan 2012 02:30:40 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q022UFTD005947 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 1 Jan 2012 21:30:15 -0500 Received: from host2.jankratochvil.net (ovpn-116-32.ams2.redhat.com [10.36.116.32]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q022U7Bs003241 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sun, 1 Jan 2012 21:30:10 -0500 Date: Mon, 02 Jan 2012 02:30:00 -0000 From: Jan Kratochvil To: Tom Tromey Cc: Pierre Muller , "'Joel Brobecker'" , gdb-patches@sourceware.org, "'Sergio Durigan'" , "'Kai Tietz'" Subject: [commit] [patch 1/2] Drop gdbtui [+doc changes] Message-ID: <20120102023006.GA15664@host2.jankratochvil.net> References: <20111221114641.GB25652@host2.jankratochvil.net> <20111221122330.GH23376@adacore.com> <20111221142328.GA8079@host2.jankratochvil.net> <005b01ccbfec$97428d50$c5c7a7f0$@muller@ics-cnrs.unistra.fr> <20111221143139.GA12714@host2.jankratochvil.net> <20111221223523.GA14268@host2.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20111221223523.GA14268@host2.jankratochvil.net> User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-01/txt/msg00011.txt.bz2 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 + + 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 * 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 + + 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 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