From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3D10D21AEB0A1 for ; Tue, 22 Aug 2017 22:51:07 -0700 (PDT) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Aug 2017 22:53:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,415,1498546800"; d="scan'208";a="141000169" Received: from tiano01.ccr.corp.intel.com ([10.239.9.150]) by orsmga005.jf.intel.com with ESMTP; 22 Aug 2017 22:53:39 -0700 From: hesschen To: edk2-devel@lists.01.org Date: Wed, 23 Aug 2017 13:53:36 +0800 Message-Id: <1503467616-15412-1-git-send-email-hesheng.chen@intel.com> X-Mailer: git-send-email 2.7.2.windows.1 Subject: [patch] BaseTools/UPT: Fix UNI file name issue X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Aug 2017 05:51:07 -0000 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: hesschen --- BaseTools/Source/Python/UPT/Core/DependencyRules.py | 2 ++ BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py | 6 ++++-- BaseTools/Source/Python/UPT/Library/String.py | 4 +++- BaseTools/Source/Python/UPT/Object/POM/ModuleObject.py | 8 +++++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/BaseTools/Source/Python/UPT/Core/DependencyRules.py b/BaseTools/Source/Python/UPT/Core/DependencyRules.py index 909c584..26c5a97 100644 --- a/BaseTools/Source/Python/UPT/Core/DependencyRules.py +++ b/BaseTools/Source/Python/UPT/Core/DependencyRules.py @@ -55,6 +55,8 @@ class DependencyRules(object): self.PkgsToBeDepend.extend(self.GenToBeInstalledPkgList(ToBeInstalledPkgList)) def GenToBeInstalledPkgList(self, ToBeInstalledPkgList): + if not ToBeInstalledPkgList: + return [] RtnList = [] for Dist in ToBeInstalledPkgList: for Package in Dist.PackageSurfaceArea: diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py index a376f56..d7eaf3e 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 diff --git a/BaseTools/Source/Python/UPT/Library/String.py b/BaseTools/Source/Python/UPT/Library/String.py index 89371db..278073e 100644 --- a/BaseTools/Source/Python/UPT/Library/String.py +++ b/BaseTools/Source/Python/UPT/Library/String.py @@ -969,6 +969,7 @@ def GetUniFileName(FilePath, FileName): pass LargestIndex = -1 + IndexNotFound = True for File in Files: if File.upper().startswith(FileName.upper()) and File.upper().endswith('.UNI'): Index = File.upper().replace(FileName.upper(), '').replace('.UNI', '') @@ -978,11 +979,12 @@ def GetUniFileName(FilePath, FileName): except Exception: Index = -1 else: + IndexNotFound = False Index = 0 if Index > LargestIndex: LargestIndex = Index + 1 - if LargestIndex > -1: + if LargestIndex > -1 and not IndexNotFound: return os.path.normpath(os.path.join(FilePath, FileName + str(LargestIndex) + '.uni')) else: return os.path.normpath(os.path.join(FilePath, FileName + '.uni')) diff --git a/BaseTools/Source/Python/UPT/Object/POM/ModuleObject.py b/BaseTools/Source/Python/UPT/Object/POM/ModuleObject.py index e85b8fa..4052d28 100644 --- a/BaseTools/Source/Python/UPT/Object/POM/ModuleObject.py +++ b/BaseTools/Source/Python/UPT/Object/POM/ModuleObject.py @@ -1,7 +1,7 @@ ## @file # This file is used to define a class object to describe a module # -# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.
# # This program and the accompanying materials are licensed and made available # under the terms and conditions of the BSD License which accompanies this @@ -105,6 +105,7 @@ class ModuleHeaderObject(IdentificationObject, CommonHeaderObject, BinaryHeaderO self.PiSpecificationVersion = '' self.UefiSpecificationVersion = '' self.UNIFlag = False + self.ModuleUniFile = '' # # SpecObject # @@ -208,6 +209,11 @@ class ModuleHeaderObject(IdentificationObject, CommonHeaderObject, BinaryHeaderO def GetSupArchList(self): return self.SupArchList + def SetModuleUniFile(self, ModuleUniFile): + self.ModuleUniFile = ModuleUniFile + + def GetModuleUniFile(self): + return self.ModuleUniFile ## # SourceFileObject # -- 2.7.2.windows.1