From nobody Tue Feb 10 21:59:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+104319+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104319+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1683606350; cv=none; d=zohomail.com; s=zohoarc; b=eKemHxDa+QFRiqGBdzHmD9tjSgfqFdYTGs1L7h4qwwk8RdJCwyzQyW0n51LhsVu7NSVo2SmZssTwjlEZhuLog9vyztlOm9Y5+MFj++KEQooT2a4iz7n74nffNxS/q0aJnp8ecWHc5Ll6zdpV/Ydlqpw5CEa1WbSe3J1myEBiUFI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683606350; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=aq8jwX8lD80L8s3n8r+kbLmqrbwZ2xBWhbrId4YFzlQ=; b=O1pjmRtWxCeiEWhPw95mArVeETOf6s3tJRkz8BNgDlsBN7Jnr+Iw2faLAwBw11Om2eS5s5PfXhX5plnoEHkRxzbizYxOxxkDDWP26sYc6u5iFayDtURsN7JiDdAYItcwDIXOK+CMrVgRDSYEwgn7dfWkv/cAlToJHhtaDlngdMc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104319+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1683606350794488.1938574146417; Mon, 8 May 2023 21:25:50 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id hBkDYY1788612x56MpToeirT; Mon, 08 May 2023 21:25:50 -0700 X-Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) by mx.groups.io with SMTP id smtpd.web10.24138.1683606350069916584 for ; Mon, 08 May 2023 21:25:50 -0700 X-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 0CFA132009E7; Tue, 9 May 2023 00:25:48 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 09 May 2023 00:25:49 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeefledgkedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 9 May 2023 00:25:47 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Andrew Fish , Leif Lindholm , Michael D Kinney , Liming Gao , Bob Feng , Yuwei Chen Cc: Rebecca Cran Subject: [edk2-devel] [edk2-stable202305 PATCH 2/3] BaseTools: only print the environment once in toolsetup.bat Date: Mon, 8 May 2023 22:25:24 -0600 Message-Id: <20230509042524.612-3-rebecca@bsdio.com> In-Reply-To: <20230509042524.612-1-rebecca@bsdio.com> References: <20230509042524.612-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,rebecca@bsdio.com X-Gm-Message-State: ydbHnT6sbBg7EjV5jY6K5flbx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683606350; bh=z50UUgji4hr1CxLSq+QqFCLAmBWApeI73VCeTMNgql4=; h=Cc:Date:From:Reply-To:Subject:To; b=BlNmy9SeQChTei9X05Plsf1k1G4RFvN9aFY15XDAALZgWBAOMO+49+niHmy2iROr+R0 7mARVhmHkXw2jTv/Od7ZsXG313lXn2poEojKaPFsRzPcI+egOcj/e8P9dLzI7cVlHlKEg qG+r4FTuc7PETFTb1hatTmKD5mAjL5ZXAiY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683606352394100010 Content-Type: text/plain; charset="utf-8" Avoid printing %PATH% twice: move the printing of the environment down to print_python_info. Signed-off-by: Rebecca Cran --- BaseTools/toolsetup.bat | 35 +++++++++----------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 85104aa224da..9521f67c024e 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -250,24 +250,6 @@ if NOT exist %CONF_PATH%\build_rule.txt ( if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\build_rule.template %C= ONF_PATH%\build_rule.txt > nul ) =20 -echo PATH =3D %PATH% -echo. -if defined WORKSPACE ( - echo WORKSPACE =3D %WORKSPACE% -) -if defined PACKAGES_PATH ( - echo PACKAGES_PATH =3D %PACKAGES_PATH% -) -echo EDK_TOOLS_PATH =3D %EDK_TOOLS_PATH% -if defined BASE_TOOLS_PATH ( - echo BASE_TOOLS_PATH =3D %BASE_TOOLS_PATH% -) -if defined EDK_TOOLS_BIN ( - echo EDK_TOOLS_BIN =3D %EDK_TOOLS_BIN% -) -echo CONF_PATH =3D %CONF_PATH% -echo. - :skip_reconfig =20 @REM @@ -381,7 +363,22 @@ if %ERRORLEVEL% EQU 0 ( goto print_python_info =20 :print_python_info - echo PATH =3D %PATH% + echo PATH =3D %PATH% + echo. + if defined WORKSPACE ( + echo WORKSPACE =3D %WORKSPACE% + ) + if defined PACKAGES_PATH ( + echo PACKAGES_PATH =3D %PACKAGES_PATH% + ) + echo EDK_TOOLS_PATH =3D %EDK_TOOLS_PATH% + if defined BASE_TOOLS_PATH ( + echo BASE_TOOLS_PATH =3D %BASE_TOOLS_PATH% + ) + if defined EDK_TOOLS_BIN ( + echo EDK_TOOLS_BIN =3D %EDK_TOOLS_BIN% + ) + echo CONF_PATH =3D %CONF_PATH% echo PYTHON_COMMAND =3D %PYTHON_COMMAND% echo PYTHONPATH =3D %PYTHONPATH% echo. --=20 2.40.0.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 (#104319): https://edk2.groups.io/g/devel/message/104319 Mute This Topic: https://groups.io/mt/98777506/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-