From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm1 header.b=RYmIrEHq; spf=pass (domain: bsdio.com, ip: 64.147.123.19, mailfrom: rebecca@bsdio.com) 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) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 09 May 2023 00:25:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdio.com; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm1; t=1683606348; x= 1683692748; bh=NJW9x3jJRFWxt5c6EgPRzywiAZ3Wy49ponEQafMVaZs=; b=R YmIrEHqqbpnz8FKkGM59eaWnNsrrGHlk/pvWY5TeDxtoWNJYWy9aLwQX3izybBM9 P4pYgF+Y1gm0WtiaxR73fHEl7EH55WL1Jdet76lM/RzX+g+RF5kTbqZPgLPBGcnV 7WqWyfFdOZCc7+CuzUeRaWuOKb7hVubKpK/kiJxyu9Xgs3DYwR9oB8vej4GDWij6 LuuDgf0n9tnjD5zeGLN+IzU/pQXEqFl7MTqM2yA3/6KG+qAbXcrB1N77XC6i0IzL wDjmkTnIfzK+0JjP+D7Akvn2HWBykxiPxaPkd7ftcoO4oS5MIhKwlqtCxnj5226Q 1hhF0fqbDs317gFGun4sA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1683606348; x= 1683692748; bh=NJW9x3jJRFWxt5c6EgPRzywiAZ3Wy49ponEQafMVaZs=; b=A rXidRv1LYLLJcLByM8XcA8dg+4H0/8pxMFR2HKOi4RCs00gqlp1HYYi1IKgwNAi/ QpynzCg8JPIRKg/FD0gWK809uqOLwLb5ypGQSEPKyeZFZe6hktpzQ+Urs7gpvj+5 lQM8tfvJ6WzjKwbekOmlRUjH31OmLkBfKZGCzyWisG6F424n3XWmqN7gNbdeC6wo yEgKrRdoNFaULwOsFqNe2sJrXDPCnt9yGp2tfe1ZKCsvypqg+XGxtzYPrMTyKzG6 m4vwb4ErI1/y9t6kVNBTG4Nnu+lG8I5gpmpcIU2YRah4L0jBxPCnuLrEAYK9SG2R negmooccQrkbhCpgpoGCg== 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 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-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> X-Mailer: git-send-email 2.40.0.windows.1 In-Reply-To: <20230509042524.612-1-rebecca@bsdio.com> References: <20230509042524.612-1-rebecca@bsdio.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 %CONF_PATH%\build_rule.txt > nul ) -echo PATH = %PATH% -echo. -if defined WORKSPACE ( - echo WORKSPACE = %WORKSPACE% -) -if defined PACKAGES_PATH ( - echo PACKAGES_PATH = %PACKAGES_PATH% -) -echo EDK_TOOLS_PATH = %EDK_TOOLS_PATH% -if defined BASE_TOOLS_PATH ( - echo BASE_TOOLS_PATH = %BASE_TOOLS_PATH% -) -if defined EDK_TOOLS_BIN ( - echo EDK_TOOLS_BIN = %EDK_TOOLS_BIN% -) -echo CONF_PATH = %CONF_PATH% -echo. - :skip_reconfig @REM @@ -381,7 +363,22 @@ if %ERRORLEVEL% EQU 0 ( goto print_python_info :print_python_info - echo PATH = %PATH% + echo PATH = %PATH% + echo. + if defined WORKSPACE ( + echo WORKSPACE = %WORKSPACE% + ) + if defined PACKAGES_PATH ( + echo PACKAGES_PATH = %PACKAGES_PATH% + ) + echo EDK_TOOLS_PATH = %EDK_TOOLS_PATH% + if defined BASE_TOOLS_PATH ( + echo BASE_TOOLS_PATH = %BASE_TOOLS_PATH% + ) + if defined EDK_TOOLS_BIN ( + echo EDK_TOOLS_BIN = %EDK_TOOLS_BIN% + ) + echo CONF_PATH = %CONF_PATH% echo PYTHON_COMMAND = %PYTHON_COMMAND% echo PYTHONPATH = %PYTHONPATH% echo. -- 2.40.0.windows.1