From patchwork Tue Jan 13 17:06:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 428534 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2C3F714007D for ; Wed, 14 Jan 2015 04:07:10 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:references:date:in-reply-to:message-id :mime-version:content-type:content-transfer-encoding; q=dns; s= default; b=oBK2XO/A6LOAOLxnC18VH7WKsoBZHmMCopeI/EWOraU208wAZBSlr E676xFoR2lPQTbUbbv15/SRHt8VKWHzNL7epetbWtzx0jtoaHXnZ2o+z3w5cirqM BizyTIDRP5EObbndyNOXmCesdxhIv+Fdo/c4JS1KflBj0YKvDJ8zNA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:references:date:in-reply-to:message-id :mime-version:content-type:content-transfer-encoding; s=default; bh=/ssB3dNEItpwC125kbq0fAvOL1s=; b=V8MhFSU4MV5E65s9opw01EYhjZhc fqdEOGO0SRIRh8sKGFqJj1Uo6S/a/9/AP8mPWHYC3nIjj/Cl9azgBdTZ9OUj95ug fl7IlMyn6nZmmhTSIHTxoefh/vfwXMupcCVqzZZpW+bnkf7p2nvdf+rmvxndIA+Q Op6NGQIA+Mk3QEI= Received: (qmail 13881 invoked by alias); 13 Jan 2015 17:06:43 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 13790 invoked by uid 89); 13 Jan 2015 17:06:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, SPF_PASS autolearn=ham version=3.3.2 X-HELO: service87.mimecast.com Received: from service87.mimecast.com (HELO service87.mimecast.com) (91.220.42.44) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 13 Jan 2015 17:06:40 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.140]) by service87.mimecast.com; Tue, 13 Jan 2015 17:06:37 +0000 Received: from localhost ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 13 Jan 2015 17:06:36 +0000 From: Richard Sandiford To: Jakub Jelinek Mail-Followup-To: Jakub Jelinek , gcc-patches@gcc.gnu.org, David Malcolm , richard.sandiford@arm.com Cc: gcc-patches@gcc.gnu.org, David Malcolm Subject: Re: [committed] Update copyright years, part 2 References: <20150105123924.GR1667@tucnak.redhat.com> Date: Tue, 13 Jan 2015 17:06:35 +0000 In-Reply-To: <20150105123924.GR1667@tucnak.redhat.com> (Jakub Jelinek's message of "Mon, 5 Jan 2015 13:39:24 +0100") Message-ID: <87y4p61ug4.fsf@e105548-lin.cambridge.arm.com> User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-MC-Unique: 115011317063704001 Jakub Jelinek writes: > Patch too large to attach uncompressed, this > has been created with update-copyright.py --this-year. > Note, I had to temporarily move away gcc/jit/docs/conf.py, > the python script dies on that and leaves almost all files unchanged. Thanks for doing the update. Is the patch below OK to fix the JIT thing? After this change, update-copyright.py --this-year seems to update gcc/jit correctly (including the texinfo files). Richard contrib/ * update-copyright.py (Copyright.__init__): Add a regexp for "copyright = u'". (Copyright.update_copyright): Don't add a space before the year in that case. Index: contrib/update-copyright.py =================================================================== --- contrib/update-copyright.py 2014-08-05 10:29:02.695491816 +0100 +++ contrib/update-copyright.py 2015-01-13 14:13:43.500812967 +0000 @@ -183,6 +183,7 @@ class Copyright: '|[Cc]opyright\s+%s' '|[Cc]opyright\s+©' '|[Cc]opyright\s+@copyright{}' + '|copyright = u\'' '|@set\s+copyright[\w-]+)' # 2: the years. Include the whitespace in the year, so that @@ -363,7 +364,8 @@ class Copyright: return (False, orig_line, next_line) line = (line[:match.start (2)] - + ' ' + canon_form + self.separator + + ('' if intro.startswith ('copyright = ') else ' ') + + canon_form + self.separator + line[match.end (2):]) # Use the standard (C) form.