From nobody Sat May 18 16:46:58 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+103588+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+103588+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1682442941; cv=none; d=zohomail.com; s=zohoarc; b=E+/FZlte+eXnd9KQG53MP+cpc+KCjMWQVbG86NfEY0ihULadoms+l4Mrf+4UcJrRjiq27HaPzQqIPhXUe0YIFb9Ml+vEj4C+PBLhyazG//m5sbH3N200ECygK4u99hss46cGjP/9vOmdNB4pGUqJu51f3eHu9kElOypvAv+Ze3Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682442941; 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=ChDKbufCK/KNhpUQg8Z4zhsMtO0kDBwn70hzTOMdGJ0=; b=m38JQ9Kdb8Z8iChJvCIqmjNWqhDEvfC/I4iyBNMw7EALLPyBvpyP+34LMoKyaIYlNgIS9oo7O0i7w7UXOP1CkRpDyvMsmHESgD4VzPXktpKqbO58GTVIL/s77gYaDziqq5s54TgzzXJz7hCCH0Z+UZOnwEb/SAuZI0nT3/uqllI= 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+103588+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 168244294103159.0995727464807; Tue, 25 Apr 2023 10:15:41 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id YdJ2YY1788612xnpzXjIVCIM; Tue, 25 Apr 2023 10:15:40 -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.85482.1682442939791467686 for ; Tue, 25 Apr 2023 10:15:40 -0700 X-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 2206C5C0140; Tue, 25 Apr 2023 13:15:39 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 25 Apr 2023 13:15:39 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeduvddgudduudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeftvggs vggttggrucevrhgrnhcuoehrvggsvggttggrsegsshguihhordgtohhmqeenucggtffrrg htthgvrhhnpeegffeuueelvdeggfdvvdfgtedvudfhfeekudekieektddukeefteetieef vdelfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hrvggsvggttggrsegsshguihhordgtohhm X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 25 Apr 2023 13:15:38 -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 1/6] BaseTools: Remove Python2/Python3 detection from toolset.bat Date: Tue, 25 Apr 2023 11:15:13 -0600 Message-Id: <20230425171518.1584-2-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: NBhk7evC7KJWhNKeGFMYWsbJx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1682442940; bh=ZuXKyoepRmLpxcEwIbzC8zMlpk22nnyEyClBIdhR/SY=; h=Cc:Date:From:Reply-To:Subject:To; b=MfxpJ3dNdE4vhcBc/hly0EXgJlRHTs/pMI1hOJ34M/iFs66uqWvYfScZOLw1AHAaikG kb50FEMlPvvdefMVyN1szK636R5z123IB7nbhlYZBVFXAunBKLCJktE5MS62TFqSa7ciP KkB2tDguxOaRC8X5ai+JO/FJPtxHDAF/LG0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1682442942925100005 Content-Type: text/plain; charset="utf-8" Since Python3 is now required, we can remove the checks for PYTHON3_ENABLE and PYTHON3 and simplify the code in toolsetup.bat. Also, remove the leftover from when we supported freezing Python code. While here, fix a couple of typos and improve error messages. Signed-off-by: Rebecca Cran --- BaseTools/toolsetup.bat | 64 +++++--------------- 1 file changed, 16 insertions(+), 48 deletions(-) diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 58fd26a4b585..29a630b9035c 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -323,18 +323,8 @@ goto check_build_environment ) =20 :defined_python -if defined PYTHON_COMMAND if not defined PYTHON3_ENABLE ( - goto check_python_available -) -if defined PYTHON3_ENABLE ( - if "%PYTHON3_ENABLE%" EQU "TRUE" ( - set PYTHON_COMMAND=3Dpy -3 - goto check_python_available - ) else ( - goto check_python2 - ) -) -if not defined PYTHON_COMMAND if not defined PYTHON3_ENABLE ( + +if not defined PYTHON_COMMAND ( set PYTHON_COMMAND=3Dpy -3 py -3 %BASE_TOOLS_PATH%\Tests\PythonTest.py >PythonCheck.txt 2>&1 setlocal enabledelayedexpansion @@ -346,56 +336,40 @@ if not defined PYTHON_COMMAND if not defined PYTHON3_= ENABLE ( set PYTHON_COMMAND=3D echo. echo !!! ERROR !!! Binary python tools are missing. - echo PYTHON_COMMAND, PYTHON3_ENABLE or PYTHON_HOME - echo Environment variable is not set successfully. - echo They is required to build or execute the python tools. + echo PYTHON_COMMAND or PYTHON_HOME + echo Environment variable is not set correctly. + echo They are required to build or execute the python tools. echo. goto end - ) else ( - goto check_python2 ) - ) else ( - goto check_freezer_path ) ) =20 -:check_python2 endlocal + if defined PYTHON_HOME ( if EXIST "%PYTHON_HOME%" ( set PYTHON_COMMAND=3D%PYTHON_HOME%\python.exe - goto check_python_available + ) else ( + echo . + echo !!! ERROR !!! PYTHON_HOME=3D"%PYTHON_HOME%" does not exist. + echo . + goto end ) ) -if defined PYTHONHOME ( - if EXIST "%PYTHONHOME%" ( - set PYTHON_HOME=3D%PYTHONHOME% - set PYTHON_COMMAND=3D%PYTHON_HOME%\python.exe - goto check_python_available - ) -) -echo. -echo !!! ERROR !!! PYTHON_HOME is not defined or The value of this variab= le does not exist -echo. -goto end -:check_python_available + %PYTHON_COMMAND% %BASE_TOOLS_PATH%\Tests\PythonTest.py >PythonCheck.txt 2>= &1 setlocal enabledelayedexpansion set /p PythonCheck=3D<"PythonCheck.txt" del PythonCheck.txt if "!PythonCheck!" NEQ "TRUE" ( echo. - echo ! ERROR ! "%PYTHON_COMMAND%" is not installed or added to enviro= nment variables + echo ! ERROR ! PYTHON_COMMAND=3D"%PYTHON_COMMAND%" is not installed o= r added to environment variables echo. goto end - ) else ( - goto check_freezer_path - ) +) =20 - - -:check_freezer_path - endlocal +endlocal =20 %PYTHON_COMMAND% -c "import edk2basetools" >NUL 2>NUL if %ERRORLEVEL% EQU 0 ( @@ -422,13 +396,7 @@ goto end =20 :print_python_info echo PATH =3D %PATH% - if defined PYTHON3_ENABLE if "%PYTHON3_ENABLE%" EQU "TRUE" ( - echo PYTHON3_ENABLE =3D %PYTHON3_ENABLE% - echo PYTHON3 =3D %PYTHON_COMMAND% - ) else ( - echo PYTHON3_ENABLE =3D FALSE - echo PYTHON_COMMAND =3D %PYTHON_COMMAND% - ) + echo PYTHON_COMMAND =3D %PYTHON_COMMAND% echo PYTHONPATH =3D %PYTHONPATH% echo. =20 --=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 (#103588): https://edk2.groups.io/g/devel/message/103588 Mute This Topic: https://groups.io/mt/98497581/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- From nobody Sat May 18 16:46:58 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+103589+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+103589+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1682442942; cv=none; d=zohomail.com; s=zohoarc; b=Q64u6jBOHD8SAPq2iNBlMYRQx+MDn57h4A3UrXy1ebETRoTNVxksboRlh6O0wEdPXhOd1NXIseMTetrHP9M7hgO5IQvSnIN0vmbuUd7xATAkLAk+Q63KKOshmoJQlNyjQ2XnNMlzy/VfCi2/6uqNKVWsLjL5TSF7ibCImNrSAQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682442942; 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=QH4OAeouMl69PiUrnoSYPHw++1uN0zRpu2YQoO0b3D0=; b=WBr6tEoxcLNC6qmTIvNzXhfEuyDa1gLtSpPVfxyWkbmXm9VEejhxveQOTeBa+gKs7E2lU49Wr0yR952bN08HBpSe5v4SmV6m9Eaql+lGCYMzgewRc17VW3OqKfgcefJhxiHl+xOrEw63Cfj5vs7qVhZ0wOZzNNljtuFaCMiL+wI= 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+103589+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 168244294220014.620059149160284; Tue, 25 Apr 2023 10:15:42 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id wfu3YY1788612xd5z3B1Qd0h; Tue, 25 Apr 2023 10:15:41 -0700 X-Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by mx.groups.io with SMTP id smtpd.web10.85944.1682442941156618136 for ; Tue, 25 Apr 2023 10:15:41 -0700 X-Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 7D3E75C0135; Tue, 25 Apr 2023 13:15:40 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 25 Apr 2023 13:15:40 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeduvddguddutdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeftvggs vggttggrucevrhgrnhcuoehrvggsvggttggrsegsshguihhordgtohhmqeenucggtffrrg htthgvrhhnpeegffeuueelvdeggfdvvdfgtedvudfhfeekudekieektddukeefteetieef vdelfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hrvggsvggttggrsegsshguihhordgtohhm X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 25 Apr 2023 13:15:39 -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 2/6] BaseTools: use threading.current_thread in NmakeSubdirs.py Date: Tue, 25 Apr 2023 11:15:14 -0600 Message-Id: <20230425171518.1584-3-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: JdkFuElg7khuwtBUXgW3D7LKx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1682442941; bh=IjkbZqz/WuHQ/Iqe1rbMxvDt3Sdp7gT6SMozfc6bqqU=; h=Cc:Date:From:Reply-To:Subject:To; b=wpAGwx+bQRkg6cNRJ3Qgx8sRuI5inInqxBZg1yaXt0ly76dbvMVDiSrhV/qs4OSQOrz lts1IeWD7dHDfBqArOdAW59MLQhliSitpSi+bOl4XBcSgOCZkunxUu4w7L6F0voTbexg7 Xwf63o4a6EgDFU9+kqWxLF8ADcFBOdFS81o= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1682442943382100011 Content-Type: text/plain; charset="utf-8" threading.currentThread is a deprecated alias for threading.current_thread, and causes a warning to be displayed when it's called. Update NmakeSubdirs.py to use the latter method instead. Signed-off-by: Rebecca Cran --- BaseTools/Source/C/Makefiles/NmakeSubdirs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Source/C/Makefiles/NmakeSubdirs.py b/BaseTools/Sourc= e/C/Makefiles/NmakeSubdirs.py index 1f4a45004f4b..7860c040afa0 100644 --- a/BaseTools/Source/C/Makefiles/NmakeSubdirs.py +++ b/BaseTools/Source/C/Makefiles/NmakeSubdirs.py @@ -132,7 +132,7 @@ class ThreadControl(object): break =20 self.runningLock.acquire(True) - self.running.remove(threading.currentThread()) + self.running.remove(threading.current_thread()) self.runningLock.release() =20 def Run(): --=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 (#103589): https://edk2.groups.io/g/devel/message/103589 Mute This Topic: https://groups.io/mt/98497583/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- From nobody Sat May 18 16:46:58 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+103590+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+103590+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1682442943; cv=none; d=zohomail.com; s=zohoarc; b=PFzQwqHl7PQCa/cpHBWaD0z2o1UIozZw2ZALfmCsy4rayWkauAyaDysKPjfE058O85MoTLnlZ1L7xYtGrQm99vvJVWNiWYxNwhL1LzGMx8xIlorNYBUsxyZdzer7DggqpZO8kc8fKWUITmLF2zWYchr2P5XcLjKvMu0zKZYKmvM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682442943; 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=+KnUNbuUB8uAeKMyYEyBdSs7O0Qr/jVDg96EtdZjPts=; b=kRbgZADqaGbe7jaoxap+roz6LjZbQcffWN05ryBbVFRUY+Er96+NldM24x3NNBCphb5pfjOTj3UDj9pBXchTRyvN7g4hlhVxB7NMO8eNzRJPgYEfTyQeuRA+4/KmeA+7oHQ3vKUyG8GupO+LzqFw2QXAKp+demI6hk1tcDc3JAw= 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+103590+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1682442943571692.2715794110418; Tue, 25 Apr 2023 10:15:43 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id V0n4YY1788612xQYE8n49ijG; Tue, 25 Apr 2023 10:15:43 -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.85486.1682442942603513614 for ; Tue, 25 Apr 2023 10:15:42 -0700 X-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id E934F5C0156; Tue, 25 Apr 2023 13:15:41 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 25 Apr 2023 13:15:41 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeduvddgudduudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeftvggs vggttggrucevrhgrnhcuoehrvggsvggttggrsegsshguihhordgtohhmqeenucggtffrrg htthgvrhhnpeegffeuueelvdeggfdvvdfgtedvudfhfeekudekieektddukeefteetieef vdelfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hrvggsvggttggrsegsshguihhordgtohhm X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 25 Apr 2023 13:15:40 -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 3/6] edksetup.bat: if toolsetup.bat fails, just exit Date: Tue, 25 Apr 2023 11:15:15 -0600 Message-Id: <20230425171518.1584-4-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: Qk2VN0iu6K6H2McKHwqLFFUvx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1682442943; bh=M1h44pb31cifN8lgPMdaBN4HGuFciK1/RCSwMxOwvjE=; h=Cc:Date:From:Reply-To:Subject:To; b=jLlxGCK62k+JGD49Seerlzlk0RP9EKACrmT4DaR9cxhCe6pmnB0zyl7qg9jOXkgJd4c rnvnH2k+R3EAXWI5sKXq7q/JxTJiOWyb6LzG/QKZtXn4ARzBZoGcAXhptumwz+WOP/f9y fMv1pbXrnN4aOwh2G/2VXnagADGf25yeCFk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1682442944898100013 Content-Type: text/plain; charset="utf-8" If toolsetup.bat fails (i.e. exits with a non-zero %ERRORLEVEL%), don't try and carry on but just quit. Signed-off-by: Rebecca Cran --- edksetup.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/edksetup.bat b/edksetup.bat index 7ad137bb3e9b..b63b57fc873e 100755 --- a/edksetup.bat +++ b/edksetup.bat @@ -86,6 +86,7 @@ if exist %EDK_TOOLS_PATH%\Source set BASE_TOOLS_PATH=3D%E= DK_TOOLS_PATH% :checkBaseTools IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools call %EDK_TOOLS_PATH%\toolsetup.bat %* +if %ERRORLEVEL% NEQ 0 goto end if /I "%1"=3D=3D"Reconfig" shift goto check_NASM goto check_cygwin --=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 (#103590): https://edk2.groups.io/g/devel/message/103590 Mute This Topic: https://groups.io/mt/98497585/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- From nobody Sat May 18 16:46:58 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+103591+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+103591+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1682442944; cv=none; d=zohomail.com; s=zohoarc; b=Y5sOYQpSnTzgXjcOSbyLR/pwALbmUzzryLIpvc53+KLOhlG92EhCxwZW7IsQ+5bdG83PZdwdwR8NIkY+aOvYklZU31NYUMnR/MRoV8L9BMHenZ9Zbtx4D2Bo1hsWq3Ubf07ekmZzXzjJFCMtitr950RBMkby3wZhQCGBgB3m1u4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682442944; 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=kCvBYVI4PImZL+YXpK3gZdJtgaexvGVxfSPxvtLke0w=; b=G4OX094AyYWBW12v/dz1p7DvyrRKMXU1VmQ0wjpELrF1DwvUkIrFdCp+UdVtlD3fHc5RsVKrCSnfT8wpxHsaerWWquy9hKY3IGoq+P4KnrPTJzuXwShjeFM8GVft5Nbg5hir1aj9uQS+3ztDsHBXb8CL2sOzNu/j4gay1sSorXM= 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+103591+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1682442944892349.5811627447015; Tue, 25 Apr 2023 10:15:44 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id hiVWYY1788612xicOKunfbcC; Tue, 25 Apr 2023 10:15:44 -0700 X-Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by mx.groups.io with SMTP id smtpd.web10.85946.1682442943858705458 for ; Tue, 25 Apr 2023 10:15:44 -0700 X-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 3E6A25C00D7; Tue, 25 Apr 2023 13:15:43 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 25 Apr 2023 13:15:43 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeduvddgudduudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeftvggs vggttggrucevrhgrnhcuoehrvggsvggttggrsegsshguihhordgtohhmqeenucggtffrrg htthgvrhhnpeetleejgeduleegieejtefhleejkefgieekudfhtdegveehtdekheevffet udffveenucffohhmrghinhepphihphhirdhorhhgnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomheprhgvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 25 Apr 2023 13:15:42 -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 4/6] BaseTools: Update toolsetup.bat and Tests/PythonTest.py to check ver Date: Tue, 25 Apr 2023 11:15:16 -0600 Message-Id: <20230425171518.1584-5-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: ywFO12gYWuSLD4SDrUDf8ql1x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1682442944; bh=Lbl/d09pU3qm4ImP6RpZ5wbQQ30kWsK4Bynjyas/fGQ=; h=Cc:Date:From:Reply-To:Subject:To; b=rS6qhtzgzpqVUvA9jz1Zt/kz9Ci7YVhMnhCB/rcaH/wFVq/mM/bPEAQ6VdFal7IzBlU C1biQDvzN+O3bCdLhSW3mfme/+fppnHImpyUu5HznFNsjJkuMkuRJ96+p5aEAjvfjbTMB kFHqEMbIZ1D1FMCDNTW+R3LmA9/QrrI/js0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1682442946918100019 Content-Type: text/plain; charset="utf-8" Update toolsetup.bat and Tests/PythonTest.py to check if we're running a version of Python that's compatible with BaseTools and the Pip BaseTools. Since edk2-pytool-extensions (https://pypi.org/project/edk2-pytool-extensions/) requires Python 3.9 or newer, set that as the minimum version EDK2 requires. Signed-off-by: Rebecca Cran --- BaseTools/Tests/PythonTest.py | 21 ++++++- BaseTools/toolsetup.bat | 61 +++++++++++--------- 2 files changed, 53 insertions(+), 29 deletions(-) diff --git a/BaseTools/Tests/PythonTest.py b/BaseTools/Tests/PythonTest.py index ec44c7947086..1716f78b5217 100644 --- a/BaseTools/Tests/PythonTest.py +++ b/BaseTools/Tests/PythonTest.py @@ -1,9 +1,26 @@ ## @file -# Test whether PYTHON_COMMAND is available +# Test whether PYTHON_COMMAND is available and the +# minimum Python version is installed. # # Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # =20 +import sys + if __name__ =3D=3D '__main__': - print('TRUE') + # Check if the major and minor versions required were specified. + if len(sys.argv) >=3D 3: + req_major_version =3D int(sys.argv[1]) + req_minor_version =3D int(sys.argv[2]) + else: + # If the minimum version wasn't specified on the command line, + # default to 3.9 which was the minimum required on 2023-04-24. + req_major_version =3D 3 + req_minor_version =3D 9 + + if sys.version_info.major =3D=3D req_major_version and \ + sys.version_info.minor >=3D req_minor_version: + sys.exit(0) + else: + sys.exit(1) diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 29a630b9035c..66df628eac5f 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -12,6 +12,8 @@ @echo off pushd . set SCRIPT_ERROR=3D0 +set PYTHON_VER_MAJOR=3D3 +set PYTHON_VER_MINOR=3D9 =20 @REM ############################################################## @REM # You should not have to modify anything below this line @@ -322,17 +324,19 @@ goto check_build_environment ) ) =20 -:defined_python +@REM Check Python environment =20 if not defined PYTHON_COMMAND ( set PYTHON_COMMAND=3Dpy -3 - py -3 %BASE_TOOLS_PATH%\Tests\PythonTest.py >PythonCheck.txt 2>&1 - setlocal enabledelayedexpansion - set /p PythonCheck=3D<"PythonCheck.txt" - del PythonCheck.txt - if "!PythonCheck!" NEQ "TRUE" ( + py -3 %BASE_TOOLS_PATH%\Tests\PythonTest.py %PYTHON_VER_MAJOR% %PYTHON_V= ER_MINOR% >NUL 2>NUL + if %ERRORLEVEL% EQU 1 ( + echo. + echo !!! ERROR !!! Python %PYTHON_VER_MAJOR%.%PYTHON_VER_MINOR% or new= er is required. + echo. + goto end + ) + if %ERRORLEVEL% NEQ 0 ( if not defined PYTHON_HOME if not defined PYTHONHOME ( - endlocal set PYTHON_COMMAND=3D echo. echo !!! ERROR !!! Binary python tools are missing. @@ -345,8 +349,6 @@ if not defined PYTHON_COMMAND ( ) ) =20 -endlocal - if defined PYTHON_HOME ( if EXIST "%PYTHON_HOME%" ( set PYTHON_COMMAND=3D%PYTHON_HOME%\python.exe @@ -358,27 +360,30 @@ if defined PYTHON_HOME ( ) ) =20 -%PYTHON_COMMAND% %BASE_TOOLS_PATH%\Tests\PythonTest.py >PythonCheck.txt 2>= &1 - setlocal enabledelayedexpansion - set /p PythonCheck=3D<"PythonCheck.txt" - del PythonCheck.txt - if "!PythonCheck!" NEQ "TRUE" ( - echo. - echo ! ERROR ! PYTHON_COMMAND=3D"%PYTHON_COMMAND%" is not installed o= r added to environment variables - echo. - goto end +%PYTHON_COMMAND% %BASE_TOOLS_PATH%\Tests\PythonTest.py %PYTHON_VER_MAJOR% = %PYTHON_VER_MINOR% >NUL 2>NUL +if %ERRORLEVEL% EQU 1 ( + echo. + echo !!! ERROR !!! Python %PYTHON_VER_MAJOR%.%PYTHON_VER_MINOR% or newer= is required. + echo. + goto end +) +if %ERRORLEVEL% NEQ 0 ( + echo. + echo !!! ERROR !!! PYTHON_COMMAND=3D"%PYTHON_COMMAND%" does not exist o= r is not a Python interpreter. + echo. + goto end ) =20 endlocal =20 - %PYTHON_COMMAND% -c "import edk2basetools" >NUL 2>NUL - if %ERRORLEVEL% EQU 0 ( - goto use_pip_basetools - ) else ( - REM reset ERRORLEVEL - type nul>nul - goto use_builtin_basetools - ) +%PYTHON_COMMAND% -c "import edk2basetools" >NUL 2>NUL +if %ERRORLEVEL% EQU 0 ( + goto use_pip_basetools +) else ( + REM reset ERRORLEVEL + type nul>nul + goto use_builtin_basetools +) =20 :use_builtin_basetools @echo Using EDK2 in-source Basetools @@ -466,5 +471,7 @@ set VS2015=3D set VS2013=3D set VS2012=3D set VSTool=3D +set PYTHON_VER_MAJOR=3D +set PYTHON_VER_MINOR=3D +set SCRIPT_ERROR=3D popd - --=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 (#103591): https://edk2.groups.io/g/devel/message/103591 Mute This Topic: https://groups.io/mt/98497587/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- From nobody Sat May 18 16:46:58 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+103592+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+103592+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1682442948; cv=none; d=zohomail.com; s=zohoarc; b=HbouJnPJtJbcFd3+ofgIpFzDd/LIEbWsWuowPLgbuzyW/gvI/hRcQ3xVNEcKB3deiRDrZ1nosbeZOPxLlsRv5L9BvK2vwPNVEXq+Iu5Xh+ev/ia0x0z0KGhBGtlNJY7BZLaY8spE8ATmfpoE0rgVC/X2VjLSmp0Am2Tc9yGeT6s= 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=d+flBmBFXwgLJToaxYB8j7hS8dkrmnYBhSRWpHytJzg=; b=hm8hssziHkW+SA0VGEzbGSGd57YGUU9L+Ncn7jkcb9dkaZ/fjSx4/+nPSs5c7e8BCWsAAxOICuR38kuNi8Ve7AWqPGFfsRj6WBH8TfIPVYg/9saHeo9Yz3Xr0VxER5+m0IbGiYKfdULUG2iO1Vp+F4VyEB4yU/riN5felTFEjek= 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+103592+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1682442948696941.4560974497996; Tue, 25 Apr 2023 10:15:48 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id XguVYY1788612xaC56XLwZBI; Tue, 25 Apr 2023 10:15:46 -0700 X-Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by mx.groups.io with SMTP id smtpd.web10.85947.1682442945684298224 for ; Tue, 25 Apr 2023 10:15:45 -0700 X-Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id F2C825C0159; Tue, 25 Apr 2023 13:15:44 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 25 Apr 2023 13:15:44 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeduvddgudduudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeftvggs vggttggrucevrhgrnhcuoehrvggsvggttggrsegsshguihhordgtohhmqeenucggtffrrg htthgvrhhnpeegffeuueelvdeggfdvvdfgtedvudfhfeekudekieektddukeefteetieef vdelfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hrvggsvggttggrsegsshguihhordgtohhm X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 25 Apr 2023 13:15:43 -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 5/6] BaseTools: Update toolsetup.bat to not use BASETOOLS_PYTHON_SOURCE Date: Tue, 25 Apr 2023 11:15:17 -0600 Message-Id: <20230425171518.1584-6-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: OVDlqTHAZoPLc0SCBiL2OXS3x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1682442946; bh=EB3SMbguJBA2fEjr8WTML09Pcr2kyb7ZaxoPnnR7Xlg=; h=Cc:Date:From:Reply-To:Subject:To; b=YpdOHPpnI0y7ovHp2VQ/T8vhmVRchBBiQDeSkF834S0lRiSFOoUHUVQ9F5pmxxLhkwe o4rgD5sHG8v7TgB858ZtJWGYNjpVFssyApJ2XjGvRnJz5JnjlZ5pFzHQjQ1Wj95GYp54k PHRHEI+u8wCxk/4ZSZezePQSjCCL83cr4B4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1682442949140100025 Content-Type: text/plain; charset="utf-8" The BASETOOLS_PYTHON_SOURCE environment variable is only used temporarily to set PYTHONPATH. Since it doesn't help improve clarity, remove it. While here, make sure we set PYTHONPATH when we're using Pip BaseTools so that build etc. can be found. Signed-off-by: Rebecca Cran --- BaseTools/toolsetup.bat | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 66df628eac5f..80aa2992ba80 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -389,14 +389,13 @@ if %ERRORLEVEL% EQU 0 ( @echo Using EDK2 in-source Basetools if defined BASETOOLS_PYTHON_SOURCE goto print_python_info set "PATH=3D%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%" - set BASETOOLS_PYTHON_SOURCE=3D%BASE_TOOLS_PATH%\Source\Python - set PYTHONPATH=3D%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH% + set PYTHONPATH=3D%BASE_TOOLS_PATH%\Source\Python;%PYTHONPATH% goto print_python_info =20 :use_pip_basetools @echo Using Pip Basetools set "PATH=3D%BASE_TOOLS_PATH%\BinPipWrappers\WindowsLike;%PATH%" - set BASETOOLS_PYTHON_SOURCE=3Dedk2basetools + set PYTHONPATH=3D%BASE_TOOLS_PATH%\Source\Python;%PYTHONPATH% goto print_python_info =20 :print_python_info --=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 (#103592): https://edk2.groups.io/g/devel/message/103592 Mute This Topic: https://groups.io/mt/98497588/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- From nobody Sat May 18 16:46:58 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-