From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7504E21A04822 for ; Mon, 10 Apr 2017 23:16:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491891400; x=1523427400; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=ZGlQSAOAndl3DXkgUhGOJJvSL9riySB2y0Sg63GD9yY=; b=n1g3MctyPG3Qp3GCX4NYkhokc74wJSVZwdPUYMlsAMXO7si3U5JlrFJ7 MBn5aR8oYRgThJunGdnpquOplpcDUQ==; Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Apr 2017 23:16:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,184,1488873600"; d="scan'208";a="844419874" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by FMSMGA003.fm.intel.com with ESMTP; 10 Apr 2017 23:16:39 -0700 Received: from fmsmsx126.amr.corp.intel.com (10.18.125.43) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 10 Apr 2017 23:16:39 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX126.amr.corp.intel.com (10.18.125.43) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 10 Apr 2017 23:16:39 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.117]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.193]) with mapi id 14.03.0319.002; Tue, 11 Apr 2017 14:16:37 +0800 From: "Zhu, Yonghong" To: "Chen, Hesheng" , "edk2-devel@lists.01.org" Thread-Topic: [patch] BaseTools/ECC: Change check rule for Ifndef statement Thread-Index: AQHSsaYyv75BnRMfAEyBCssxJ9AfAaG/svtg Date: Tue, 11 Apr 2017 06:16:36 +0000 Message-ID: References: <1491793038-58972-1-git-send-email-hesheng.chen@intel.com> In-Reply-To: <1491793038-58972-1-git-send-email-hesheng.chen@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [patch] BaseTools/ECC: Change check rule for Ifndef statement X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2017 06:16:40 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Yonghong Zhu Best Regards, Zhu Yonghong -----Original Message----- From: Chen, Hesheng=20 Sent: Monday, April 10, 2017 10:57 AM To: edk2-devel@lists.01.org Cc: Zhu, Yonghong Subject: [patch] BaseTools/ECC: Change check rule for Ifndef statement Remove the check of Ifndef statement on .c files, only check on .h files. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: hesschen --- BaseTools/Source/Python/Ecc/Check.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/BaseTools/Source/Python/Ecc/Check.py b/BaseTools/Source/Python= /Ecc/Check.py index a22da3d..062120c 100644 --- a/BaseTools/Source/Python/Ecc/Check.py +++ b/BaseTools/Source/Python/Ecc/Check.py @@ -1,7 +1,7 @@ ## @file # This file is used to define checkpoints used by ECC tool # -# Copyright= (c) 2008 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2008 - 2017, Intel Corporation. All rights=20 +reserved.
# This program and the accompanying materials # are licensed and made ava= ilable under the terms and conditions of the BSD License # which accompani= es this distribution. The full text of the license may be found at @@ -941= ,7 +941,7 @@ class Check(object): =20 # Check Guid Format in module INF def MetaDataFileCheckModuleFileGuidFormat(self): - if EccGlobalData.gConfig.MetaDataFileCheckModuleFileGuidFormat or = EccGlobalData.gConfig.MetaDataFileCheckAll =3D=3D '1' or EccGlobalData.gCon= fig.CheckAll =3D=3D '1': + if EccGlobalData.gConfig.MetaDataFileCheckModuleFileGuidFormat =3D= =3D '1' or EccGlobalData.gConfig.MetaDataFileCheckAll =3D=3D '1' or EccGlob= alData.gConfig.CheckAll =3D=3D '1': EdkLogger.quiet("Check Guid Format in module INF ...") Table =3D EccGlobalData.gDb.TblInf SqlCommand =3D """ @@ -984,7 +984,7 @@ class Check(object): =20 # Check Protocol Format in module INF def MetaDataFileCheckModuleFileProtocolFormat(self): - if EccGlobalData.gConfig.MetaDataFileCheckModuleFileProtocolFormat= or EccGlobalData.gConfig.MetaDataFileCheckAll =3D=3D '1' or EccGlobalData.= gConfig.CheckAll =3D=3D '1': + if EccGlobalData.gConfig.MetaDataFileCheckModuleFileProtocolFormat= =3D=3D '1' or EccGlobalData.gConfig.MetaDataFileCheckAll =3D=3D '1' or Ecc= GlobalData.gConfig.CheckAll =3D=3D '1': EdkLogger.quiet("Check Protocol Format in module INF ...") Table =3D EccGlobalData.gDb.TblInf SqlCommand =3D """ @@ -1015,7 +1015,7 @@ class Check(object): =20 # Check Ppi Format in module INF def MetaDataFileCheckModuleFilePpiFormat(self): - if EccGlobalData.gConfig.MetaDataFileCheckModuleFilePpiFormat or E= ccGlobalData.gConfig.MetaDataFileCheckAll =3D=3D '1' or EccGlobalData.gConf= ig.CheckAll =3D=3D '1': + if EccGlobalData.gConfig.MetaDataFileCheckModuleFilePpiFormat =3D= =3D '1' or EccGlobalData.gConfig.MetaDataFileCheckAll =3D=3D '1' or EccGlob= alData.gConfig.CheckAll =3D=3D '1': EdkLogger.quiet("Check Ppi Format in module INF ...") Table =3D EccGlobalData.gDb.TblInf SqlCommand =3D """ @@ -1043,7 +1043,7 @@ class Check(object): =20 # Check Pcd Format in module INF def MetaDataFileCheckModuleFilePcdFormat(self): - if EccGlobalData.gConfig.MetaDataFileCheckModuleFilePcdFormat or E= ccGlobalData.gConfig.MetaDataFileCheckAll =3D=3D '1' or EccGlobalData.gConf= ig.CheckAll =3D=3D '1': + if EccGlobalData.gConfig.MetaDataFileCheckModuleFilePcdFormat =3D= =3D '1' or EccGlobalData.gConfig.MetaDataFileCheckAll =3D=3D '1' or EccGlob= alData.gConfig.CheckAll =3D=3D '1': EdkLogger.quiet("Check Pcd Format in module INF ...") Table =3D EccGlobalData.gDb.TblInf SqlCommand =3D """ @@ -1139,9 +1139,10 @@ class Check(object): FileTable =3D 'Identifier' + str(Id) self.NamingConventionCheckDefineStatement(FileTabl= e) self.NamingConventionCheckTypedefStatement(FileTab= le) - self.NamingConventionCheckIfndefStatement(FileTabl= e) self.NamingConventionCheckVariableName(FileTable) self.NamingConventionCheckSingleCharacterVariable(= FileTable) + if os.path.splitext(F)[1] in ('.h'): + =20 + self.NamingConventionCheckIfndefStatement(FileTable) =20 self.NamingConventionCheckPathName() self.NamingConventionCheckFunctionName() @@ -1183,7 +1184,7 @@ class Check(object): =20 # Check whether the #ifndef at the start of an include file uses both = prefix and postfix underscore characters, '_'. def NamingConventionCheckIfndefStatement(self, FileTable): - if EccGlobalData.gConfig.NamingConventionCheckTypedefStatement =3D= =3D '1' or EccGlobalData.gConfig.NamingConventionCheckAll =3D=3D '1' or Ecc= GlobalData.gConfig.CheckAll =3D=3D '1': + if EccGlobalData.gConfig.NamingConventionCheckIfndefStatement =3D= =3D '1' or EccGlobalData.gConfig.NamingConventionCheckAll =3D=3D '1' or Ecc= GlobalData.gConfig.CheckAll =3D=3D '1': EdkLogger.quiet("Checking naming covention of #ifndef statemen= t ...") =20 SqlCommand =3D """select ID, Value from %s where Model =3D %s"= "" % (FileTable, MODEL_IDENTIFIER_MACRO_IFNDEF) -- 2.7.2.windows.1