From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: zhijux.fan@intel.com) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by groups.io with SMTP; Thu, 05 Sep 2019 20:29:58 -0700 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Sep 2019 20:29:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,472,1559545200"; d="dat'59?scan'59,208,59";a="184424801" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga007.fm.intel.com with ESMTP; 05 Sep 2019 20:29:57 -0700 Received: from fmsmsx119.amr.corp.intel.com (10.18.124.207) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 5 Sep 2019 20:29:57 -0700 Received: from shsmsx154.ccr.corp.intel.com (10.239.6.54) by FMSMSX119.amr.corp.intel.com (10.18.124.207) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 5 Sep 2019 20:29:56 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.92]) by SHSMSX154.ccr.corp.intel.com ([169.254.7.195]) with mapi id 14.03.0439.000; Fri, 6 Sep 2019 11:29:54 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [PATCH] BaseTools:Ecc handle another copyright format Thread-Topic: [PATCH] BaseTools:Ecc handle another copyright format Thread-Index: AdVkY1h9VWD18ggzSTqQnQBM91HsaA== Date: Fri, 6 Sep 2019 03:29:54 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zhijux.fan@intel.com X-Groupsio-MsgNum: 46956 Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFBA06BSHSMSX101ccrcor_" Content-Language: en-US --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFBA06BSHSMSX101ccrcor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2057 Ecc can not handle the copyright format like (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP
This will cause Ecc to report wrong information. This patch is going to handle this format Cc: Liming Gao Cc: Bob Feng Signed-off-by: Zhiju.Fan --- BaseTools/Source/Python/Ecc/c.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/Ecc/c.py b/BaseTools/Source/Python/Ecc= /c.py index a99b40a701..a30122a45f 100644 --- a/BaseTools/Source/Python/Ecc/c.py +++ b/BaseTools/Source/Python/Ecc/c.py @@ -2388,7 +2388,7 @@ def CheckFileHeaderDoxygenComments(FullFileName): PrintErrorMsg(ERROR_HEADER_CHECK_FILE, 'File header co= mment content should start with two spaces at each line', FileTable, ID) =20 CommentLine =3D CommentLine.strip() - if CommentLine.startswith('Copyright'): + if CommentLine.startswith('Copyright') or ('Copyright' in Comm= entLine and CommentLine.lower().startswith('(c)')): NoCopyrightFlag =3D False if CommentLine.find('All rights reserved') =3D=3D -1: for Copyright in EccGlobalData.gConfig.Copyright: --=20 2.14.1.windows.1 --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFBA06BSHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+ImdSAQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEJgAEAIQAAADk0QzBBREYx RDgyN0E1NDY4RUQyOTYyMEM0RjE4QzgxADcHAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHCQAGAAMA HQA2AAUAVAEBIIADAA4AAADjBwkABgADAB0ANgAFAFQBAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABADYAAABbUEFUQ0hdIEJhc2VUb29sczpFY2MgaGFuZGxlIGFub3RoZXIg Y29weXJpZ2h0IGZvcm1hdABYEwELgAEAIQAAADk0QzBBREYxRDgyN0E1NDY4RUQyOTYyMEM0RjE4 QzgxADcHAQOQBgD0DQAAMwAAAAIBfwABAAAASAAAADxGQUQwRDdFMEFFMEZBNTREOTg3RjZFNzI0 MzVDQUZENTBBRkJBMDZCQFNIU01TWDEwMS5jY3IuY29ycC5pbnRlbC5jb20+AAsAHw4BAAAAAgEJ EAEAAABtBAAAaQQAAEMHAABMWkZ1KxLqsGEACmZiaWQEAABjY8BwZzEyNTIA/gND8HRleHQB9wKk A+MCAARjaArAc2V0MCDvB20CgwBQEU0yCoAGtAKAln0KgAjIOwliMTkOwL8JwxZyCjIWcQKAFWIq CbBzCfAEkGF0BbIOUANgc6JvAYAgRXgRwW4YMF0GUnYEkBe2AhByAMB0fQhQbhoxECAFwAWgG2Rk miADUiAQIheyXHYIkOR3awuAZDUdUwTwB0ANF3AwCnEX8mJrbWsGcwGQACAgQk1fQuBFR0lOfQr8 AfEL8REfsFo6aAJAcHM6wC8vYnVnegMQC2AkLnQHMG5vBaFlLgEFsGcvc2hvd19BIlEuY2dpPw3Q PaEB0DU3XGwLgGUKgfElFEVjYxvQA5EjEAVAbRmhZB5wHMBoGeAFoHC6eQUQZyHQHHAa8yAlEIRr ZSUMKEMpIAhQIyd2AdAxNS0qYTYgTkgH0B5wAkAgUADQa28LERlgAjAEkHAFEBIAIGxEZRowCQBw B4ACMCBATFA8QlI+JQxUumgEACAD8CKgJhF1LIHrJeIYkCAJcHAJES7wA2CtGcAgC4Aa5GkCIC4t 3zsEIAqwdBHAMOAEIGdvfwuAMNAv8SanLtEa5CUMQ5xjOi1gB3AzkkdhMACmPCUQNmIuZzbAQAuA PRAgbCRAA3AtxjYCQm9YYiBGCfAw0DwG4GL5JEAuZjlRN68UwCegGFCEZC0ZMGYtYnk2IEJaLsBq dS5GA5E8Ono8Yng58ABwOk8KLZc+wCUFH7BhEgBUbwbwCHMvUwhhY2UvUNZ5JxACIC8l4S854Cdw pCB8KlAgKz7nMRxw5wMQJzEZo2QsQlELgBIA4wAgMXEoKylDQgEAKzG5Q+ItKSUMDeABICA+wLMk YAVAYS8/f0COYkbfH0fuJQUdsRAwRrA5OWIQNDBhNypwLi5hgjMqcDIyYTQ1RkDxHpE2NDQ+WEa/ Sf9LBp4rUPBI709vSwZAQEZQwDIzODgsN0GwVAXfU8EBASmwJyAroEZCkSsAwmEEgURveHkYMQhQ wm0tInMoRnUioFWy5E5hB4ApOj72WK9Y4SZQBRACMEVyA2ByTQBzZyhFUlJPUiBfSEVBRFrQX0MB WzBDS19GSUxF/UNAJ1WyJpBWAxvRVuMb0v8QIC1BI8FXYBxgH2QD8CcQ9RzAdzAAcwqwUjAEICgx t1YAMxElEidDQFWyVAGg8x5wQ0BJREUmAzBYT1jgp1bFNkAYUCA9Y4ouH2D9BREoRSZOQFjpBpBk bR+B0wPhJxAoJynHJ1gXURD3Zj9nT2hdIAWxaHow4WOLdyaxZGsJAHcEkGWAa3sonGMpaSBYH3IX Tm8px/5GC2Aw0GRQPLBRwCiWch/vap1CgB3AaHBBLyEnkwQgVwlwQ6EaMGRs0T1kUC1+MXGfedoa 4Sm5bgEl4Ue1CQBiB0BEGIAiwGcbQT9CgCQwKcd5Fk4xJQUyLnQxNH8QLgPwHcAj4HMPfxAlDBVC gSAAAAAfAEIAAQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfAGUAAQAAACoAAAB6AGgA aQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AZAABAAAACgAAAFMATQBU AFAAAAAAAAIBQQABAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwAIABaAGgA aQBqAHUAWAAAAFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBv AG0AAAAfAAJdAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0A AAAAAB8A5V8BAAAAMgAAAHMAaQBwADoAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAu AGMAbwBtAAAAAAAfABoMAQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfAB8MAQAAACoA AAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AHgwBAAAACgAA AFMATQBUAFAAAAAAAAIBGQwBAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwA IABaAGgAaQBqAHUAWAAAAFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBs AC4AYwBvAG0AAAAfAAFdAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4A YwBvAG0AAAAAAB8A+D8BAAAAGAAAAEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAB8AI0ABAAAAKgAA AHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwAiQAEAAAAKAAAA UwBNAFQAUAAAAAAAAgH5PwEAAABkAAAAAAAAAIErH6S+oxAZnW4A3QEPVAIAAACARgBhAG4ALAAg AFoAaABpAGoAdQBYAAAAUwBNAFQAUAAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwA LgBjAG8AbQAAAB8ACV0BAAAAKgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBj AG8AbQAAAAAACwBAOgEAAAAfABoAAQAAABIAAABJAFAATQAuAE4AbwB0AGUAAAAAAAMA8T8JBAAA CwBAOgEAAAADAP0/5AQAAAIBCzABAAAAEAAAAJTArfHYJ6VGjtKWIMTxjIEDABcAAQAAAEAAOQAA JUxZY2TVAUAACDBxeKtZY2TVAR8AAICGAwIAAAAAAMAAAAAAAABGAQAAAB4AAABhAGMAYwBlAHAA dABsAGEAbgBnAHUAYQBnAGUAAAAAAAEAAAAMAAAAZQBuAC0AVQBTAAAAHwA3AAEAAABsAAAAWwBQ AEEAVABDAEgAXQAgAEIAYQBzAGUAVABvAG8AbABzADoARQBjAGMAIABoAGEAbgBkAGwAZQAgAGEA bgBvAHQAaABlAHIAIABjAG8AcAB5AHIAaQBnAGgAdAAgAGYAbwByAG0AYQB0AAAAHwA9AAEAAAAC AAAAAAAAAAMANgAAAAAAAgFxAAEAAAAWAAAAAdVkY1h9VWD18ggzSTqQnQBM91HsaAAAHwBwAAEA AABsAAAAWwBQAEEAVABDAEgAXQAgAEIAYQBzAGUAVABvAG8AbABzADoARQBjAGMAIABoAGEAbgBk AGwAZQAgAGEAbgBvAHQAaABlAHIAIABjAG8AcAB5AHIAaQBnAGgAdAAgAGYAbwByAG0AYQB0AAAA HwA1EAEAAACQAAAAPABGAEEARAAwAEQANwBFADAAQQBFADAARgBBADUANABEADkAOAA3AEYANgBF ADcAMgA0ADMANQBDAEEARgBEADUAMABBAEYAQgBBADAANgBCAEAAUwBIAFMATQBTAFgAMQAwADEA LgBjAGMAcgAuAGMAbwByAHAALgBpAG4AdABlAGwALgBjAG8AbQA+AAAAAwDeP59OAABAAAcwfi6p WWNk1QECAQsAAQAAABAAAACUwK3x2CelRo7SliDE8YyBAwAmAAAAAAACAUcAAQAAADIAAABjPVVT O2E9TUNJO3A9SW50ZWw7bD1TSFNNU1gxMDEtMTkwOTA2MDMyOTU0Wi00NzYzAAAAAgEQMAEAAABG AAAAAAAAACZ3vTk77DhJpKYVPcule0IHAPrQ1+CuD6VNmH9uckNcr9UAAABEEV4AAKaTaDaIdmxL p0rT60eaTGQAAAlUwAYAAAAAHwD6PwEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAAwAJ WQEAAABAAACACCAGAAAAAADAAAAAAAAARgAAAAC/hQAAoAiDWGNk1QELAACACCAGAAAAAADAAAAA AAAARgAAAACChQAAAAAAAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAABgAAABkAGwAcAAtAHAAcgBv AGQAdQBjAHQAAAABAAAAGgAAAGQAbABwAGUALQB3AGkAbgBkAG8AdwBzAAAAAAAfAACAhgMCAAAA AADAAAAAAAAARgEAAAAYAAAAZABsAHAALQB2AGUAcgBzAGkAbwBuAAAAAQAAABIAAAAxADEALgAy AC4AMAAuADYAAAAAAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAABoAAABkAGwAcAAtAHIAZQBhAGMA dABpAG8AbgAAAAAAAQAAABQAAABuAG8ALQBhAGMAdABpAG8AbgAAAAMADTT9PwAAHwAAgIYDAgAA AAAAwAAAAAAAAEYBAAAAIAAAAHgALQBtAHMALQBoAGEAcwAtAGEAdAB0AGEAYwBoAAAAAQAAAAIA AAAAAAAAHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAAIgAAAHgALQBvAHIAaQBnAGkAbgBhAHQAaQBu AGcALQBpAHAAAAAAAAEAAAAgAAAAWwAxADAALgAyADMAOQAuADEAMgA3AC4ANAAwAF0AAABB7g== --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFBA06BSHSMSX101ccrcor_--