From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm1 header.b=p8d8+Xr9; spf=pass (domain: bsdio.com, ip: 66.111.4.27, mailfrom: rebecca@bsdio.com) 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) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 25 Apr 2023 13:15:46 -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=1682442946; x= 1682529346; bh=eaFfL6GhOoIOUZ49OpqBc2D0elbaHT5OKS1EQSxi+2Q=; b=p 8d8+Xr9JXvKyoVmnJl1I62D+WCc0gdDzi0O4zHz7RrzmXqz/YlH4wocQfTqmQ6UD DAHFhd1RGA16YhjJe2tswwMEMoJLsTMuVqQfpoLk0p+neS3krWlphVX4pRs12RBg M2hd1mjKpubFV+TUIRt0/GSoRwukv88w/GFUxL5X6xhGn5lbexdMXhU2vosj8atr TT1EmhoGRri90NFzKA/hgX/o0YNetGBtX2AKBjfI/1vQPcEjLv+hniITe31IxHDR J7aAjLbWkDNLpdSDVkjxglOfejdPPteHw9zvD8QBFWxJ3sNW+5YRBtsmh3SB9Veb b+Ctb4JdQlGNxaGHZb4iw== 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=1682442946; x= 1682529346; bh=eaFfL6GhOoIOUZ49OpqBc2D0elbaHT5OKS1EQSxi+2Q=; b=R 2odt1w/yPbtHQUjNIiDL7BymjjupJVuRxxZKsvSqCZqt1gWEKwfiP++OPQQKVC1P CoD9OqIWDrYyj4VQx4ohJ4hF+QPrl6X38eUSfPScm6OHbW/8P725GsweHAorIo3Y f24qPF4BjKDeXQWH/ABYTjLlh8PwHtEPytOmaZc0PDaYZmxsUfD43DrvMdWEX8PM ujN0e0FHhWU0DsrmG1DpGDs6Fjd6DPL0t5PBTNC+4Qk0RUkvaTu3ayTwjn2VlBMQ jJY/OIemiFgUj7Ycc+BWl9Xb5WWE2PdBjjy5Ef23JZXrJrcM0ilM43d+m+/qG1aC sFf882i0R+pvTo+QIbbnQ== 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 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: [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> X-Mailer: git-send-email 2.40.0.windows.1 In-Reply-To: <20230425171518.1584-1-rebecca@bsdio.com> References: <20230425171518.1584-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 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 %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 @@ -399,7 +381,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