use function decorators Cc: Liming Gao <liming....@intel.com> Cc: Yonghong Zhu <yonghong....@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey <jaben.car...@intel.com> --- BaseTools/Source/Python/AutoGen/GenMake.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py index 55081acbd822..31b98267d4a2 100644 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -454,7 +454,8 @@ cleanlib: self.FfsOutputFileList = [] # Compose a dict object containing information used to do replacement in template - def _CreateTemplateDict(self): + @property + def _TemplateDict(self): if self._FileType not in self._SEP_: EdkLogger.error("build", PARAMETER_INVALID, "Invalid Makefile type [%s]" % self._FileType, ExtraData="[%s]" % str(self._AutoGenObject)) @@ -1094,8 +1095,6 @@ cleanlib: return DependencyList - _TemplateDict = property(_CreateTemplateDict) - ## CustomMakefile class # # This class encapsules makefie and its generation for module. It uses template to generate @@ -1204,7 +1203,8 @@ ${BEGIN}\t-@${create_directory_command}\n${END}\ self.IntermediateDirectoryList = ["$(DEBUG_DIR)", "$(OUTPUT_DIR)"] # Compose a dict object containing information used to do replacement in template - def _CreateTemplateDict(self): + @property + def _TemplateDict(self): Separator = self._SEP_[self._FileType] MyAgo = self._AutoGenObject if self._FileType not in MyAgo.CustomMakefile: @@ -1277,8 +1277,6 @@ ${BEGIN}\t-@${create_directory_command}\n${END}\ return MakefileTemplateDict - _TemplateDict = property(_CreateTemplateDict) - ## PlatformMakefile class # # This class encapsules makefie and its generation for platform. It uses @@ -1395,7 +1393,8 @@ cleanlib: self.LibraryMakeCommandList = [] # Compose a dict object containing information used to do replacement in template - def _CreateTemplateDict(self): + @property + def _TemplateDict(self): Separator = self._SEP_[self._FileType] MyAgo = self._AutoGenObject @@ -1480,8 +1479,6 @@ cleanlib: DirList.append(os.path.join(self._AutoGenObject.BuildDir, LibraryAutoGen.BuildDir)) return DirList - _TemplateDict = property(_CreateTemplateDict) - ## TopLevelMakefile class # # This class encapsules makefie and its generation for entrance makefile. It @@ -1501,7 +1498,8 @@ class TopLevelMakefile(BuildFile): self.IntermediateDirectoryList = [] # Compose a dict object containing information used to do replacement in template - def _CreateTemplateDict(self): + @property + def _TemplateDict(self): Separator = self._SEP_[self._FileType] # any platform autogen object is ok because we just need common information @@ -1621,8 +1619,6 @@ class TopLevelMakefile(BuildFile): DirList.append(os.path.join(self._AutoGenObject.BuildDir, LibraryAutoGen.BuildDir)) return DirList - _TemplateDict = property(_CreateTemplateDict) - # This acts like the main() function for the script, unless it is 'import'ed into another script. if __name__ == '__main__': pass -- 2.16.2.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel