sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools/UPT: Fix UNI file name issue

Browse Source 
Fix the issue of creating duplicate UNI file names
Fix the issue of removing packages

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hess Chen <hesheng.chen@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Hess Chen
2017-08-23 13:53:36 +08:00
committed by Yonghong Zhu
parent cefbbb3d08
commit f71b163020
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
View File

@ -140,7 +140,9 @@ def ModuleToInf(ModuleObject, PackageObject=None, DistHeader=None):
#
FileHeader = GenHeaderCommentSection(ModuleAbstract, ModuleDescription, ModuleCopyright, ModuleLicense, False, \
DT.TAB_COMMENT_EDK1_SPLIT)
GenModuleUNIEncodeFile(ModuleObject, FileHeader)
ModuleUniFile = GenModuleUNIEncodeFile(ModuleObject, FileHeader)
if ModuleUniFile:
ModuleObject.SetModuleUniFile(os.path.basename(ModuleUniFile))
#
# Judge whether the INF file is an AsBuild INF.
@ -310,7 +312,7 @@ def GenDefines(ModuleObject):
# TAB_INF_DEFINES_VERSION_STRING
if ModuleObject.UNIFlag:
Statement = (u'%s ' % DT.TAB_INF_DEFINES_MODULE_UNI_FILE).ljust(LeftOffset) + \
u'= %s' % ModuleObject.GetBaseName() + '.uni'
u'= %s' % ModuleObject.GetModuleUniFile()
SpecialStatementList.append(Statement)
# TAB_INF_DEFINES_MODULE_TYPE