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.88; helo=mga01.intel.com; envelope-from=yonghong.zhu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 98BB1212C01F1 for ; Tue, 12 Jun 2018 18:13:32 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Jun 2018 18:13:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,216,1526367600"; d="scan'208";a="207594410" Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.129]) by orsmga004.jf.intel.com with ESMTP; 12 Jun 2018 18:13:18 -0700 From: Yonghong Zhu To: edk2-devel@lists.01.org Date: Wed, 13 Jun 2018 09:13:16 +0800 Message-Id: <1528852396-11312-1-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 Subject: [Patch] BaseTools: remove the unneeded code X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jun 2018 01:13:32 -0000 Do a clean up to remove the unneeded code. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu --- BaseTools/Source/Python/Workspace/MetaFileParser.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py index a2ded0c..71da731 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py @@ -1549,27 +1549,10 @@ class DscParser(MetaFileParser): Parser = DscParser(IncludedFile1, self._FileType, self._Arch, IncludedFileTable, Owner=Owner, From=FromItem) self.IncludedFiles.add (IncludedFile1) - # todo: rework the nested include checking logic - # Current nested include checking rely on dsc file order inside build.db. - # It is not reliable and will lead to build fail in some case. - # - # When project A and B include a common dsc file C. - # Build project A. It give dsc file A = ID 1 in build.db, and C ID = 2. - # Build project B. It give dsc file B ID = 3, and C ID still = 2. - # Then, we build project B fail, unless we clean build.db. - # In oldder BaseTools, the project B ID will still be 1, - # that's why it work before. - - # Does not allow lower level included file to include upper level included file - #if Parser._From != Owner and int(Owner) > int (Parser._From): - # EdkLogger.error('parser', FILE_ALREADY_EXIST, File=self._FileWithError, - # Line=self._LineIndex + 1, ExtraData="{0} is already included at a higher level.".format(IncludedFile1)) - - # set the parser status with current status Parser._SectionName = self._SectionName if self._InSubsection: Parser._SectionType = self._SubsectionType else: -- 2.6.1.windows.1