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.web10.85946.1682442943858705458 for ; Tue, 25 Apr 2023 10:15:44 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm1 header.b=ChRbHCkS; 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 3E6A25C00D7; Tue, 25 Apr 2023 13:15:43 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 25 Apr 2023 13:15:43 -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=1682442943; x= 1682529343; bh=81U4V38dQfcN1MXHawIhVZydaQGBSHlRGcfg/8vDj1I=; b=C hRbHCkSSPvpcFpytkjGgvHXwGzZVKGn128sqIwVuovtwwTUvlNlAviwUIAB1PrR3 5XYX10p4ItKn6V9PI4KLSxdZsq8KywGcigdyGcIlThLCgWdobkCwytmKW7PanNyO gMkau7xM5MKAjFOCD7rJ7FiTAICax5pvFTbedkeJLF3BRK/fMXBX2Gyda2cSF8Gv Id6voaZDoVLZ1SWu1m8k1iGwjC6Yho38iflGq3jqRTJvIYiKMLjOu7PDZrfHRfOG LnrrZrhuPhDKmq3f78qD6ihaA5UVWQQhRI9y4JIleF3m5RygKG8eRtKkOaBt/LiI GQsWa1RlcpIAlsbyaUyxA== 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=1682442943; x= 1682529343; bh=81U4V38dQfcN1MXHawIhVZydaQGBSHlRGcfg/8vDj1I=; b=f bD6MaXAGQS0S9e6tGJ1TpwfTLPzNv9ef2DdMnrDuPPBEkkL/uBOuWQLaZwOLVRni TTSiXgWAMKM27q2pNhEafvfnqdsjhwD/5PLW5ErPR8mGGhGmJfyhc3uc48W+BvJB jjzxuq8AsvjpAyKj/LXBTY5OhbwK6kHp2m4sSmt3wWt8cGlD+TCzb5j/ANX3Diy+ GvL1gTLHu36P9I50jYTTpxau81n7QLvsfq1pp8tZIRYugMUQKyqsEDJDQ+SiKZsS hUOBvOkygtRg6WtNeSbfbsKHKwk0qPuA6ru81eqQAWpCXeq1cBGoth0spNjmALXH f2ZrHcmQ7fHsOMQwq1ztg== 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 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: [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> 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 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 # +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.9 which was the minimum required on 2023-04-24. + req_major_version = 3 + req_minor_version = 9 + + 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 29a630b9035c..66df628eac5f 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=9 @REM ############################################################## @REM # You should not have to modify anything below this line @@ -322,17 +324,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. @@ -345,8 +349,6 @@ if not defined PYTHON_COMMAND ( ) ) -endlocal - if defined PYTHON_HOME ( if EXIST "%PYTHON_HOME%" ( set PYTHON_COMMAND=%PYTHON_HOME%\python.exe @@ -358,27 +360,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 @@ -466,5 +471,7 @@ set VS2015= set VS2013= set VS2012= set VSTool= +set PYTHON_VER_MAJOR= +set PYTHON_VER_MINOR= +set SCRIPT_ERROR= popd - -- 2.40.0.windows.1