Message ID | Y8UfdUzj63BuX6oj@tucnak |
---|---|
State | New |
Headers |
Return-Path: <gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org> X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1767E3858D32 for <patchwork@sourceware.org>; Mon, 16 Jan 2023 09:57:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1767E3858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1673863069; bh=m542BKgX8Yrs6Soy4ulW+NL9qnRnp/e/n7xmLqBNCmg=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=aDXsWMS/j7zUohdrxUCvi6yPKQkI7rJ3KCT7kQHVQL0V8HjuJIBjxALysMFFF6xDY nAMbXetYs1zWNLyCg0y7m8P4X6arTz22yOIuK1EpNUTmvFyGzTdwV1/CiOnZnXjS9m Ss6d4e4hdfH0OmxzJXb/28T5748T0RqJrj90IYJg= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 5F73E3858D32 for <gcc-patches@gcc.gnu.org>; Mon, 16 Jan 2023 09:57:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5F73E3858D32 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-570-uVUYA_hcMiikFhWOLQxsHA-1; Mon, 16 Jan 2023 04:57:15 -0500 X-MC-Unique: uVUYA_hcMiikFhWOLQxsHA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1CED42805580; Mon, 16 Jan 2023 09:57:15 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.223]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C8B50492B10; Mon, 16 Jan 2023 09:57:14 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 30G9vBo03488522 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 16 Jan 2023 10:57:11 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 30G9vAAH3488521; Mon, 16 Jan 2023 10:57:10 +0100 Date: Mon, 16 Jan 2023 10:57:09 +0100 To: Richard Biener <rguenther@suse.de>, Martin =?utf-8?b?TGnFoWth?= <mliska@suse.cz>, Gaius Mulley <gaiusmod2@gmail.com> Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] contrib: Partial fix for failed update-copyright --this year [PR108413] Message-ID: <Y8UfdUzj63BuX6oj@tucnak> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list <gcc-patches.gcc.gnu.org> List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe> List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/> List-Post: <mailto:gcc-patches@gcc.gnu.org> List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help> List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe> From: Jakub Jelinek via Gcc-patches <gcc-patches@gcc.gnu.org> Reply-To: Jakub Jelinek <jakub@redhat.com> Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" <gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org> |
Series |
contrib: Partial fix for failed update-copyright --this year [PR108413]
|
|
Commit Message
Jakub Jelinek
Jan. 16, 2023, 9:57 a.m. UTC
Hi! As mentioned on IRC or in PR108413, the last update-copyright.py --this year failed and that is why we are in a strange state where some copyrights have been updated and others have not. The full list of errors I got was I think: gcc/m2/mc-boot/GmcOptions.c: unrecognised copyright: comment (f, (const char *) "Copyright (C) ''2021'' Free Software Foundation, Inc.", 53); gcc/m2/mc-boot/GmcOptions.c: unrecognised copyright: comment (f, (const char *) "Copyright (C) ''2021'' Free Software Foundation, Inc.", 53); gcc/testsuite/gm2/switches/pedantic-params/pass/Strings.mod: unrecognised copyright holder: Faculty of Information Technology, gcc/testsuite/gm2/switches/pedantic-params/pass/Strings2.mod: unrecognised copyright holder: Faculty of Information Technology, libphobos/libdruntime/__builtins.di: unrecognised copyright: * Copyright: Copyright Digital Mars 2022 libstdc++-v3/src/c++17/fast_float/fast_float.h: unrecognised copyright holder: The fast_float authors libstdc++-v3/include/c_compatibility/stdatomic.h: unrecognised copyright holder: The GCC developers The following patch deals with the gcc/testsuite/gm2 ones and with the fast_float.h one, ok for trunk? Not really sure what we should do in the GmcOptions.c case (perhaps obfuscate it in the source somehow by splitting the string literals into different substrings Perhaps "Copy" "right (" "C) ''..." would do it? Or do we want to bump there each year (manually or by the script)? E.g. in gcc.cc we have printf ("Copyright %s 2023 Free Software Foundation, Inc.\n", _("(C)")); which also prints (C) nicer in Unicode if possible and is updated by hand each year. I have no idea about the libphobos case, we have tons of libphobos/src/std/format/spec.d:Copyright: Copyright The D Language Foundation 2000-2013. libphobos/src/std/random.d:Copyright: Copyright Andrei Alexandrescu 2008 - 2009, Joseph Rushton Wakeling 2012. etc. lines and those aren't reported as errors. And the last one is that I think for The GCC developers we should treat it similarly like FSF and bump copyright on it. Would canon_gcc = 'The GCC developers' self.add_package_author ('The GCC developers', canon_gcc) self.add_package_author ('The GCC Developers', canon_gcc) or something similar do the trick? 2023-01-16 Jakub Jelinek <jakub@redhat.com> PR other/108413 * update-copyright.py (TestsuiteFilter): Add .mod and .rs extensions. (GCCCopyright): Add 'The fast_float authors' as external author. Jakub
Comments
On Mon, 16 Jan 2023, Jakub Jelinek wrote: > Hi! > > As mentioned on IRC or in PR108413, the last update-copyright.py --this year > failed and that is why we are in a strange state where some copyrights have > been updated and others have not. > The full list of errors I got was I think: > gcc/m2/mc-boot/GmcOptions.c: unrecognised copyright: comment (f, (const char *) "Copyright (C) ''2021'' Free Software Foundation, Inc.", 53); > gcc/m2/mc-boot/GmcOptions.c: unrecognised copyright: comment (f, (const char *) "Copyright (C) ''2021'' Free Software Foundation, Inc.", 53); > gcc/testsuite/gm2/switches/pedantic-params/pass/Strings.mod: unrecognised copyright holder: Faculty of Information Technology, > gcc/testsuite/gm2/switches/pedantic-params/pass/Strings2.mod: unrecognised copyright holder: Faculty of Information Technology, > libphobos/libdruntime/__builtins.di: unrecognised copyright: * Copyright: Copyright Digital Mars 2022 > libstdc++-v3/src/c++17/fast_float/fast_float.h: unrecognised copyright holder: The fast_float authors > libstdc++-v3/include/c_compatibility/stdatomic.h: unrecognised copyright holder: The GCC developers > > The following patch deals with the gcc/testsuite/gm2 ones and > with the fast_float.h one, ok for trunk? OK > Not really sure what we should do in the GmcOptions.c case > (perhaps obfuscate it in the source somehow by splitting > the string literals into different substrings > Perhaps "Copy" "right (" "C) ''..." would do it? Or do we want > to bump there each year (manually or by the script)? > E.g. in gcc.cc we have > printf ("Copyright %s 2023 Free Software Foundation, Inc.\n", > _("(C)")); > which also prints (C) nicer in Unicode if possible and is updated > by hand each year. > > I have no idea about the libphobos case, we have tons of > libphobos/src/std/format/spec.d:Copyright: Copyright The D Language Foundation 2000-2013. > libphobos/src/std/random.d:Copyright: Copyright Andrei Alexandrescu 2008 - 2009, Joseph Rushton Wakeling 2012. > etc. lines and those aren't reported as errors. > > And the last one is that I think for The GCC developers we should treat it > similarly like FSF and bump copyright on it. > Would > canon_gcc = 'The GCC developers' > self.add_package_author ('The GCC developers', canon_gcc) > self.add_package_author ('The GCC Developers', canon_gcc) > or something similar do the trick? > > 2023-01-16 Jakub Jelinek <jakub@redhat.com> > > PR other/108413 > * update-copyright.py (TestsuiteFilter): Add .mod and .rs extensions. > (GCCCopyright): Add 'The fast_float authors' as external author. > > --- contrib/update-copyright.py.jj 2023-01-06 10:01:50.217579023 +0100 > +++ contrib/update-copyright.py 2023-01-16 10:39:08.786185284 +0100 > @@ -596,6 +596,8 @@ class TestsuiteFilter (GenericFilter): > '.go', > '.inc', > '.java', > + '.mod', > + '.rs' > ]) > > def skip_file (self, dir, filename): > @@ -733,6 +735,7 @@ class GCCCopyright (Copyright): > self.add_external_author ('Stephen L. Moshier') > self.add_external_author ('Sun Microsystems, Inc. All rights reserved.') > self.add_external_author ('The D Language Foundation, All Rights Reserved') > + self.add_external_author ('The fast_float authors') > self.add_external_author ('The Go Authors. All rights reserved.') > self.add_external_author ('The Go Authors. All rights reserved.') > self.add_external_author ('The Go Authors.') > > Jakub > >
Jakub Jelinek <jakub@redhat.com> writes: > Hi! > > As mentioned on IRC or in PR108413, the last update-copyright.py --this year > failed and that is why we are in a strange state where some copyrights have > been updated and others have not. > The full list of errors I got was I think: > gcc/m2/mc-boot/GmcOptions.c: unrecognised copyright: comment (f, (const char *) "Copyright (C) ''2021'' Free Software Foundation, Inc.", 53); > gcc/m2/mc-boot/GmcOptions.c: unrecognised copyright: comment (f, (const char *) "Copyright (C) ''2021'' Free Software Foundation, Inc.", 53); > gcc/testsuite/gm2/switches/pedantic-params/pass/Strings.mod: unrecognised copyright holder: Faculty of Information Technology, > gcc/testsuite/gm2/switches/pedantic-params/pass/Strings2.mod: unrecognised copyright holder: Faculty of Information Technology, > libphobos/libdruntime/__builtins.di: unrecognised copyright: * Copyright: Copyright Digital Mars 2022 > libstdc++-v3/src/c++17/fast_float/fast_float.h: unrecognised copyright holder: The fast_float authors > libstdc++-v3/include/c_compatibility/stdatomic.h: unrecognised copyright holder: The GCC developers > > The following patch deals with the gcc/testsuite/gm2 ones and > with the fast_float.h one, ok for trunk? > > Not really sure what we should do in the GmcOptions.c case > (perhaps obfuscate it in the source somehow by splitting > the string literals into different substrings > Perhaps "Copy" "right (" "C) ''..." would do it? Or do we want > to bump there each year (manually or by the script)? > E.g. in gcc.cc we have > printf ("Copyright %s 2023 Free Software Foundation, Inc.\n", > _("(C)")); > which also prints (C) nicer in Unicode if possible and is updated > by hand each year. > Hi, I've git pushed some fixes for gcc/m2/mc/mcOptions.mod to obfuscate the copyright text. The change to mcOptions.mod also includes the removal of the 'YEAR' constant and it queries the system for the year. A summary of the ChangeLog: gcc/m2/ChangeLog: * mc-boot/GmcOptions.c: Rebuilt. * mc/mcOptions.mod (displayVersion): Split first printf into three components * mc/mcOptions.mod (YEAR): Remove. (getYear): New procedure function. (displayVersion): Use result from getYear instead of YEAR. Emit boilerplate for GPL v3. (gplBody): Use result from getYear instead of YEAR. (glplBody): Use result from getYear instead of YEAR. regards, Gaius
--- contrib/update-copyright.py.jj 2023-01-06 10:01:50.217579023 +0100 +++ contrib/update-copyright.py 2023-01-16 10:39:08.786185284 +0100 @@ -596,6 +596,8 @@ class TestsuiteFilter (GenericFilter): '.go', '.inc', '.java', + '.mod', + '.rs' ]) def skip_file (self, dir, filename): @@ -733,6 +735,7 @@ class GCCCopyright (Copyright): self.add_external_author ('Stephen L. Moshier') self.add_external_author ('Sun Microsystems, Inc. All rights reserved.') self.add_external_author ('The D Language Foundation, All Rights Reserved') + self.add_external_author ('The fast_float authors') self.add_external_author ('The Go Authors. All rights reserved.') self.add_external_author ('The Go Authors. All rights reserved.') self.add_external_author ('The Go Authors.')