diff options
| author | Carsey, Jaben <jaben.carsey@intel.com> | 2018-08-25 00:33:17 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-08-30 08:42:09 +0800 |
| commit | 94c04559374df0d1cecea32114df7be6d5931db9 (patch) | |
| tree | e5f3097fac277ed91a05c1a2d7d776d5627a2f43 /BaseTools/Source/Python/Workspace/InfBuildData.py | |
| parent | 7c7c8190d30b8ea547921143a8b8b0e44b585d89 (diff) | |
| download | edk2-94c04559374df0d1cecea32114df7be6d5931db9.tar.gz edk2-94c04559374df0d1cecea32114df7be6d5931db9.tar.bz2 edk2-94c04559374df0d1cecea32114df7be6d5931db9.zip | |
BaseTools: Create and use a shared value for 'MSFT' from DataType
I see lots of 'MSFT' throughout code and this can reduce them.
Cc: Bob Feng <Bob.c.Feng@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Diffstat (limited to 'BaseTools/Source/Python/Workspace/InfBuildData.py')
| -rw-r--r-- | BaseTools/Source/Python/Workspace/InfBuildData.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/Source/Python/Workspace/InfBuildData.py index 7c3d712efe..1325b4f029 100644 --- a/BaseTools/Source/Python/Workspace/InfBuildData.py +++ b/BaseTools/Source/Python/Workspace/InfBuildData.py @@ -252,10 +252,10 @@ class InfBuildData(ModuleBuildClassObject): if self._CustomMakefile is None:
self._CustomMakefile = {}
if len(TokenList) < 2:
- self._CustomMakefile['MSFT'] = TokenList[0]
+ self._CustomMakefile[TAB_COMPILER_MSFT] = TokenList[0]
self._CustomMakefile['GCC'] = TokenList[0]
else:
- if TokenList[0] not in ['MSFT', 'GCC']:
+ if TokenList[0] not in [TAB_COMPILER_MSFT, 'GCC']:
EdkLogger.error("build", FORMAT_NOT_SUPPORTED,
"No supported family [%s]" % TokenList[0],
File=self.MetaFile, Line=Record[-1])
@@ -353,7 +353,7 @@ class InfBuildData(ModuleBuildClassObject): else:
Tool = ToolList[0]
ToolChain = "*_*_*_%s_FLAGS" % Tool
- ToolChainFamily = 'MSFT' # Edk.x only support MSFT tool chain
+ # Edk.x only support MSFT tool chain
# ignore not replaced macros in value
ValueList = GetSplitList(' ' + Value, '/D')
Dummy = ValueList[0]
@@ -362,11 +362,11 @@ class InfBuildData(ModuleBuildClassObject): continue
Dummy = Dummy + ' /D ' + ValueList[Index]
Value = Dummy.strip()
- if (ToolChainFamily, ToolChain) not in self._BuildOptions:
- self._BuildOptions[ToolChainFamily, ToolChain] = Value
+ if (TAB_COMPILER_MSFT, ToolChain) not in self._BuildOptions:
+ self._BuildOptions[TAB_COMPILER_MSFT, ToolChain] = Value
else:
- OptionString = self._BuildOptions[ToolChainFamily, ToolChain]
- self._BuildOptions[ToolChainFamily, ToolChain] = OptionString + " " + Value
+ OptionString = self._BuildOptions[TAB_COMPILER_MSFT, ToolChain]
+ self._BuildOptions[TAB_COMPILER_MSFT, ToolChain] = OptionString + " " + Value
# set _Header to non-None in order to avoid database re-querying
self._Header_ = 'DUMMY'
|