From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web11.1717.1587538622304706568 for ; Tue, 21 Apr 2020 23:57:02 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: shenglei.zhang@intel.com) IronPort-SDR: n1HCRdxQdgFvvUHN/GS7klKPlkF3xoHDLlSKSEflrWKrnL90xy+/CosZv8UFo9Tq73A6YEpWi1 oCIMHiWJEnRw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2020 23:57:01 -0700 IronPort-SDR: Al/+h+ZYll1XPwzPdi4fS1gYnRgs34YPxKvMe5dk6LP7DT8PDkcbcfaXGSW0UDjKXI0tHddMdc Ey2kvF6MxjVA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,412,1580803200"; d="scan'208";a="258969164" Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga006.jf.intel.com with ESMTP; 21 Apr 2020 23:57:00 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [PATCH] BaseTools/PatchCheck.py: Add LicenseCheck Date: Wed, 22 Apr 2020 14:56:55 +0800 Message-Id: <20200422065655.75392-1-shenglei.zhang@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 For files to be added to the tree, this feature will check whether it has BSD license. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Shenglei Zhang --- BaseTools/Scripts/PatchCheck.py | 52 ++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py index 13da6967785d..15663d02a3c0 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -491,6 +491,53 @@ class GitDiffCheck: print(prefix, line) count += 1 +class LicenseCheck(): + + def __init__(self, diff): + self.ok = True + self.startcheck = False + self.license = True + lines = diff.splitlines(True) + count = len(lines) + line_index = 0 + for line in lines: + if line.startswith('--- /dev/null'): + nextline = lines[line_index + 1] + added_file = self.Readdedfileformat.search(nextline).group(1) + added_file_extension = os.path.splitext(added_file)[1] + if added_file_extension in self.file_extension_list: + self.startcheck = True + self.license = False + if self.startcheck and self.license_name in line: + self.license = True + if line_index + 1 == count or lines[line_index + 1].startswith('diff --') and self.startcheck: + if not self.license: + self.error(added_file) + self.startcheck = False + self.license = True + line_index = line_index + 1 + + def error(self, *err): + if self.ok and Verbose.level > Verbose.ONELINE: + print('License is missing!') + self.ok = False + if Verbose.level < Verbose.NORMAL: + return + count = 0 + for line in err: + prefix = (' *', ' ')[count > 0] + error_format = 'Missing license in:' + print(prefix, error_format, line) + count += 1 + + + license_name = 'BSD-2-Clause-Patent' + + Readdedfileformat = re.compile(r'\+\+\+ b\/(.*)\n') + + file_extension_list = [".c", ".h", ".inf", ".dsc", ".dec", ".py", ".bat", ".sh", ".uni", ".yaml", ".fdf", ".inc"] + + class CheckOnePatch: """Checks the contents of a git email formatted patch. @@ -508,12 +555,15 @@ class CheckOnePatch: msg_check = CommitMessageCheck(self.commit_subject, self.commit_msg) msg_ok = msg_check.ok + license_check = LicenseCheck(self.diff) + license_ok = license_check.ok + diff_ok = True if self.diff is not None: diff_check = GitDiffCheck(self.diff) diff_ok = diff_check.ok - self.ok = email_ok and msg_ok and diff_ok + self.ok = email_ok and msg_ok and diff_ok and license_ok if Verbose.level == Verbose.ONELINE: if self.ok: -- 2.18.0.windows.1