From nobody Thu May 2 07:27:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47529+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47529+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1568861825; cv=none; d=zoho.com; s=zohoarc; b=XGqPVRglLJyF1TmCfQazOAtarbLJ+7aZOrf/wocge+roGAHt+PkApN4LrUtCPxL/GTdtmxQFRwnBjdeX8FUVnQCI5MbnFHNV5lpCpcj9DDWqCxIDnA1HWoivM8pVv87FY7+mdMGX8UO1FmNjhIrpy54eM67bg8dOsd1NRH40tGk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568861825; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=pZXXcldeedTbC9ebMwImtdv2w5kHsYDSIyy+OlXmDus=; b=KZRQ1BIhaYDie75vxj1FpRyE2AioEpw8UdXZ24epYJmKANjpapRkJE/aQzaO/OYUF6uFqGgvOmcDXIJ+LnZYXdXHJgoJp3zyVwGC11yxCeJ17UvU3+PpPdiim4Dtq9TLzYpmKpNKACXPasUxApMsRsTBKH0tkvVKA14V/BiRVOI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47529+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568861824954695.4136462717074; Wed, 18 Sep 2019 19:57:04 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id khhRYY1788612xnVQgzoSg2z; Wed, 18 Sep 2019 19:57:03 -0700 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by groups.io with SMTP; Wed, 18 Sep 2019 19:57:03 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Sep 2019 19:57:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,522,1559545200"; d="scan'208";a="191908503" X-Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.47]) by orsmga006.jf.intel.com with ESMTP; 18 Sep 2019 19:57:01 -0700 From: "Bob Feng" To: devel@edk2.groups.io Cc: Liming Gao , Steven Shi , Bob Feng Subject: [edk2-devel] [Patch] BaseTools: init DependencyHeaderFileSet for each MakeFile class Date: Thu, 19 Sep 2019 10:56:54 +0800 Message-Id: <20190919025654.15096-1-bob.c.feng@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,bob.c.feng@intel.com X-Gm-Message-State: WsCKMHCzz4o2HrOanWZjzLypx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568861823; bh=uSwgnCxDpL3CRuvb2qak0C4sF7wx8sUuKZpjIV2htaw=; h=Cc:Date:From:Reply-To:Subject:To; b=rkqq2w+kfhmJBru+1Shc2pGuQOyOT8jQFDkv9ealh0yu4piMUU5cVjqmODIfMIVnFpe uYT/duUFkxZsp0NLAQMKya4Z4G14Ws0u56pMaFjk9Xbbp5k809TeiaE+tuYJmBrTSIjYf MAV4xFweukGTa8mHWtSKb0lIcTDeii1D/5Q= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2203 This patch is going to fix a regression issue that build breaks when the custom makefile exist. Cc: Liming Gao Cc: Steven Shi Signed-off-by: Bob Feng Reviewed-by: Liming Gao --- BaseTools/Source/Python/AutoGen/GenMake.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/= 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["WO= RKSPACE"] self.Macros["FFS_OUTPUT_DIR" ] =3D self._AutoGenObject.Macros["FF= S_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 replacement = 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_DIR)= "] + self.DependencyHeaderFileSet =3D set() =20 # Compose a dict object containing information used to do replacement = 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 replacement = 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 replacement = in template @property def _TemplateDict(self): Separator =3D self._SEP_[self._FileType] --=20 2.20.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#47529): https://edk2.groups.io/g/devel/message/47529 Mute This Topic: https://groups.io/mt/34195983/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-