On Sat, 24 Aug 2024 at 14:55, Jonathan Wakely <jwak...@redhat.com> wrote:
>
> On Sat, 24 Aug 2024 at 14:14, Jason Merrill wrote:
> >
> > On 8/23/24 8:41 AM, Jonathan Wakely wrote:
> > > Tested x86_64-linux. OK for trunk?
> >
> > OK.
>
> I've just noticed that this changes the copyright dates from 2022-2024
> to just 2024 (see the excerpts of the patch retained below). The
> python script just prints the current year, so have previous edits to
> that file manually restored the "2022-" part after auto-generating it?
>
> Do we want this change to the script, so that the generated files
> don't need to be fixed up?
>
> --- a/gcc/cp/gen-cxxapi-file.py
> +++ b/gcc/cp/gen-cxxapi-file.py
> @@ -95,7 +95,7 @@ def hints(script, content):
> %struct-type
> %{{
> /* This file is auto-generated by {:s}. */
> -/* Copyright (C) {:s} Free Software Foundation, Inc.
> +/* Copyright (C) 2022-{:s} Free Software Foundation, Inc.
>
> This file is part of GCC.
>
Instead of printing time.strftime("%Y") as a string using {:s}, we
could just print time.gmtime().tm_year as {:d}.
Or datetime.datetime.today().year.
But the current code works, so there's no real need for that. Adding
the "2022-" seems useful though.
>
> > > diff --git a/gcc/cp/std-name-hint.gperf b/gcc/cp/std-name-hint.gperf
> > > index 4fb23da40a6..63a8a041685 100644
> > > --- a/gcc/cp/std-name-hint.gperf
> > > +++ b/gcc/cp/std-name-hint.gperf
> > > @@ -3,7 +3,7 @@
> > > %struct-type
> > > %{
> > > /* This file is auto-generated by gen-cxxapi-file.py. */
> > > -/* Copyright (C) 2022-2024 Free Software Foundation, Inc.
> > > +/* Copyright (C) 2024 Free Software Foundation, Inc.
> > >
> > > This file is part of GCC.
> > >
>
> [...]
>
> > > diff --git a/gcc/cp/std-name-hint.h b/gcc/cp/std-name-hint.h
> > > index 231689355d1..faa6362b946 100644
> > > --- a/gcc/cp/std-name-hint.h
> > > +++ b/gcc/cp/std-name-hint.h
> > > @@ -31,7 +31,7 @@
> > > #line 4 "std-name-hint.gperf"
> > >
> > > /* This file is auto-generated by gen-cxxapi-file.py. */
> > > -/* Copyright (C) 2022-2024 Free Software Foundation, Inc.
> > > +/* Copyright (C) 2024 Free Software Foundation, Inc.
> > >
> > > This file is part of GCC.
> > >
