From nobody Sun Nov 10 20:44:41 2024 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+103593+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+103593+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1682442948; cv=none; d=zohomail.com; s=zohoarc; b=lpPSzsOuq27whVzdTE5BKS1KXOXhgmKL6wLICTaKPQryOSVtBwymDUbamXaLlCp08ALE8znF1ihOYK/C65FUJK4gk+XkE+oVk/nxEvVwuqSIf+Ju33ixhYCb194SDevxgLd8W/9dq6Sy0pF7m8flMb3LDRitabHWGyZoHIFThtU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682442948; 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=rBG8V2RfCrsa10BWHnmx0+zmQwGcwL2agMnYtGscQ7A=; b=YOHCgC5DG8vkqHBfwMibe6C3Z0rkyhd6aag8I+D5hLuLH4CsDUuz0Mtgfv14Wg029qBom1hd1+PBSfnOrTriO7vRLEMChao34gjwiBQia+Sf05JfmlcO89GdbawmBA6Qgznkws9xE9skgNDZpyBQcj1toOKuRXFm4QAdfpzYXTI= 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+103593+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1682442948478440.16167835123645; Tue, 25 Apr 2023 10:15:48 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Sgw3YY1788612xwcLKm6WUYz; Tue, 25 Apr 2023 10:15:48 -0700 X-Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by mx.groups.io with SMTP id smtpd.web11.85487.1682442947051889675 for ; Tue, 25 Apr 2023 10:15:47 -0700 X-Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 660535C0145; Tue, 25 Apr 2023 13:15:46 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 25 Apr 2023 13:15:46 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeduvddguddutdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeftvggs vggttggrucevrhgrnhcuoehrvggsvggttggrsegsshguihhordgtohhmqeenucggtffrrg htthgvrhhnpeegffeuueelvdeggfdvvdfgtedvudfhfeekudekieektddukeefteetieef vdelfeenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpe hrvggsvggttggrsegsshguihhordgtohhm X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 25 Apr 2023 13:15:45 -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] [PATCH 6/6] BaseTools: only print the environment once in toolsetup.bat Date: Tue, 25 Apr 2023 11:15:18 -0600 Message-Id: <20230425171518.1584-7-rebecca@bsdio.com> In-Reply-To: <20230425171518.1584-1-rebecca@bsdio.com> References: <20230425171518.1584-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: hxw5VsYvLXGiA6hF3oMEzgPDx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1682442948; bh=c4zmwAtdFOdJ8iPblCrWmVVxhbyBYNZEL0iBz8T1zVE=; h=Cc:Date:From:Reply-To:Subject:To; b=VzoxiwAT8tg2XOm+iGN2M992cIFBJRNAqjzcmYhazt8c/JJe4wD+DQo6USwqBUunHJw sULzL9ysdWVF4EbKh74Ks+mIInBB8nPJJYdk8Sd90jGlHReeQWg/vKDXTYOdYVs1xExgF MAc+uW4iMfxZFQkSZBNbTE/cJZMA0GsUpNc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1682442949106100023 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 80aa2992ba80..6edfa3074f80 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -268,24 +268,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 @@ -399,7 +381,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 (#103593): https://edk2.groups.io/g/devel/message/103593 Mute This Topic: https://groups.io/mt/98497589/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-