From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.20; helo=mga02.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 ADB0C2035A7D7 for ; Tue, 14 Nov 2017 01:54:44 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Nov 2017 01:58:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,393,1505804400"; d="scan'208";a="7422085" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga002.jf.intel.com with ESMTP; 14 Nov 2017 01:58:51 -0800 Received: from fmsmsx111.amr.corp.intel.com (10.18.116.5) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 14 Nov 2017 01:58:51 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx111.amr.corp.intel.com (10.18.116.5) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 14 Nov 2017 01:58:50 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.152]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.218]) with mapi id 14.03.0319.002; Tue, 14 Nov 2017 17:58:49 +0800 From: "Gao, Liming" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTools: Fix the bug to collect source files per build rule family Thread-Index: AQHTXQzXty1wkPACMESG9qAKOkqHd6MTpA4Q Date: Tue, 14 Nov 2017 09:58:48 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E17DCB2@SHSMSX104.ccr.corp.intel.com> References: <1510638762-6604-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: <1510638762-6604-1-git-send-email-yonghong.zhu@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: Fix the bug to collect source files per build rule family 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, 14 Nov 2017 09:54:44 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----Original Message----- >From: Zhu, Yonghong >Sent: Tuesday, November 14, 2017 1:53 PM >To: edk2-devel@lists.01.org >Cc: Gao, Liming >Subject: [Patch] BaseTools: Fix the bug to collect source files per build = rule >family > >when collect source files list we should also consider build rule >family. > >Cc: Liming Gao >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Yonghong Zhu >--- > BaseTools/Source/Python/AutoGen/AutoGen.py | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > >diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py >b/BaseTools/Source/Python/AutoGen/AutoGen.py >index b3e7089..008ad8e 100644 >--- a/BaseTools/Source/Python/AutoGen/AutoGen.py >+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py >@@ -3265,17 +3265,17 @@ class ModuleAutoGen(AutoGen): > # match tool chain > if F.TagName not in ("", "*", self.ToolChain): > EdkLogger.debug(EdkLogger.DEBUG_9, "The toolchain [%s= ] for >processing file [%s] is found, " > "but [%s] is needed" % (F.TagName, st= r(F), self.ToolChain)) > continue >- # match tool chain family >- if F.ToolChainFamily not in ("", "*", self.ToolChainFamil= y): >+ # match tool chain family or build rule family >+ if F.ToolChainFamily not in ("", "*", self.ToolChainFamil= y, >self.BuildRuleFamily): > EdkLogger.debug( > EdkLogger.DEBUG_0, > "The file [%s] must be built by tools of = [%s], " \ >- "but current toolchain family is [%s]" \ >- % (str(F), F.ToolChainFamily, self.To= olChainFamily)) >+ "but current toolchain family is [%s], bu= ildrule family is [%s]" >\ >+ % (str(F), F.ToolChainFamily, self.To= olChainFamily, >self.BuildRuleFamily)) > continue > > # add the file path into search path list for file includ= ing > if F.Dir not in self.IncludePathList and self.AutoGenVers= ion >=3D >0x00010005: > self.IncludePathList.insert(0, F.Dir) >-- >2.6.1.windows.1