Reviewed-by: Yonghong Zhu <yonghong....@intel.com>
Best Regards,
Zhu Yonghong
-----Original Message-----
From: Carsey, Jaben
Sent: Wednesday, August 29, 2018 10:42 PM
To: edk2-devel@lists.01.org
Cc: Zhu, Yonghong <yonghong....@intel.com>; Gao, Liming <liming....@intel.com>
Subject: [PATCH v1 1/1] BaseTools: Refactor to remove functionally equivalent
functions
IsSupportedArch and IsBinaryModule return the same value under the same
curcimstances. Remove newer one with fewer callers and send them to the other
function.
Cc: Yonghong Zhu <yonghong....@intel.com>
Cc: Liming Gao <liming....@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.car...@intel.com>
---
BaseTools/Source/Python/AutoGen/AutoGen.py | 4 ++--
BaseTools/Source/Python/Workspace/InfBuildData.py | 8 +-------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py
b/BaseTools/Source/Python/AutoGen/AutoGen.py
index eb1b28388967..5c0df45bb90a 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1092,7 +1092,7 @@ class PlatformAutoGen(AutoGen):
for Inf in self._AsBuildInfList:
InfClass = PathClass(NormPath(Inf), GlobalData.gWorkspace,
self.Arch)
M = self.BuildDatabase[InfClass, self.Arch, self.BuildTarget,
self.ToolChain]
- if not M.IsSupportedArch:
+ if not M.IsBinaryModule:
continue
self._AsBuildModuleList.append(InfClass)
# get library/modules for build @@ -1347,7 +1347,7 @@ class
PlatformAutoGen(AutoGen):
# If a module INF in FDF but not in current arch's DSC module
list, it must be module (either binary or source)
# for different Arch. PCDs in source module for different Arch
is already added before, so skip the source module here.
# For binary module, if in current arch, we need to list the
PCDs into database.
- if not M.IsSupportedArch:
+ if not M.IsBinaryModule:
continue
# Override the module PCD setting by platform setting
ModulePcdList = self.ApplyPcdSetting(M, M.Pcds) diff --git
a/BaseTools/Source/Python/Workspace/InfBuildData.py
b/BaseTools/Source/Python/Workspace/InfBuildData.py
index 7c3d712efe63..44ced491ad55 100644
--- a/BaseTools/Source/Python/Workspace/InfBuildData.py
+++ b/BaseTools/Source/Python/Workspace/InfBuildData.py
@@ -578,12 +578,7 @@ class InfBuildData(ModuleBuildClassObject):
EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,
ExtraData=ErrorInfo, File=self.MetaFile)
return Binaries
- ## Check whether it exists the binaries with current ARCH in AsBuild INF
- def _IsSupportedArch(self):
- if self._GetBinaries() and not self._GetSourceFiles():
- return True
- else:
- return False
+
## Retrieve source files
def _GetSourceFiles(self):
# Ignore all source files in a binary build mode @@ -1170,4 +1165,3 @@
class InfBuildData(ModuleBuildClassObject):
Depex = property(_GetDepex)
DepexExpression = property(_GetDepexExpression)
IsBinaryModule = property(_IsBinaryModule)
- IsSupportedArch = property(_IsSupportedArch)
--
2.16.2.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
