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.85482.1682442939791467686 for ; Tue, 25 Apr 2023 10:15:40 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm1 header.b=JMNu/Opq; spf=pass (domain: bsdio.com, ip: 66.111.4.27, mailfrom: rebecca@bsdio.com) 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) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 25 Apr 2023 13:15:39 -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=1682442939; x= 1682529339; bh=XsZ3n9sv3x69/36Zvr/NOBZA7f8j4TNd/l5RAq7UBLk=; b=J MNu/OpqOPeal30/2xqbxiF3nxY0EI9VnKdwB49HMoFEDM6iHLZH5mlmEi+drB625 v4vUo1dvRYKOjn885GVgBlJOg5Mley/YoWnfmz9ZpsMNb3gmxfGykcbRPm63RKI/ f85KzUxGRzAQbH+p2Vcy1WeuifBDCiElLW1G+P2ZWAERdgPBqhKkXoAEj5+IKKcu 2l7lwTIVNnuZgujPhG9+Olv5Qaal3sTV8l3YV+GTsVzSFXywDFwIMVtrPd23cILq tzhKvWzSRIvyuFivxkoYD5CZDQ2OQ67JqshBOzzXjoyNGeZWj7qzfyYgGXy2XFcI mp+P/Z0NQj1i6WDVj1y4g== 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=1682442939; x= 1682529339; bh=XsZ3n9sv3x69/36Zvr/NOBZA7f8j4TNd/l5RAq7UBLk=; b=P a5UZchRzWDEX9Bchtxx0aNVfJBG8u2PQHtJdB2EwQfMJe/+e/VZS8NuavBZirx4y zCj2z3vS7jPmRScgp+QRbUjGtvRchE+PCKL8ev4uz+7gkGHX5DD7QnPIoShXDnM7 MQCLks5yUH973szkngV8PiKFT+9A3qmCwj95BliM9kRze1642GAXcopwnGdA6eKX 7Z12IxJJaXTlLU2+ZUSu54wctvvbOoMmV5Rfu/msMLwlQFxb5faRWKt/lNcMG/oR 79A9+K/n08lCZqNQgTPcPhBbRvi3GpeI4Z29wPDnlZf7CsDeaJhYCpBxvN52qK4G gtBY+I+6G1fdWWoOvw07g== 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 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: [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> 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 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 ) :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=py -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=py -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= 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 ) ) -:check_python2 endlocal + if defined PYTHON_HOME ( if EXIST "%PYTHON_HOME%" ( set PYTHON_COMMAND=%PYTHON_HOME%\python.exe - goto check_python_available + ) else ( + echo . + echo !!! ERROR !!! PYTHON_HOME="%PYTHON_HOME%" does not exist. + echo . + goto end ) ) -if defined PYTHONHOME ( - if EXIST "%PYTHONHOME%" ( - set PYTHON_HOME=%PYTHONHOME% - set PYTHON_COMMAND=%PYTHON_HOME%\python.exe - goto check_python_available - ) -) -echo. -echo !!! ERROR !!! PYTHON_HOME is not defined or The value of this variable 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=<"PythonCheck.txt" del PythonCheck.txt if "!PythonCheck!" NEQ "TRUE" ( echo. - echo ! ERROR ! "%PYTHON_COMMAND%" is not installed or added to environment variables + echo ! ERROR ! PYTHON_COMMAND="%PYTHON_COMMAND%" is not installed or added to environment variables echo. goto end - ) else ( - goto check_freezer_path - ) +) - - -:check_freezer_path - endlocal +endlocal %PYTHON_COMMAND% -c "import edk2basetools" >NUL 2>NUL if %ERRORLEVEL% EQU 0 ( @@ -422,13 +396,7 @@ goto end :print_python_info echo PATH = %PATH% - if defined PYTHON3_ENABLE if "%PYTHON3_ENABLE%" EQU "TRUE" ( - echo PYTHON3_ENABLE = %PYTHON3_ENABLE% - echo PYTHON3 = %PYTHON_COMMAND% - ) else ( - echo PYTHON3_ENABLE = FALSE - echo PYTHON_COMMAND = %PYTHON_COMMAND% - ) + echo PYTHON_COMMAND = %PYTHON_COMMAND% echo PYTHONPATH = %PYTHONPATH% echo. -- 2.40.0.windows.1