diff options
author | Derek Lin <derek.lin2@hpe.com> | 2018-05-09 17:03:21 +0800 |
---|---|---|
committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-06-11 23:03:05 +0800 |
commit | 5163d89398c541ab03e8f6f6ab6ed479e95b4be9 (patch) | |
tree | ea4a351d6f659cd3f43cbd35ece7ae2366ab5cc1 /BaseTools/Source/Python | |
parent | a683ceca800e9d10c999d463444aa92945be0a70 (diff) | |
download | edk2-5163d89398c541ab03e8f6f6ab6ed479e95b4be9.tar.gz edk2-5163d89398c541ab03e8f6f6ab6ed479e95b4be9.tar.bz2 edk2-5163d89398c541ab03e8f6f6ab6ed479e95b4be9.zip |
BaseTools: Remove dsc nested include checking.
The dsc nested include checking make unexpected build error when
building project A and switch to project B.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Derek Lin <derek.lin2@hpe.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Diffstat (limited to 'BaseTools/Source/Python')
-rw-r--r-- | BaseTools/Source/Python/Workspace/MetaFileParser.py | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py index 8ab1dd23a0..b1e715d5d4 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py @@ -2,7 +2,7 @@ # This file is used to parse meta files
#
# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
-# (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
+# (C) Copyright 2015-2018 Hewlett Packard Enterprise Development LP<BR>
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at
@@ -1551,10 +1551,21 @@ class DscParser(MetaFileParser): 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))
+ #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
|