From 445c39f757f5204c2259d00930972b960483f6a4 Mon Sep 17 00:00:00 2001 From: Pierre Gondois Date: Thu, 23 Sep 2021 16:59:02 +0800 Subject: BaseTools: Remove Makefile/MakefileName fields REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3653 The Makefile and MakefilName fields are never set/used. Remove them. To check this, the following commands can be used: - grep -rIn "\.Makefile" - grep -rIn "\.MakefileName" Signed-off-by: Pierre Gondois Reviewed-by: Chris Jones Reviewed-by: Liming Gao Reviewed-by: Bob Feng --- BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 1 - BaseTools/Source/Python/Workspace/BuildClassObject.py | 2 -- BaseTools/Source/Python/build/build.py | 2 -- 3 files changed, 5 deletions(-) (limited to 'BaseTools') diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py index d70b0d7ae8..368a31047e 100755 --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py @@ -254,7 +254,6 @@ class ModuleAutoGen(AutoGen): self.AutoGenDepSet = set() self.ReferenceModules = [] self.ConstPcd = {} - self.Makefile = None self.FileDependCache = {} def __init_platform_info__(self): diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py index 88a1d1582c..ef873720f4 100644 --- a/BaseTools/Source/Python/Workspace/BuildClassObject.py +++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py @@ -590,7 +590,6 @@ class PackageBuildClassObject(BuildData): # @var OutputDirectory: To store value for OutputDirectory # @var FlashDefinition: To store value for FlashDefinition # @var BuildNumber: To store value for BuildNumber -# @var MakefileName: To store value for MakefileName # @var SkuIds: To store value for SkuIds, it is a set structure as # { 'SkuName' : SkuId, '!include' : includefilename, ...} # @var Modules: To store value for Modules, it is a list structure as @@ -614,7 +613,6 @@ class PlatformBuildClassObject(BuildData): self.OutputDirectory = '' self.FlashDefinition = '' self.BuildNumber = '' - self.MakefileName = '' self.SkuIds = {} self.Modules = [] diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py index 58081361c3..e4969d863f 100755 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -2186,8 +2186,6 @@ class Build(): Pa.CreateLibModuelDirs() # Fetch the MakeFileName. self.MakeFileName = Pa.MakeFileName - if not self.MakeFileName: - self.MakeFileName = Pa.MakeFile Pa.DataPipe.DataContainer = {"LibraryBuildDirectoryList":Pa.LibraryBuildDirectoryList} Pa.DataPipe.DataContainer = {"ModuleBuildDirectoryList":Pa.ModuleBuildDirectoryList} -- cgit v1.2.3