From nobody Thu May 9 01:50:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+55571+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+55571+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1583472711; cv=none; d=zohomail.com; s=zohoarc; b=QgY5+VABQKM2Uh2k5/wZFszPRHltGockPMRlnLyEqO1vBIvkl+zHEHJ9iqn8Weng3h0ssT+u7fpO75bcIBXhjpw2ga5mWdFvRC/A67lLBmFe/2uTBunPeDwHu+meZXa5EAxQAwO0XVI2K2+xGgR1KOE9ZTgMwFaQ8jWm9b298yE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583472711; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=M5JoQYixCdgkkSdIL9uADxrNmY19ycyvOkfX6bZcvA4=; b=a/5f8XQZ2+qNBIrb+5XyvOV3CDkAUraE3sKzqjZjAAa3pNxbxzp66vE0AqUdyC9KkEF37jY4sAjGxq+TK+8E2wcORZsG2Cu2ns1Zc/2OUIBHUZOf/HEG8UKTbo1cU0JMMRTP4EYSaYTDR/4PYXLleORxI+W7Z0NWUQxzog8Pe7A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+55571+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1583472711297610.3242823495195; Thu, 5 Mar 2020 21:31:51 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id b5nfYY1788612xZnj4ECcLm6; Thu, 05 Mar 2020 21:31:50 -0800 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web10.7274.1583472710064365907 for ; Thu, 05 Mar 2020 21:31:50 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Mar 2020 21:31:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,520,1574150400"; d="scan'208";a="234687605" X-Received: from zhijufax-mobl.ccr.corp.intel.com ([10.238.4.120]) by orsmga008.jf.intel.com with ESMTP; 05 Mar 2020 21:31:47 -0800 From: "Fan, ZhijuX" To: devel@edk2.groups.io Cc: "Zhiju . Fan" , Liming Gao , Bob Feng Subject: [edk2-devel] [PATCH V2] BaseTools:GuidedSectionTools.txt is not generated correctly Date: Fri, 6 Mar 2020 13:31:26 +0800 Message-Id: <20200306053126.21376-1-zhijux.fan@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,zhijux.fan@intel.com X-Gm-Message-State: foTrPkbGwv1kGizQVVXXJ0SZx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1583472710; bh=uZw3qnT4080OOLP1zcbpMeKZi9t/M/TloWFXPFKQMtg=; h=Cc:Date:From:Reply-To:Subject:To; b=YQe87VjDJb6lGLFJpkorHnAOWU30k8oX27bFFnAm1o0rqMDwkslOlTKeEsX4O1EKt73 TFYdp865C1CZ1OeArg0YENutHip/o0cPIEaI+EW5KwDvJ1IFXd7eATPrz0bXzF+UB0MYr ADClJySHowv0se9Abi2YkKSOuTXEi//2PN8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2538 For LzmaCompress or BrotliCompress, the platform may use the different options and add their batch file, such as LzmaCompressPlatform. Then, specify it in platform.dsc [BuildOptions] to override the default one in tools_def.txt. *_*_*_LZMA_PATH =3D LzmaCompressPlatform This override tool will be used. But, its name is not specified in the generated GuidedSectionTools.txt. Signed-off-by: Zhiju.Fan Cc: Liming Gao Cc: Bob Feng --- Changed an issue with an incorrect full path in GuidedSectionTools BaseTools/Source/Python/AutoGen/PlatformAutoGen.py | 4 +++- BaseTools/Source/Python/build/build.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py b/BaseTools= /Source/Python/AutoGen/PlatformAutoGen.py index d32178b00c93..478a5116fd7a 100644 --- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py @@ -866,7 +866,9 @@ class PlatformAutoGen(AutoGen): Value +=3D " " + self._BuildOptionWithToolDef(= RetVal)[Tool][Attr] else: Value =3D self._BuildOptionWithToolDef(RetVal)= [Tool][Attr] - + Def =3D '_'.join([self.BuildTarget, self.ToolC= hain, self.Arch, Tool, Attr]) + if self.Workspace.ToolDef.ToolsDefTxtDictionar= y.get(Def): + self.Workspace.ToolDef.ToolsDefTxtDictiona= ry[Def] =3D Value if Attr =3D=3D "PATH": # Don't put MAKE definition in the file if Tool !=3D "MAKE": diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Pyth= on/build/build.py index d841fefdc502..01c4c6fe2b84 100755 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -2367,7 +2367,8 @@ class Build(): # PATH environment variable. for dirInPath in os.environ['PATH'].split(os.pathsep): foundPath =3D os.path.join(dirInPath, tool) - if os.path.exists(foundPath): + BaseName, Ext =3D os.path.splitext(foundPath) + if os.path.isdir(foundPath) or Ext: return os.path.realpath(foundPath) =20 # If the tool was not found in the path then we just return --=20 2.14.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#55571): https://edk2.groups.io/g/devel/message/55571 Mute This Topic: https://groups.io/mt/71766931/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-