[RFA] gdb/copyright.py: Add generated files in gnulib/ to exclude list (was: "Re: [PATCH] gnulib: import count-one-bits module and use it")

Message ID 20200224082544.GA16383@adacore.com
State New, archived
Headers

Commit Message

Joel Brobecker Feb. 24, 2020, 8:25 a.m. UTC
  Hi Simon,

On Fri, Feb 14, 2020 at 02:43:08PM -0500, Simon Marchi wrote:
> On 2020-02-14 5:35 a.m., Luis Machado wrote:
> >> --- a/gnulib/Makefile.in
> >> +++ b/gnulib/Makefile.in
> >> @@ -1,7 +1,7 @@
> >>   # Makefile.in generated by automake 1.15.1 from Makefile.am.
> >>   # @configure_input@
> >>   -# Copyright (C) 1994-2020 Free Software Foundation, Inc.
> >> +# Copyright (C) 1994-2017 Free Software Foundation, Inc.
> > 
> > The year interval was reverted. Is that a problem?
> 
> Not really.  The year was changed to 2020 by commit:
> 
>   Update copyright year range in all GDB files.
>   b811d2c2920ddcb1adcd438da38e90912b31f45f
> 
> which updates the copyright years in all of GDB source files at the
> beginning of year.  The commit shouldn't have touched this file
> though, as it's a generated file.

Indeed. Here is a patch which adjusts the script doing the update
to exclude those files.

gdb/ChangeLog:

        * copypright.py (EXCLUDE_LIST): Add 'gnulib/config.in' and
        'gnulib/Makefile.in' to the list.

OK to push to master?

Thanks!
  

Comments

Simon Marchi Feb. 24, 2020, 2:53 p.m. UTC | #1
On 2020-02-24 3:25 a.m., Joel Brobecker wrote:
> Hi Simon,
> 
> On Fri, Feb 14, 2020 at 02:43:08PM -0500, Simon Marchi wrote:
>> On 2020-02-14 5:35 a.m., Luis Machado wrote:
>>>> --- a/gnulib/Makefile.in
>>>> +++ b/gnulib/Makefile.in
>>>> @@ -1,7 +1,7 @@
>>>>   # Makefile.in generated by automake 1.15.1 from Makefile.am.
>>>>   # @configure_input@
>>>>   -# Copyright (C) 1994-2020 Free Software Foundation, Inc.
>>>> +# Copyright (C) 1994-2017 Free Software Foundation, Inc.
>>>
>>> The year interval was reverted. Is that a problem?
>>
>> Not really.  The year was changed to 2020 by commit:
>>
>>   Update copyright year range in all GDB files.
>>   b811d2c2920ddcb1adcd438da38e90912b31f45f
>>
>> which updates the copyright years in all of GDB source files at the
>> beginning of year.  The commit shouldn't have touched this file
>> though, as it's a generated file.
> 
> Indeed. Here is a patch which adjusts the script doing the update
> to exclude those files.
> 
> gdb/ChangeLog:
> 
>         * copypright.py (EXCLUDE_LIST): Add 'gnulib/config.in' and
>         'gnulib/Makefile.in' to the list.
> 
> OK to push to master?
> 
> Thanks!
> -- 
> Joel
> 

I didn't try it, but it looks good to me.

Thanks!

Simon
  
Joel Brobecker Feb. 25, 2020, 3:39 a.m. UTC | #2
> > gdb/ChangeLog:
> > 
> >         * copypright.py (EXCLUDE_LIST): Add 'gnulib/config.in' and
> >         'gnulib/Makefile.in' to the list.
> > 
> > OK to push to master?
> 
> I didn't try it, but it looks good to me.

Thanks Simon. I tried the change before sending, making sure it doesn't
update the files we've put in the exclusion list.

Pushed to master. Thanks for the review :).
  

Patch

From 182ab462fc7dd7f6641167bcc9835c8af50519ec Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@adacore.com>
Date: Mon, 24 Feb 2020 12:20:08 +0400
Subject: [PATCH] gdb/copyright.py: Add generated files in gnulib/ to exclude
 list

This will prevent this script from updating the copyright year range
for those files.

Note that aclocal.m4 and configure are already in the EXCLUDE_ALL_LIST,
so they don't need to be added to the EXCLUDE_LIST.

gdb/ChangeLog:

        * copypright.py (EXCLUDE_LIST): Add 'gnulib/config.in' and
        'gnulib/Makefile.in' to the list.
---
 gdb/copyright.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gdb/copyright.py b/gdb/copyright.py
index baa799de927..6fc7e1f461a 100644
--- a/gdb/copyright.py
+++ b/gdb/copyright.py
@@ -190,7 +190,9 @@  def main ():
 EXCLUDE_LIST = (
     'gdb/nat/glibc_thread_db.h',
     'gdb/CONTRIBUTE',
-    'gnulib/import'
+    'gnulib/import',
+    'gnulib/config.in',
+    'gnulib/Makefile.in',
 )
 
 # Files which should not be modified, either because they are
-- 
2.17.1