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: liming.gao@intel.com) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by groups.io with SMTP; Mon, 23 Sep 2019 07:27:38 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Sep 2019 07:27:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,540,1559545200"; d="scan'208";a="195383627" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by FMSMGA003.fm.intel.com with ESMTP; 23 Sep 2019 07:27:38 -0700 Received: from shsmsx105.ccr.corp.intel.com (10.239.4.158) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 23 Sep 2019 07:27:37 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.32]) by SHSMSX105.ccr.corp.intel.com ([169.254.11.23]) with mapi id 14.03.0439.000; Mon, 23 Sep 2019 22:27:36 +0800 From: "Liming Gao" To: "Feng, Bob C" , "devel@edk2.groups.io" CC: "Shi, Steven" Subject: Re: [Patch] BaseTools: init DependencyHeaderFileSet for each MakeFile class Thread-Topic: [Patch] BaseTools: init DependencyHeaderFileSet for each MakeFile class Thread-Index: AQHVbpXqh6kxDEb2qEeCFwSPa/+Wkqc5WKog Date: Mon, 23 Sep 2019 14:27:35 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E500241@SHSMSX104.ccr.corp.intel.com> References: <20190919025654.15096-1-bob.c.feng@intel.com> In-Reply-To: <20190919025654.15096-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYTQzZGZhOWQtZDY1Mi00OTU2LWFiODktMGE1N2I4OWY5MWU5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiT20xMkZxVEphTjBDakEyQW43dmY1eGt1aGNYaDFWS2I3R0xteDNaTDRnTHNsY3FCb0VoNzlxT0w5TjlmS3dyZiJ9 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: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: Feng, Bob C > Sent: Thursday, September 19, 2019 10:57 AM > To: devel@edk2.groups.io > Cc: Gao, Liming ; Shi, Steven ; Feng, Bob C > Subject: [Patch] BaseTools: init DependencyHeaderFileSet for each MakeFil= e class >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2203 >=20 > This patch is going to fix a regression issue that > build breaks when the custom makefile exist. >=20 > Cc: Liming Gao > Cc: Steven Shi > Signed-off-by: Bob Feng > --- > BaseTools/Source/Python/AutoGen/GenMake.py | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) >=20 > diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Sourc= e/Python/AutoGen/GenMake.py > index 940136248f..e447e43ec3 100755 > --- a/BaseTools/Source/Python/AutoGen/GenMake.py > +++ b/BaseTools/Source/Python/AutoGen/GenMake.py > @@ -447,10 +447,11 @@ cleanlib: > self.Macros["WORKSPACE" ] =3D self._AutoGenObject.Macros["= WORKSPACE"] > self.Macros["FFS_OUTPUT_DIR" ] =3D self._AutoGenObject.Macros["= FFS_OUTPUT_DIR"] > self.GenFfsList =3D ModuleAutoGen.GenFfsList > self.MacroList =3D ['FFS_OUTPUT_DIR', 'MODULE_GUID', 'OUTPUT_DIR= '] > self.FfsOutputFileList =3D [] > + self.DependencyHeaderFileSet =3D set() >=20 > # Compose a dict object containing information used to do replacemen= t in template > @property > def _TemplateDict(self): > if self._FileType not in self._SEP_: > @@ -908,11 +909,11 @@ cleanlib: > SourceFileList, > ForceIncludedFile, > self._AutoGenObject.IncludePathList = + self._AutoGenObject.BuildOptionIncPathList > ) >=20 > - self.DependencyHeaderFileSet =3D set() > + > if FileDependencyDict: > for Dependency in FileDependencyDict.values(): > self.DependencyHeaderFileSet.update(set(Dependency)) >=20 > # Get a set of unique package includes from MetaFile > @@ -1242,10 +1243,11 @@ ${BEGIN}\t-@${create_directory_command}\n${END}\ > # > def __init__(self, ModuleAutoGen): > BuildFile.__init__(self, ModuleAutoGen) > self.PlatformInfo =3D self._AutoGenObject.PlatformInfo > self.IntermediateDirectoryList =3D ["$(DEBUG_DIR)", "$(OUTPUT_DI= R)"] > + self.DependencyHeaderFileSet =3D set() >=20 > # Compose a dict object containing information used to do replacemen= t in template > @property > def _TemplateDict(self): > Separator =3D self._SEP_[self._FileType] > @@ -1432,10 +1434,11 @@ cleanlib: > self.ModuleMakefileList =3D [] > self.IntermediateDirectoryList =3D [] > self.ModuleBuildDirectoryList =3D [] > self.LibraryBuildDirectoryList =3D [] > self.LibraryMakeCommandList =3D [] > + self.DependencyHeaderFileSet =3D set() >=20 > # Compose a dict object containing information used to do replacemen= t in template > @property > def _TemplateDict(self): > Separator =3D self._SEP_[self._FileType] > @@ -1537,10 +1540,11 @@ class TopLevelMakefile(BuildFile): > # @param Workspace Object of WorkspaceAutoGen class > # > def __init__(self, Workspace): > BuildFile.__init__(self, Workspace) > self.IntermediateDirectoryList =3D [] > + self.DependencyHeaderFileSet =3D set() >=20 > # Compose a dict object containing information used to do replacemen= t in template > @property > def _TemplateDict(self): > Separator =3D self._SEP_[self._FileType] > -- > 2.20.1.windows.1