1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [Patch] BaseTools: init DependencyHeaderFileSet for each MakeFile class

Bob Feng posted 1 patch 4 years, 7 months ago
Failed in applying to current master (apply log)
BaseTools/Source/Python/AutoGen/GenMake.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
[edk2-devel] [Patch] BaseTools: init DependencyHeaderFileSet for each MakeFile class
Posted by Bob Feng 4 years, 7 months ago 
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 <liming.gao@intel.com>
Cc: Steven Shi <steven.shi@intel.com>
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
---
 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


-=-=-=-=-=-=-=-=-=-=-=-
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]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch] BaseTools: init DependencyHeaderFileSet for each MakeFile class
Posted by Liming Gao 4 years, 6 months ago 
Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: Feng, Bob C <bob.c.feng@intel.com>
> Sent: Thursday, September 19, 2019 10:57 AM
> To: devel@edk2.groups.io
> Cc: Gao, Liming <liming.gao@intel.com>; Shi, Steven <steven.shi@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
> Subject: [Patch] BaseTools: init DependencyHeaderFileSet for each MakeFile class
> 
> 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 <liming.gao@intel.com>
> Cc: Steven Shi <steven.shi@intel.com>
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> ---
>  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


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#47852): https://edk2.groups.io/g/devel/message/47852
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]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.