From patchwork Mon Jan 16 09:57:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 44048 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1106698wrn; Mon, 16 Jan 2023 01:58:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXu6co0ECDckcsCNBFJDUK/Xp3Dx5l0vTyqA0jPFMwxt3F+/EsG8rUCu6Tys8ZOoPU98XwzP X-Received: by 2002:a05:6402:5515:b0:491:6ea2:e875 with SMTP id fi21-20020a056402551500b004916ea2e875mr38000704edb.35.1673863085421; Mon, 16 Jan 2023 01:58:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673863085; cv=none; d=google.com; s=arc-20160816; b=0iW8y2Nnjsmo1NtHQ5EG/O8pUZcTXGy82myXEFFqRB3Tqc7RQK4mVSAkmOrWMILBkL IJC96W/Hbm1MHK3WWQ8EIMWjFa/1X+I+MOLOW4WndK/JI5IcmamRNbI2zhn8XAzXli5J 6klnTnkPqmItrmNWy8a5jwq6ZuRXWVowmGAp3xmgFoh1dGhVTWdvyTIfQwCYKJdhbe+W 4cwLntm6OnS3wteExPT+9L9jModFSCaUoxNwVwaNqaeJykXtR4MJJEqFL+c8BCBLpdyG Jr834cCihMfXETVsym1srtvo6OjLYHnh1z9uE37E0tngtIga7NBESgKCY2AjAeh4L/eE qzFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:cc:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=m542BKgX8Yrs6Soy4ulW+NL9qnRnp/e/n7xmLqBNCmg=; b=wV4aOrTTELBo4zyRI4QZlZehu2amXj30XwLkhgDCrLAzbL+WMPu145dFI6a8darcfc nzIrolReFkZt8TUwKB1YQAlx0SGHChb2Wd8YA4eCKqraKDCILb7C+pJ69Okw0EY6oSlY gPFBmSNOQ2A9pi7ZDDIGnccI7jqw+IA92iZ4zfas8EvwW69Iq10URMEju1beqUzsyDq4 vyAxC+YTnMU6YuUo3NeQ6E68GloQBWJ6Z8KWV1+Uvm/PwdJbtXPW3geNwV5NhXuVW2uU sjoZLBEwxyrwNORy6hU1MByYLT3k0Zqzz+UYzIVb+YjB0O9W1Ehq0mXW2LESxc7ctV+K AONw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=ivYge8jr; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id q24-20020a056402033800b0048e1008c744si25899863edw.147.2023.01.16.01.58.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 01:58:05 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=ivYge8jr; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3C79C3858C53 for ; Mon, 16 Jan 2023 09:58:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3C79C3858C53 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1673863084; 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=ivYge8jrjdVc7u7HDTLr/cOv/8MeycyjTWrbAytPyrvlazGAM7nMNCQ+H667/5UXM wCk1Doy7/WO7XpFN/9yPADNt7vRKL7qIX3vRK8q2LqzIRtPU1NlpAZ+MI02WgLR37O 2ORkLeEKj9IC8FCTvO9/TBKoIoco68pKffRYxuHY= 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 ; 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 , Martin =?utf-8?b?TGnFoWth?= , Gaius Mulley Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] contrib: Partial fix for failed update-copyright --this year [PR108413] Message-ID: 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-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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jakub Jelinek via Gcc-patches From: Jakub Jelinek Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755172658491524594?= X-GMAIL-MSGID: =?utf-8?q?1755172658491524594?= 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 PR other/108413 * update-copyright.py (TestsuiteFilter): Add .mod and .rs extensions. (GCCCopyright): Add 'The fast_float authors' as external author. Jakub --- 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.')