From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=bob.c.feng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 4633F202E53F3 for ; Mon, 9 Jul 2018 19:05:57 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jul 2018 19:05:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,332,1526367600"; d="scan'208";a="53827321" Received: from shwdeopenpsi105.ccr.corp.intel.com ([10.239.9.110]) by fmsmga008.fm.intel.com with ESMTP; 09 Jul 2018 19:05:55 -0700 From: BobCF To: edk2-devel@lists.01.org Cc: Bob Feng , Liming Gao , Yonghong Zhu Date: Tue, 10 Jul 2018 10:05:44 +0800 Message-Id: <20180710020544.104832-1-bob.c.feng@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 Subject: [Patch] BaseTools: Remove a unused function. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2018 02:05:57 -0000 the call statement of _CheckDuplicateInFV() was commented out in 2014. There is no call statement of _CheckDuplicateInFV(), so remove it. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Bob Feng Cc: Liming Gao Cc: Yonghong Zhu --- BaseTools/Source/Python/AutoGen/AutoGen.py | 128 ----------------------------- 1 file changed, 128 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index d100648606..57a4b4923f 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -617,13 +617,10 @@ class WorkspaceAutoGen(AutoGen): # # Check PCD type and definition between DSC and DEC # self._CheckPcdDefineAndType() -# if self.FdfFile: -# self._CheckDuplicateInFV(Fdf) - # # Create BuildOptions Macro & PCD metafile, also add the Active Platform and FDF file. # content = 'gCommandLineDefines: ' content += str(GlobalData.gCommandLineDefines) @@ -759,135 +756,10 @@ class WorkspaceAutoGen(AutoGen): for filePath in self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]._RawData.IncludedFiles: AllWorkSpaceMetaFiles.add(filePath.Path) return AllWorkSpaceMetaFiles - ## _CheckDuplicateInFV() method - # - # Check whether there is duplicate modules/files exist in FV section. - # The check base on the file GUID; - # - def _CheckDuplicateInFV(self, Fdf): - for Fv in Fdf.Profile.FvDict: - _GuidDict = {} - for FfsFile in Fdf.Profile.FvDict[Fv].FfsList: - if FfsFile.InfFileName and FfsFile.NameGuid is None: - # - # Get INF file GUID - # - InfFoundFlag = False - for Pa in self.AutoGenObjectList: - if InfFoundFlag: - break - for Module in Pa.ModuleAutoGenList: - if path.normpath(Module.MetaFile.File) == path.normpath(FfsFile.InfFileName): - InfFoundFlag = True - if Module.Guid.upper() not in _GuidDict: - _GuidDict[Module.Guid.upper()] = FfsFile - break - else: - EdkLogger.error("build", - FORMAT_INVALID, - "Duplicate GUID found for these lines: Line %d: %s and Line %d: %s. GUID: %s" % (FfsFile.CurrentLineNum, - FfsFile.CurrentLineContent, - _GuidDict[Module.Guid.upper()].CurrentLineNum, - _GuidDict[Module.Guid.upper()].CurrentLineContent, - Module.Guid.upper()), - ExtraData=self.FdfFile) - # - # Some INF files not have entity in DSC file. - # - if not InfFoundFlag: - if FfsFile.InfFileName.find('$') == -1: - InfPath = NormPath(FfsFile.InfFileName) - if not os.path.exists(InfPath): - EdkLogger.error('build', GENFDS_ERROR, "Non-existant Module %s !" % (FfsFile.InfFileName)) - - PathClassObj = PathClass(FfsFile.InfFileName, self.WorkspaceDir) - # - # Here we just need to get FILE_GUID from INF file, use 'COMMON' as ARCH attribute. and use - # BuildObject from one of AutoGenObjectList is enough. - # - InfObj = self.AutoGenObjectList[0].BuildDatabase.WorkspaceDb.BuildObject[PathClassObj, TAB_ARCH_COMMON, self.BuildTarget, self.ToolChain] - if InfObj.Guid.upper() not in _GuidDict: - _GuidDict[InfObj.Guid.upper()] = FfsFile - else: - EdkLogger.error("build", - FORMAT_INVALID, - "Duplicate GUID found for these lines: Line %d: %s and Line %d: %s. GUID: %s" % (FfsFile.CurrentLineNum, - FfsFile.CurrentLineContent, - _GuidDict[InfObj.Guid.upper()].CurrentLineNum, - _GuidDict[InfObj.Guid.upper()].CurrentLineContent, - InfObj.Guid.upper()), - ExtraData=self.FdfFile) - InfFoundFlag = False - - if FfsFile.NameGuid is not None: - # - # If the NameGuid reference a PCD name. - # The style must match: PCD(xxxx.yyy) - # - if gPCDAsGuidPattern.match(FfsFile.NameGuid): - # - # Replace the PCD value. - # - _PcdName = FfsFile.NameGuid.lstrip("PCD(").rstrip(")") - PcdFoundFlag = False - for Pa in self.AutoGenObjectList: - if not PcdFoundFlag: - for PcdItem in Pa.AllPcdList: - if (PcdItem.TokenSpaceGuidCName + "." + PcdItem.TokenCName) == _PcdName: - # - # First convert from CFormatGuid to GUID string - # - _PcdGuidString = GuidStructureStringToGuidString(PcdItem.DefaultValue) - - if not _PcdGuidString: - # - # Then try Byte array. - # - _PcdGuidString = GuidStructureByteArrayToGuidString(PcdItem.DefaultValue) - - if not _PcdGuidString: - # - # Not Byte array or CFormat GUID, raise error. - # - EdkLogger.error("build", - FORMAT_INVALID, - "The format of PCD value is incorrect. PCD: %s , Value: %s\n" % (_PcdName, PcdItem.DefaultValue), - ExtraData=self.FdfFile) - - if _PcdGuidString.upper() not in _GuidDict: - _GuidDict[_PcdGuidString.upper()] = FfsFile - PcdFoundFlag = True - break - else: - EdkLogger.error("build", - FORMAT_INVALID, - "Duplicate GUID found for these lines: Line %d: %s and Line %d: %s. GUID: %s" % (FfsFile.CurrentLineNum, - FfsFile.CurrentLineContent, - _GuidDict[_PcdGuidString.upper()].CurrentLineNum, - _GuidDict[_PcdGuidString.upper()].CurrentLineContent, - FfsFile.NameGuid.upper()), - ExtraData=self.FdfFile) - - if FfsFile.NameGuid.upper() not in _GuidDict: - _GuidDict[FfsFile.NameGuid.upper()] = FfsFile - else: - # - # Two raw file GUID conflict. - # - EdkLogger.error("build", - FORMAT_INVALID, - "Duplicate GUID found for these lines: Line %d: %s and Line %d: %s. GUID: %s" % (FfsFile.CurrentLineNum, - FfsFile.CurrentLineContent, - _GuidDict[FfsFile.NameGuid.upper()].CurrentLineNum, - _GuidDict[FfsFile.NameGuid.upper()].CurrentLineContent, - FfsFile.NameGuid.upper()), - ExtraData=self.FdfFile) - - def _CheckPcdDefineAndType(self): PcdTypeSet = {TAB_PCDS_FIXED_AT_BUILD, TAB_PCDS_PATCHABLE_IN_MODULE, TAB_PCDS_FEATURE_FLAG, TAB_PCDS_DYNAMIC, -- 2.16.2.windows.1