This is the mail archive of the gcc@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Ada does not build (line too long)


Andreas Schwab <schwab@suse.de> writes:

> Florian Weimer <fw@deneb.enyo.de> writes:
>
> |> Andreas Schwab <schwab@suse.de> writes:
> |> 
> |> > dewar@gnat.com (Robert Dewar) writes:
> |> >
> |> > |> <<Ada does not build because almost all source files have lines that are
> |> > |> too long.
> |> > |> >>
> |> > |> 
> |> > |> This needs more details, since lots of people (including us) have had no
> |> > |> trouble building GNAT.
> |> >
> |> > This is on the 3.1 branch.
> |> 
> |> I've got a patch (gzipped version attached) which does the following
> |> for all affected .ads and .adb files (generated by "perl -i.bak -pne
> |> 's/(\$Revision.*?) +--/\1/' *.ad[bs]"):
>
> I think you should also include *.adt here, and also remove the output of
> the "--" trailers in xnmake.adb.

Okay, here is an (incremental) patch to cover these cases, too.  Could
someone please approve and commit it?

(I won't be able to perform the commit before, errr, 2002-05-07 21:00
UTC or something like that.)

2002-05-07  Florian Weimer  <fw@deneb.enyo.de>

	* nmake.adt, treeprs.adt: Shorten long Revision: line.

	* xnmake.adb, xtreeprs.adb: Do not write comment trailer for
	Revision: lines.

Index: treeprs.adt
===================================================================
RCS file: /cvs/gcc/egcs/gcc/ada/treeprs.adt,v
retrieving revision 1.1.16.1
diff -c -r1.1.16.1 treeprs.adt
*** treeprs.adt	4 May 2002 03:29:23 -0000	1.1.16.1
--- treeprs.adt	6 May 2002 21:59:44 -0000
***************
*** 6,12 ****
  --                                                                          --
  --                             T e m p l a t e                              --
  --                                                                          --
! --                            $Revision: 1.1.16.1 $                             --
  --                                                                          --
  --          Copyright (C) 1992-1997 Free Software Foundation, Inc.          --
  --                                                                          --
--- 6,12 ----
  --                                                                          --
  --                             T e m p l a t e                              --
  --                                                                          --
! --                            $Revision: 1.1.16.1 $
  --                                                                          --
  --          Copyright (C) 1992-1997 Free Software Foundation, Inc.          --
  --                                                                          --
Index: nmake.adt
===================================================================
RCS file: /cvs/gcc/egcs/gcc/ada/nmake.adt,v
retrieving revision 1.1.16.1
diff -c -r1.1.16.1 nmake.adt
*** nmake.adt	4 May 2002 03:28:22 -0000	1.1.16.1
--- nmake.adt	6 May 2002 21:59:44 -0000
***************
*** 6,12 ****
  --                                                                          --
  --                             T e m p l a t e                              --
  --                                                                          --
! --                            $Revision: 1.1.16.1 $                             --
  --                                                                          --
  --          Copyright (C) 1992-2001 Free Software Foundation, Inc.          --
  --                                                                          --
--- 6,12 ----
  --                                                                          --
  --                             T e m p l a t e                              --
  --                                                                          --
! --                            $Revision: 1.1.16.1 $
  --                                                                          --
  --          Copyright (C) 1992-2001 Free Software Foundation, Inc.          --
  --                                                                          --
Index: xtreeprs.adb
===================================================================
RCS file: /cvs/gcc/egcs/gcc/ada/xtreeprs.adb,v
retrieving revision 1.1.16.1
diff -c -r1.1.16.1 xtreeprs.adb
*** xtreeprs.adb	4 May 2002 03:29:26 -0000	1.1.16.1
--- xtreeprs.adb	6 May 2002 21:59:45 -0000
***************
*** 149,155 ****
  begin
     Anchored_Mode := True;
  
!    Match ("$Revision: 1.1.16.1 $", "$Rev" & "ision: " & Break (' ') * Treeprsrev);
  
     if Argument_Count > 0 then
        Create (OutS, Out_File, Argument (1));
--- 149,156 ----
  begin
     Anchored_Mode := True;
  
!    Match ("$Revision: 1.1.16.1 $",
!           "$Rev" & "ision: " & Break (' ') * Treeprsrev);
  
     if Argument_Count > 0 then
        Create (OutS, Out_File, Argument (1));
***************
*** 201,217 ****
           Put_Line
             (OutS,
              "--                Generated by xtreeprs revision " &
!             Treeprsrev & " using                 --");
  
           Put_Line
             (OutS,
              "--                         sinfo.ads revision " &
!             Sinforev & "                          --");
  
           Put_Line
             (OutS,
              "--                        treeprs.adt revision "
!             & Temprev & "                          --");
  
        else
           --  Skip lines describing the template
--- 202,218 ----
           Put_Line
             (OutS,
              "--                Generated by xtreeprs revision " &
!             Treeprsrev & " using");
  
           Put_Line
             (OutS,
              "--                         sinfo.ads revision " &
!             Sinforev);
  
           Put_Line
             (OutS,
              "--                        treeprs.adt revision "
!             & Temprev);
  
        else
           --  Skip lines describing the template
Index: xnmake.adb
===================================================================
RCS file: /cvs/gcc/egcs/gcc/ada/xnmake.adb,v
retrieving revision 1.2.12.1
diff -c -r1.2.12.1 xnmake.adb
*** xnmake.adb	4 May 2002 03:29:25 -0000	1.2.12.1
--- xnmake.adb	6 May 2002 21:59:45 -0000
***************
*** 207,213 ****
  begin
     --  Capture our revision (following line updated by RCS)
  
!    Match ("$Revision: 1.2.12.1 $", "$Rev" & "ision: " & Break (' ') * XNmake_Rev);
  
     Lineno := 0;
     NWidth := 28;
--- 207,214 ----
  begin
     --  Capture our revision (following line updated by RCS)
  
!    Match ("$Revision: 1.2.12.1 $",
!           "$Rev" & "ision: " & Break (' ') * XNmake_Rev);
  
     Lineno := 0;
     NWidth := 28;
***************
*** 286,303 ****
        if Match (Line, GetT_Rev) then
           WriteBS
             ("--                 Generated by xnmake revision " &
!             XNmake_Rev & " using" &
!             "                  --");
  
           WriteBS
             ("--                         sinfo.ads revision " &
!             Sinfo_Rev &
!             "                         --");
  
           WriteBS
             ("--                         nmake.adt revision " &
!             Temp_Rev &
!             "                          --");
  
        else
           --  Skip lines describing the template
--- 287,301 ----
        if Match (Line, GetT_Rev) then
           WriteBS
             ("--                 Generated by xnmake revision " &
!             XNmake_Rev & " using");
  
           WriteBS
             ("--                         sinfo.ads revision " &
!             Sinfo_Rev);
  
           WriteBS
             ("--                         nmake.adt revision " &
!             Temp_Rev);
  
        else
           --  Skip lines describing the template


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]