From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by mx.groups.io with SMTP id smtpd.web11.40882.1683401478869319049 for ; Sat, 06 May 2023 12:31:18 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm1 header.b=hHqcUXtb; spf=pass (domain: bsdio.com, ip: 64.147.123.24, mailfrom: rebecca@bsdio.com) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id D1F2A32002D8; Sat, 6 May 2023 15:31:17 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sat, 06 May 2023 15:31:18 -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=1683401476; x= 1683487876; bh=FzeA75YCgxTMJPza5OHPyBRBhjiT0KueAhd+d0CGNjo=; b=h HqcUXtbnm0iHDWzq31qpYvDUJt9Ybul81lfWB2iVEKKexXlYXzvDg2Ld2NX2D18V kwxLWy99K+OxsXVHY7vXtbCxgXrOlrHXfYmNGE3nJ5GFS3K53VV00TJh4aF7vEwB LxFFoHw05fpDAZ7Z268FYShg0xKrNe+GH4XkIY0HbVR3Xf5WjQ0v9551GYuDVxIU 8J0qyjX3x43tcEpb0ZDdMvKUXOokPx5zaM0/JYLN8P+PRd8k2RCUuEHd03M4HJw6 W6VK4S1NRqlLKesW1AcJ8xB5pewdlxIogEQ0+0H0RcZ5NIjQ+SYqzFTxbTbAPKV2 DyaRWasfBqerqMziA4sbg== 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=1683401476; x= 1683487876; bh=FzeA75YCgxTMJPza5OHPyBRBhjiT0KueAhd+d0CGNjo=; b=R hVI0Oi6InEZOgqbHxgQiKLQQs/tbuYK9kAt8gBkeQ3y20EqlpbS3XcrLws+XmvcP IRlO3eSQ+3ECNfoKup7ZFQZMAEuHzST74gI5NsZH4WatphgYo6xGsKTchJrMlTNa FdtcVthqwagx9HL38SDjeOs/YQZfl0EIe6eB2Oipe4eQZfJg/IvgIHRRa9w4Eh76 jp3ZX7LKwRr9VmR5+7ic6JctGj8gZmTRAtozANPfUmpqNW+VM49pT/jj6adb9x2c pDmBw0yvjiUB+qXavataS+BqiiTbGVPRU3wHjjYWfonH2J7lqpTYTqfs9jZfzrrI 3RJmWexKwyYsHVZaOsHlw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeefgedgudduiecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeftvggs vggttggrucevrhgrnhcuoehrvggsvggttggrsegsshguihhordgtohhmqeenucggtffrrg htthgvrhhnpefhtddthefhjedufeevtdeuheduvdeutefgieeufeejgffhvddtleeftedu tdfggfenucffohhmrghinhepphihthhhohhnrdhorhhgnecuvehluhhsthgvrhfuihiivg eptdenucfrrghrrghmpehmrghilhhfrhhomheprhgvsggvtggtrgessghsughiohdrtgho mh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 6 May 2023 15:31:15 -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 v3 4/4] BaseTools: Update toolsetup.bat and Tests/PythonTest.py to check ver Date: Sat, 6 May 2023 13:30:52 -0600 Message-Id: <20230506193052.1835-5-rebecca@bsdio.com> X-Mailer: git-send-email 2.40.0.windows.1 In-Reply-To: <20230506193052.1835-1-rebecca@bsdio.com> References: <20230506193052.1835-1-rebecca@bsdio.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. BaseTools uses syntax from Python 3.6 or newer, so set that as the minimum version EDK2 requires. Signed-off-by: Rebecca Cran --- BaseTools/Tests/PythonTest.py | 22 ++++++- BaseTools/toolsetup.bat | 61 +++++++++++--------- 2 files changed, 54 insertions(+), 29 deletions(-) diff --git a/BaseTools/Tests/PythonTest.py b/BaseTools/Tests/PythonTest.py index ec44c7947086..b87c78570eae 100644 --- a/BaseTools/Tests/PythonTest.py +++ b/BaseTools/Tests/PythonTest.py @@ -1,9 +1,27 @@ ## @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 # +import sys + if __name__ == '__main__': - print('TRUE') + # Check if the major and minor versions required were specified. + if len(sys.argv) >= 3: + req_major_version = int(sys.argv[1]) + req_minor_version = int(sys.argv[2]) + else: + # If the minimum version wasn't specified on the command line, + # default to 3.6 because BaseTools uses syntax from PEP 526 + # (https://peps.python.org/pep-0526/) + req_major_version = 3 + req_minor_version = 6 + + if sys.version_info.major == req_major_version and \ + sys.version_info.minor >= req_minor_version: + sys.exit(0) + else: + sys.exit(1) diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 3d13e9fad286..dc6288effd7d 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -12,6 +12,8 @@ @echo off pushd . set SCRIPT_ERROR=0 +set PYTHON_VER_MAJOR=3 +set PYTHON_VER_MINOR=6 @REM ############################################################## @REM # You should not have to modify anything below this line @@ -304,17 +306,19 @@ goto check_build_environment ) ) -:defined_python +@REM Check Python environment if not defined PYTHON_COMMAND ( set PYTHON_COMMAND=py -3 - py -3 %BASE_TOOLS_PATH%\Tests\PythonTest.py >PythonCheck.txt 2>&1 - setlocal enabledelayedexpansion - set /p PythonCheck=<"PythonCheck.txt" - del PythonCheck.txt - if "!PythonCheck!" NEQ "TRUE" ( + py -3 %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 ( if not defined PYTHON_HOME if not defined PYTHONHOME ( - endlocal set PYTHON_COMMAND= echo. echo !!! ERROR !!! Binary python tools are missing. @@ -327,8 +331,6 @@ if not defined PYTHON_COMMAND ( ) ) -endlocal - if defined PYTHON_HOME ( if EXIST "%PYTHON_HOME%" ( set PYTHON_COMMAND=%PYTHON_HOME%\python.exe @@ -340,27 +342,30 @@ if defined PYTHON_HOME ( ) ) -%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="%PYTHON_COMMAND%" is not installed or 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="%PYTHON_COMMAND%" does not exist or is not a Python interpreter. + echo. + goto end ) endlocal - %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 +) :use_builtin_basetools @echo Using EDK2 in-source Basetools @@ -444,5 +449,7 @@ set VS2019= set VS2017= set VS2015= set VSTool= +set PYTHON_VER_MAJOR= +set PYTHON_VER_MINOR= +set SCRIPT_ERROR= popd - -- 2.40.0.windows.1