From d77cc2063de7be8a1b28ef2efb5770df4578975a Mon Sep 17 00:00:00 2001 From: Hess Chen Date: Thu, 2 Jul 2015 06:05:26 +0000 Subject: [PATCH] BaseTools/Ecc: Fix a bug when checking copyright format Fix a bug to only checking the copyright listed in config.ini file. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hess Chen Reviewed-by: YangX Li git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17801 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Source/Python/Ecc/Configuration.py | 5 +++++ BaseTools/Source/Python/Ecc/c.py | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/Ecc/Configuration.py b/BaseTools/Source/Python/Ecc/Configuration.py index da53f5f6f8..5262b685a5 100644 --- a/BaseTools/Source/Python/Ecc/Configuration.py +++ b/BaseTools/Source/Python/Ecc/Configuration.py @@ -274,6 +274,9 @@ class Configuration(object): # A list for only scanned folders self.ScanOnlyDirList = [] + + # A list for Copyright format + self.Copyright = [] self.ParseConfig() @@ -302,6 +305,8 @@ class Configuration(object): List[1] = GetSplitValueList(List[1], TAB_COMMA_SPLIT) if List[0] == 'BinaryExtList': List[1] = GetSplitValueList(List[1], TAB_COMMA_SPLIT) + if List[0] == 'Copyright': + List[1] = GetSplitValueList(List[1], TAB_COMMA_SPLIT) self.__dict__[List[0]] = List[1] def ShowMe(self): diff --git a/BaseTools/Source/Python/Ecc/c.py b/BaseTools/Source/Python/Ecc/c.py index 1e89f11728..a7eefa1e07 100644 --- a/BaseTools/Source/Python/Ecc/c.py +++ b/BaseTools/Source/Python/Ecc/c.py @@ -2364,7 +2364,10 @@ def CheckFileHeaderDoxygenComments(FullFileName): if CommentLine.startswith('Copyright'): NoCopyrightFlag = False if CommentLine.find('All rights reserved') == -1: - PrintErrorMsg(ERROR_HEADER_CHECK_FILE, '""All rights reserved"" announcement should be following the ""Copyright"" at the same line', FileTable, ID) + for Copyright in EccGlobalData.gConfig.Copyright: + if CommentLine.find(Copyright) > -1: + PrintErrorMsg(ERROR_HEADER_CHECK_FILE, '""All rights reserved"" announcement should be following the ""Copyright"" at the same line', FileTable, ID) + break if CommentLine.endswith('
') == -1: PrintErrorMsg(ERROR_HEADER_CHECK_FILE, 'The ""
"" at the end of the Copyright line is required', FileTable, ID) if NextLineIndex < len(CommentStrList) and CommentStrList[NextLineIndex].strip().startswith('Copyright') == False and CommentStrList[NextLineIndex].strip(): -- 2.39.2