From: "PierreGondois" <pierre.gondois@arm.com>
To: devel@edk2.groups.io, Bob Feng <bob.c.feng@intel.com>,
Liming Gao <gaoliming@byosoft.com.cn>,
Sami Mujawar <sami.mujawar@arm.com>
Subject: [PATCH v1 3/4] BaseTools: Remove Makefile/MakefileName fields
Date: Thu, 23 Sep 2021 09:59:02 +0100 [thread overview]
Message-ID: <20210923085903.15966-4-Pierre.Gondois@arm.com> (raw)
In-Reply-To: <20210923085903.15966-1-Pierre.Gondois@arm.com>
From: Pierre Gondois <Pierre.Gondois@arm.com>
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>
---
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(-)
diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
index d70b0d7ae828..368a31047e82 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 88a1d1582cd8..ef873720f455 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 58081361c38d..e4969d863f6e 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}
--
2.17.1
next prev parent reply other threads:[~2021-09-23 8:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-23 8:58 [PATCH v1 0/4] Set default Makefile name PierreGondois
2021-09-23 8:59 ` [PATCH v1 1/4] BaseTools/GenMake: Use ToolDefinition as fallback option PierreGondois
2021-09-23 8:59 ` [PATCH v1 2/4] BaseTools/build: Set MakefileName PierreGondois
2021-09-23 8:59 ` PierreGondois [this message]
2021-09-23 8:59 ` [PATCH v1 4/4] BaseTools: Remove hard-coded strings for target and tools_def PierreGondois
2021-09-23 10:05 ` [edk2-devel] [PATCH v1 0/4] Set default Makefile name Chris Jones
2021-09-24 0:48 ` 回复: " gaoliming
2021-09-24 11:57 ` PierreGondois
2021-09-29 1:35 ` 回复: [edk2-devel] " gaoliming
2021-09-29 11:43 ` Bob Feng
[not found] ` <16A94849D004DAA5.16095@groups.io>
2021-09-29 11:53 ` [edk2-devel] " Bob Feng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210923085903.15966-4-Pierre.Gondois@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox