From 06eb35402e456066c86f621e566160967b7740ad Mon Sep 17 00:00:00 2001 From: Hess Chen Date: Fri, 29 Jul 2016 14:09:00 +0800 Subject: BaseTool/Upt: Avoid UNI file name conflict When creating a UNI file if there is a name conflict, add an index from 0 to the file name Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hess Chen Reviewed-by: Yonghong Zhu --- BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py') diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py b/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py index 31abd23ccd..d39c1827ba 100644 --- a/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py +++ b/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py @@ -65,6 +65,7 @@ from Library.DataType import TAB_SECTION_END from Library.DataType import TAB_SPLIT import Library.DataType as DT from Library.UniClassObject import FormatUniEntry +from Library.String import GetUniFileName def GenPcd(Package, Content): # @@ -586,9 +587,9 @@ def GenPackageUNIEncodeFile(PackageObject, UniFileHeader = '', Encoding=TAB_ENCO if not os.path.exists(os.path.dirname(PackageObject.GetFullPath())): os.makedirs(os.path.dirname(PackageObject.GetFullPath())) - ContainerFile = os.path.normpath(os.path.join(os.path.dirname(PackageObject.GetFullPath()), - (PackageObject.GetBaseName() + '.uni'))) + ContainerFile = GetUniFileName(os.path.dirname(PackageObject.GetFullPath()), PackageObject.GetBaseName()) + Content = UniFileHeader + '\r\n' Content += '\r\n' -- cgit v1.2.3