[Patch] BaseTools: remove the unneeded code

[Patch] BaseTools: remove the unneeded code

[Yonghong Zhu]

Do a clean up to remove the unneeded code.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 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

Re: [Patch] BaseTools: remove the unneeded code

[Gao, Liming]

Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Zhu,
>Yonghong
>Sent: Wednesday, June 13, 2018 9:13 AM
>To: edk2-devel@lists.01.org
>Subject: [edk2] [Patch] BaseTools: remove the unneeded code
>
>Do a clean up to remove the unneeded code.
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
>---
> 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
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel