From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: bob.c.feng@intel.com) 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 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" 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: [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> X-Mailer: git-send-email 2.20.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2203 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 --- 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" ] = self._AutoGenObject.Macros["WORKSPACE"] self.Macros["FFS_OUTPUT_DIR" ] = self._AutoGenObject.Macros["FFS_OUTPUT_DIR"] self.GenFfsList = ModuleAutoGen.GenFfsList self.MacroList = ['FFS_OUTPUT_DIR', 'MODULE_GUID', 'OUTPUT_DIR'] self.FfsOutputFileList = [] + self.DependencyHeaderFileSet = set() # 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 ) - self.DependencyHeaderFileSet = set() + if FileDependencyDict: for Dependency in FileDependencyDict.values(): self.DependencyHeaderFileSet.update(set(Dependency)) # 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 = self._AutoGenObject.PlatformInfo self.IntermediateDirectoryList = ["$(DEBUG_DIR)", "$(OUTPUT_DIR)"] + self.DependencyHeaderFileSet = set() # Compose a dict object containing information used to do replacement in template @property def _TemplateDict(self): Separator = self._SEP_[self._FileType] @@ -1432,10 +1434,11 @@ cleanlib: self.ModuleMakefileList = [] self.IntermediateDirectoryList = [] self.ModuleBuildDirectoryList = [] self.LibraryBuildDirectoryList = [] self.LibraryMakeCommandList = [] + self.DependencyHeaderFileSet = set() # Compose a dict object containing information used to do replacement in template @property def _TemplateDict(self): Separator = 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 = [] + self.DependencyHeaderFileSet = set() # Compose a dict object containing information used to do replacement in template @property def _TemplateDict(self): Separator = self._SEP_[self._FileType] -- 2.20.1.windows.1