Readline import branch

Readline import branch

[Elena Zannoni]

I made a branch of gdb+dejagnu, called readline_4_3-import-branch, and
imported readline 4.3 onto this branch.

Please give it a test.  I am expecially concerned about the platforms
that define DOS and DJGPP, since gdb's readline has some local
conditionals and I am not sure I merged those right.

Also, I am having some troubles with 'make info' in the readline/doc
directory. It probably requires texinfo4.2 (which I don't have handy).

I had to modify gdb as follows.

I ran the testsuite on Linux i386 and didn't spot anything obviously wrong.

Elena


2002-08-25  Elena Zannoni  <ezannoni@redhat.com>

        * cli/cli-cmds.c: Include readline/tilde.h.
        * cli/cli-setshow.c: Ditto.
        * defs.h: Don't export tilde_expand anymore, since readline
        exports it.

Index: defs.h
===================================================================
RCS file: /cvs/src/src/gdb/defs.h,v
retrieving revision 1.94
diff -u -r1.94 defs.h
--- defs.h      1 Aug 2002 17:18:32 -0000       1.94
+++ defs.h      25 Aug 2002 23:46:00 -0000
@@ -614,10 +614,6 @@
 
 struct frame_info;
 
-/* From readline (but not in any readline .h files).  */
-
-extern char *tilde_expand (char *);
-
 /* Control types for commands */
 
 enum misc_command_type

Index: cli/cli-cmds.c
===================================================================
RCS file: /cvs/src/src/gdb/cli/cli-cmds.c,v
retrieving revision 1.20
diff -u -r1.20 cli-cmds.c
--- cli/cli-cmds.c      30 Jul 2002 13:45:14 -0000      1.20
+++ cli/cli-cmds.c      24 Aug 2002 23:11:57 -0000
@@ -19,6 +19,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include <readline/tilde.h>
 #include "defs.h"
 #include "completer.h"
 #include "target.h"     /* For baud_rate, remote_debug and remote_timeout */

Index: cli/cli-setshow.c
===================================================================
RCS file: /cvs/src/src/gdb/cli/cli-setshow.c,v
retrieving revision 1.9
diff -u -r1.9 cli-setshow.c
--- cli/cli-setshow.c   30 Jul 2002 13:45:14 -0000      1.9
+++ cli/cli-setshow.c   24 Aug 2002 23:11:57 -0000
@@ -17,6 +17,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include <readline/tilde.h>
 #include "defs.h"
 #include "value.h"
 #include <ctype.h>

Re: Readline import branch

[Eli Zaretskii]

On Sun, 25 Aug 2002, Elena Zannoni wrote:

> I made a branch of gdb+dejagnu, called readline_4_3-import-branch, and
> imported readline 4.3 onto this branch.
> 
> Please give it a test.  I am expecially concerned about the platforms
> that define DOS and DJGPP, since gdb's readline has some local
> conditionals and I am not sure I merged those right.

Thanks for the heads-up; I will look at this when I have time.

Is readline 4.3 import planned for GDB 5.3, or only after that?

> Also, I am having some troubles with 'make info' in the readline/doc
> directory. It probably requires texinfo4.2 (which I don't have handy).

Can you show the error messages?  It's possible that I could tell you 
whether the old Texinfo is the cause.

Re: Readline import branch

[Elena Zannoni]

Eli Zaretskii writes:
 > 
 > On Sun, 25 Aug 2002, Elena Zannoni wrote:
 > 
 > > I made a branch of gdb+dejagnu, called readline_4_3-import-branch, and
 > > imported readline 4.3 onto this branch.
 > > 
 > > Please give it a test.  I am expecially concerned about the platforms
 > > that define DOS and DJGPP, since gdb's readline has some local
 > > conditionals and I am not sure I merged those right.
 > 
 > Thanks for the heads-up; I will look at this when I have time.
 > 
 > Is readline 4.3 import planned for GDB 5.3, or only after that?

Up to Andrew. Maybe if we iron out problems fast, it could be
considered for 5.3. 

 > 
 > > Also, I am having some troubles with 'make info' in the readline/doc
 > > directory. It probably requires texinfo4.2 (which I don't have handy).
 > 
 > Can you show the error messages?  It's possible that I could tell you 
 > whether the old Texinfo is the cause.

Hmm, I rebuilt a clean tree and I don't see the error anymore. I am using:
makeinfo (GNU texinfo) 4.0. (originally I was getting an error with @env).

Elena

Re: Readline import branch

[Eli Zaretskii]

On Mon, 26 Aug 2002, Elena Zannoni wrote:

>  > > Also, I am having some troubles with 'make info' in the readline/doc
>  > > directory. It probably requires texinfo4.2 (which I don't have handy).
>  > 
>  > Can you show the error messages?  It's possible that I could tell you 
>  > whether the old Texinfo is the cause.
> 
> Hmm, I rebuilt a clean tree and I don't see the error anymore. I am using:
> makeinfo (GNU texinfo) 4.0. (originally I was getting an error with @env).

@env was introduced in Texinfo 4.0, so the errors cannot be due to the 
version.

Re: Readline import branch

[Elena Zannoni]

Eli Zaretskii writes:
 > 
 > On Mon, 26 Aug 2002, Elena Zannoni wrote:
 > 
 > >  > > Also, I am having some troubles with 'make info' in the readline/doc
 > >  > > directory. It probably requires texinfo4.2 (which I don't have handy).
 > >  > 
 > >  > Can you show the error messages?  It's possible that I could tell you 
 > >  > whether the old Texinfo is the cause.
 > > 
 > > Hmm, I rebuilt a clean tree and I don't see the error anymore. I am using:
 > > makeinfo (GNU texinfo) 4.0. (originally I was getting an error with @env).
 > 
 > @env was introduced in Texinfo 4.0, so the errors cannot be due to the 
 > version.

Yeah, something in my environment. I think now I can do a 'make info' safely.

Elena

Re: Readline import branch

[Andrew Cagney]

> Eli Zaretskii writes:
>  > 
>  > On Sun, 25 Aug 2002, Elena Zannoni wrote:
>  > 
>  > > I made a branch of gdb+dejagnu, called readline_4_3-import-branch, and
>  > > imported readline 4.3 onto this branch.
>  > > 
>  > > Please give it a test.  I am expecially concerned about the platforms
>  > > that define DOS and DJGPP, since gdb's readline has some local
>  > > conditionals and I am not sure I merged those right.
>  > 
>  > Thanks for the heads-up; I will look at this when I have time.
>  > 
>  > Is readline 4.3 import planned for GDB 5.3, or only after that?
> 
> Up to Andrew. Maybe if we iron out problems fast, it could be
> considered for 5.3. 

The TUI appears to have snookered any thought of that idea :-/  To me, 
enabling both after 5.3 branches, is looking like the best option.

(but I can always be bribed ...)

enjoy,
Andrew

Re: Readline import branch

[Eli Zaretskii]

On Mon, 26 Aug 2002, Andrew Cagney wrote:

> To me, enabling both after 5.3 branches, is looking like the best option.
> 
> (but I can always be bribed ...)

Thanks for the info; I need it to make my priorities right, as I have a 
lot on my table lately.  So the bribe won't be coming from me ;-)

Re: Readline import branch

[Elena Zannoni]

Eli Zaretskii writes:
 > 
 > On Mon, 26 Aug 2002, Andrew Cagney wrote:
 > 
 > > To me, enabling both after 5.3 branches, is looking like the best option.
 > > 
 > > (but I can always be bribed ...)
 > 
 > Thanks for the info; I need it to make my priorities right, as I have a 
 > lot on my table lately.  So the bribe won't be coming from me ;-)

Ah, too bad. I was going to order a keg of Foster for Andrew... 

Elena

Re: Readline import branch

[Andrew Cagney]

> Eli Zaretskii writes:
>  > 
>  > On Mon, 26 Aug 2002, Andrew Cagney wrote:
>  > 
>  > > To me, enabling both after 5.3 branches, is looking like the best option.
>  > > 
>  > > (but I can always be bribed ...)
>  > 
>  > Thanks for the info; I need it to make my priorities right, as I have a 
>  > lot on my table lately.  So the bribe won't be coming from me ;-)
> 
> Ah, too bad. I was going to order a keg of Foster for Andrew... 

Hmn, nope.  ``Fosters, its Australian for Budwiser[sp]'' ;-)

Andrew