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 <Pierre.Gondois@arm.com>
Reviewed-by: Chris Jones <christopher.jones@arm.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
index d70b0d7ae828d9da65100bcefb3e8f0bf78981dc..368a31047e82af4e00be61753cbff7d8db1c079d 100755 (executable)
--- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
@@ -254,7 +254,6 @@ class ModuleAutoGen(AutoGen):
         self.AutoGenDepSet = set()\r
         self.ReferenceModules = []\r
         self.ConstPcd                  = {}\r
-        self.Makefile         = None\r
         self.FileDependCache  = {}\r
 \r
     def __init_platform_info__(self):\r

diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index 88a1d1582cd838a216ce5cc5ff44337a6c7f1f62..ef873720f4551d5e912a0f9d9dce4b91f949f180 100644 (file)
--- 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\r
 # @var FlashDefinition:   To store value for FlashDefinition\r
 # @var BuildNumber:       To store value for BuildNumber\r
-# @var MakefileName:      To store value for MakefileName\r
 # @var SkuIds:            To store value for SkuIds, it is a set structure as\r
 #                         { 'SkuName' : SkuId, '!include' : includefilename, ...}\r
 # @var Modules:           To store value for Modules, it is a list structure as\r
@@ -614,7 +613,6 @@ class PlatformBuildClassObject(BuildData):
         self.OutputDirectory         = ''\r
         self.FlashDefinition         = ''\r
         self.BuildNumber             = ''\r
-        self.MakefileName            = ''\r
 \r
         self.SkuIds                  = {}\r
         self.Modules                 = []\r

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 58081361c38d0986d45402528ee3b704588b0d5e..e4969d863f6e511e7a60f198ff7ff18d37c2068f 100755 (executable)
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -2186,8 +2186,6 @@ class Build():
             Pa.CreateLibModuelDirs()\r
             # Fetch the MakeFileName.\r
             self.MakeFileName = Pa.MakeFileName\r
-            if not self.MakeFileName:\r
-                self.MakeFileName = Pa.MakeFile\r
 \r
             Pa.DataPipe.DataContainer = {"LibraryBuildDirectoryList":Pa.LibraryBuildDirectoryList}\r
             Pa.DataPipe.DataContainer = {"ModuleBuildDirectoryList":Pa.ModuleBuildDirectoryList}\r