From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 E2F3C21969FBE for ; Tue, 23 May 2017 19:49:15 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP; 23 May 2017 19:49:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,384,1491289200"; d="scan'208";a="1173509699" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga002.fm.intel.com with ESMTP; 23 May 2017 19:49:15 -0700 Received: from fmsmsx115.amr.corp.intel.com (10.18.116.19) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 23 May 2017 19:49:15 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx115.amr.corp.intel.com (10.18.116.19) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 23 May 2017 19:49:15 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.246]) by SHSMSX104.ccr.corp.intel.com ([10.239.4.70]) with mapi id 14.03.0319.002; Wed, 24 May 2017 10:49:12 +0800 From: "Gao, Liming" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [Patch] BaseTools: Fix the bug that different DSC file use same build output Thread-Index: AQHS06aP9FpKs+q6H0i2HfOfSlg5faICyVSw Date: Wed, 24 May 2017 02:49:12 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14D7335D0@shsmsx102.ccr.corp.intel.com> References: <1495531523-1104-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: <1495531523-1104-1-git-send-email-yonghong.zhu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 10.0.102.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] BaseTools: Fix the bug that different DSC file use same build output X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 May 2017 02:49:16 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Yo= nghong Zhu > Sent: Tuesday, May 23, 2017 5:25 PM > To: edk2-devel@lists.01.org > Cc: Gao, Liming > Subject: [edk2] [Patch] BaseTools: Fix the bug that different DSC file us= e same build output >=20 > We meet a corner case that build different DSC file, but the DSC file use > same build output directory, and the different DSC file use a same PCD > with different Pcd Type, it cause build failure. >=20 > Cc: Liming Gao > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Yonghong Zhu > --- > BaseTools/Source/Python/AutoGen/AutoGen.py | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) >=20 > diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Sourc= e/Python/AutoGen/AutoGen.py > index fa6ec56..e89b61d 100644 > --- a/BaseTools/Source/Python/AutoGen/AutoGen.py > +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py > @@ -659,17 +659,24 @@ class WorkspaceAutoGen(AutoGen): > self._FvDir =3D None > self._MakeFileDir =3D None > self._BuildCommand =3D None >=20 > # > - # Create BuildOptions Macro & PCD metafile. > + # Create BuildOptions Macro & PCD metafile, also add the Active = Platform and FDF file. > # > content =3D 'gCommandLineDefines: ' > content +=3D str(GlobalData.gCommandLineDefines) > content +=3D os.linesep > content +=3D 'BuildOptionPcd: ' > content +=3D str(GlobalData.BuildOptionPcd) > + content +=3D os.linesep > + content +=3D 'Active Platform: ' > + content +=3D str(self.Platform) > + content +=3D os.linesep > + if self.FdfFile: > + content +=3D 'Flash Image Definition: ' > + content +=3D str(self.FdfFile) > SaveFileOnChange(os.path.join(self.BuildDir, 'BuildOptions'), co= ntent, False) >=20 > # > # Create PcdToken Number file for Dynamic/DynamicEx Pcd. > # > -- > 2.6.1.windows.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel