From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.1966.1632387554027835248 for ; Thu, 23 Sep 2021 01:59:14 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: pierre.gondois@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9663312FC; Thu, 23 Sep 2021 01:59:13 -0700 (PDT) Received: from e120189.arm.com (unknown [10.57.87.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 5B59B3F59C; Thu, 23 Sep 2021 01:59:12 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io, Bob Feng , Liming Gao , Sami Mujawar Subject: [PATCH v1 3/4] BaseTools: Remove Makefile/MakefileName fields Date: Thu, 23 Sep 2021 09:59:02 +0100 Message-Id: <20210923085903.15966-4-Pierre.Gondois@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210923085903.15966-1-Pierre.Gondois@arm.com> References: <20210923085903.15966-1-Pierre.Gondois@arm.com> From: Pierre Gondois 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 --- 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