From f71b163020d7f97e0533c412d175bc642f628ef6 Mon Sep 17 00:00:00 2001 From: Hess Chen Date: Wed, 23 Aug 2017 13:53:36 +0800 Subject: BaseTools/UPT: Fix UNI file name issue 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 Reviewed-by: Yonghong Zhu --- BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py') diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py index a376f56fcf..d7eaf3ea1d 100644 --- a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py +++ b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py @@ -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 -- cgit v1.2.3