From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=15.241.140.75; helo=g4t3426.houston.hpe.com; envelope-from=derek.lin2@hpe.com; receiver=edk2-devel@lists.01.org Received: from g4t3426.houston.hpe.com (g4t3426.houston.hpe.com [15.241.140.75]) (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 397942096AEFC for ; Wed, 9 May 2018 02:03:26 -0700 (PDT) Received: from G4W9120.americas.hpqcorp.net (g4w9120.houston.hp.com [16.210.21.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g4t3426.houston.hpe.com (Postfix) with ESMTPS id 400F95C for ; Wed, 9 May 2018 09:03:25 +0000 (UTC) Received: from G1W8107.americas.hpqcorp.net (2002:10c1:483b::10c1:483b) by G4W9120.americas.hpqcorp.net (2002:10d2:150f::10d2:150f) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Wed, 9 May 2018 09:03:24 +0000 Received: from NAM01-BY2-obe.outbound.protection.outlook.com (15.241.52.11) by G1W8107.americas.hpqcorp.net (16.193.72.59) with Microsoft SMTP Server (TLS) id 15.0.1178.4 via Frontend Transport; Wed, 9 May 2018 09:03:23 +0000 Received: from CS1PR8401MB0678.NAMPRD84.PROD.OUTLOOK.COM (10.169.15.11) by CS1PR8401MB0709.NAMPRD84.PROD.OUTLOOK.COM (10.169.15.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.735.17; Wed, 9 May 2018 09:03:22 +0000 Received: from CS1PR8401MB0678.NAMPRD84.PROD.OUTLOOK.COM ([fe80::a04f:e190:f2e7:d258]) by CS1PR8401MB0678.NAMPRD84.PROD.OUTLOOK.COM ([fe80::a04f:e190:f2e7:d258%15]) with mapi id 15.20.0735.019; Wed, 9 May 2018 09:03:21 +0000 From: "Lin, Derek (HPS UEFI Dev)" To: "edk2-devel@lists.01.org" CC: "yonghong.zhu@intel.com" , "Lin, Derek (HPS UEFI Dev)" Thread-Topic: [PATCH] BaseTools: Remove dsc nested include checking. Thread-Index: AQHT53R2uSI0zIjXIkeErvNlS0roXKQnGhww Date: Wed, 9 May 2018 09:03:21 +0000 Message-ID: References: <20180509090202.9200-1-derek.lin2@hpe.com> In-Reply-To: <20180509090202.9200-1-derek.lin2@hpe.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=derek.lin2@hpe.com; x-originating-ip: [16.242.247.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CS1PR8401MB0709; 7:mSdb5q9p7fw1GfLfVSOB9EP9++kQ0haGwLSoLAhwYCntTSpzWZIfecmJ+0f4qWAMb06FKe10UoFIyWFWskpE+rm6hCS5sW7Ffb/TiWkH5QZ4wwo0a4R5BO+tzc+3h7JeN2r6PLqR8sBWkP6EA1RdAqK25P7KQXgU7j2SbicF3Qkn0KDyx8rvJ2UNQAFeP9KDjOSLaQ+ITXFb7lWpx71J+w1PUBr1JiO3UekqTtqIR1d89WLYYEjRrEO3RGUfHnBE x-ms-exchange-antispam-srfa-diagnostics: SOS;SOR; x-forefront-antispam-report: SFV:SKI; SCL:-1; SFV:NSPM; SFS:(10019020)(366004)(396003)(39860400002)(376002)(39380400002)(346002)(189003)(199004)(45074003)(6116002)(53936002)(5640700003)(3846002)(106356001)(2900100001)(9686003)(5660300001)(105586002)(97736004)(6436002)(102836004)(6506007)(26005)(55016002)(3280700002)(3660700001)(8676002)(81156014)(8936002)(81166006)(54906003)(2351001)(86362001)(7736002)(14454004)(6916009)(2906002)(305945005)(316002)(5250100002)(486006)(68736007)(476003)(186003)(25786009)(11346002)(76176011)(59450400001)(1857600001)(99286004)(33656002)(4326008)(66066001)(478600001)(74316002)(7696005)(2501003)(446003); DIR:OUT; SFP:1102; SCL:1; SRVR:CS1PR8401MB0709; H:CS1PR8401MB0678.NAMPRD84.PROD.OUTLOOK.COM; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:(222181515654134); BCL:0; PCL:0; RULEID:(7020095)(4652020)(8989080)(4534165)(4627221)(201703031133081)(201702281549075)(8990040)(5600026)(48565401081)(2017052603328)(7153060)(7193020); SRVR:CS1PR8401MB0709; x-ms-traffictypediagnostic: CS1PR8401MB0709: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(227479698468861)(222181515654134)(17755550239193); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231254)(944501410)(52105095)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011); SRVR:CS1PR8401MB0709; BCL:0; PCL:0; RULEID:; SRVR:CS1PR8401MB0709; x-forefront-prvs: 0667289FF8 received-spf: None (protection.outlook.com: hpe.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: R8+T6qV3hFwTYo/fecIoUYBi6Fwnvy9BIEbojblFx/L7iJ7MkI4n9qZk6ph30zvi5dOvgCp0ziY7d8K0HQ3L9mo8IdQ4Ib29zJEDxrCGLomsh4gOlYSSutRs8q8mrq/O7vSzMd7gziTPAIqQ7mrCoJ8CWsCFihXBPLfVrNq4zOx3KgPNZtoV764b+faoWqLy spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 8d0d161c-c74c-418c-cf72-08d5b58bb6e7 X-MS-Exchange-CrossTenant-Network-Message-Id: 8d0d161c-c74c-418c-cf72-08d5b58bb6e7 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 May 2018 09:03:21.5426 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-Transport-CrossTenantHeadersStamped: CS1PR8401MB0709 X-OriginatorOrg: hpe.com Subject: [PATCH] BaseTools: Remove dsc nested include checking. 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, 09 May 2018 09:03:26 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable The dsc nested include checking make unexpected build error when building p= roject A and switch to project B. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Derek Lin --- BaseTools/Source/Python/Workspace/MetaFileParser.py | 19 +++++++++++++++--= -- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTool= s/Source/Python/Workspace/MetaFileParser.py index 36843643ed..e1f4ea995d 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, I= ntel Corporation. All rights reserved.
-# (C) Copyright 2015-2016 Hewle= tt Packard Enterprise Development LP
+# (C) Copyright 2015-2018 Hewlett Packard Enterprise Development LP
# This program and the accompanying materials # are licensed and made ava= ilable under the terms and conditions of the BSD License # which accompani= es this distribution. The full text of the license may be found at @@ -155= 1,10 +1551,21 @@ class DscParser(MetaFileParser): =20 self.IncludedFiles.add (IncludedFile1) =20 + # todo: rework the nested include checking logic + # Current nested include checking rely on dsc file order insid= e 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 =3D ID 1 in build.db, an= d C ID =3D 2. + # Build project B. It give dsc file B ID =3D 3, and C ID still= =3D 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 le= vel included file - if Parser._From !=3D Owner and int(Owner) > int (Parser._From)= : - EdkLogger.error('parser', FILE_ALREADY_EXIST, File=3Dself.= _FileWithError, - Line=3Dself._LineIndex + 1, ExtraData=3D"{0} is alread= y included at a higher level.".format(IncludedFile1)) + #if Parser._From !=3D Owner and int(Owner) > int (Parser._From= ): + # EdkLogger.error('parser', FILE_ALREADY_EXIST, File=3Dself= ._FileWithError, + # Line=3Dself._LineIndex + 1, ExtraData=3D"{0} is alrea= dy included at a higher level.".format(IncludedFile1)) =20 =20 # set the parser status with current status -- 2.15.1.windows.2