From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 533F33858D32; Mon, 16 Jan 2023 10:04:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 533F33858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1673863461; bh=hr8UZ0AZdgmqxJm0GOA5qrFXUZNl620MMsi6naI8NM8=; h=From:To:Subject:Date:From; b=JJG0+c+2q2B+5eAZtluuyFVxuz/SFkmyBCDt7XHOgqOT5ow4tUtRP1vAcQklWBhhJ Uiy79f6iMysDbjxm/E83rIU3crz1DcDiRp/DoDVXk34dKUCTHGhe+wB9OsAWFw2zQx uBiv/i2n93n5ciwxkfZwxyPG3byaQxWhBMcQq/fM= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5187] contrib: Partial fix for failed update-copyright --this year [PR108413] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: 6b0907b4fc455377e5f8109f427d97da02b6aec9 X-Git-Newrev: d1c6a352cad473edbacecad5ceb49eaaa4e67a52 Message-Id: <20230116100421.533F33858D32@sourceware.org> Date: Mon, 16 Jan 2023 10:04:21 +0000 (GMT) List-Id: https://gcc.gnu.org/g:d1c6a352cad473edbacecad5ceb49eaaa4e67a52 commit r13-5187-gd1c6a352cad473edbacecad5ceb49eaaa4e67a52 Author: Jakub Jelinek Date: Mon Jan 16 11:03:30 2023 +0100 contrib: Partial fix for failed update-copyright --this year [PR108413] 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 PR other/108413 * update-copyright.py (TestsuiteFilter): Add .mod and .rs extensions. (GCCCopyright): Add 'The fast_float authors' as external author. Diff: --- contrib/update-copyright.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/update-copyright.py b/contrib/update-copyright.py index 06e6fb61757..529032c677b 100755 --- a/contrib/update-copyright.py +++ b/contrib/update-copyright.py @@ -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.')