From: "Rebecca Cran" <rebecca@bsdio.com>
To: devel@edk2.groups.io, Andrew Fish <afish@apple.com>,
Leif Lindholm <quic_llindhol@quicinc.com>,
Michael D Kinney <michael.d.kinney@intel.com>,
Liming Gao <gaoliming@byosoft.com.cn>,
Bob Feng <bob.c.feng@intel.com>,
Yuwei Chen <yuwei.chen@intel.com>
Cc: Rebecca Cran <rebecca@bsdio.com>
Subject: [PATCH v3 0/4] edksetup.bat, BaseTools: Improve Windows environment setup and BaseTools C compilation
Date: Sat, 6 May 2023 13:30:48 -0600 [thread overview]
Message-ID: <20230506193052.1835-1-rebecca@bsdio.com> (raw)
There are remnants of Python 2 support in BaseTools/toolsetup.bat that it's
probably time to remove since we only support Python 3.6 and newer these days.
So, remove the variables that enable Python3 support and simplify the batch
script. I've also seen errors where after running edksetup.bat the build
command isn't available because PYTHONPATH wasn't being set, so fix that
when the Pip BaseTools are being used.
At the same time, let's add a check that we meet the minimum version
requirement so we don't end up failing with an obscure error.
Building BaseTools causes a warning about threading.currentThread being
deprecated, so update code in NmakeSubdirs.py to switch to
threading.current_thread.
There needs to be further work, because if PYTHON_COMMAND isn't specified then
it defaults to "py -3", where py is C:\Windows\py.exe, which doesn't work if
you're using a virtualenv since it installs python.exe and pythonw.exe in
venv\Scripts. toolsetup.bat therefore fails to detect the Pip BaseTools and
uses the in-source Basetools.
GitHub PR: https://github.com/tianocore/edk2/pull/4302
GitHub branch: https://github.com/bcran/edk2/tree/py3
Changes between v1 and v2
=========================
- Require Python 3.6 or newer: 3.6 was when PEP 526 was added, which we use.
- Fix Tests/RunTests.py on Windows.
Rebecca Cran (4):
BaseTools: Remove Python2/Python3 detection from toolset.bat
BaseTools: use threading.current_thread in NmakeSubdirs.py
edksetup.bat: if toolsetup.bat fails, just exit
BaseTools: Update toolsetup.bat and Tests/PythonTest.py to check ver
BaseTools/Source/C/Makefiles/NmakeSubdirs.py | 2 +-
BaseTools/Tests/PythonTest.py | 22 +++-
BaseTools/toolsetup.bat | 119 ++++++++------------
edksetup.bat | 1 +
4 files changed, 69 insertions(+), 75 deletions(-)
--
2.40.0.windows.1
next reply other threads:[~2023-05-06 19:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-06 19:30 Rebecca Cran [this message]
2023-05-06 19:30 ` [PATCH v3 1/4] BaseTools: Remove Python2/Python3 detection from toolset.bat Rebecca Cran
2023-05-06 19:30 ` [PATCH v3 2/4] BaseTools: use threading.current_thread in NmakeSubdirs.py Rebecca Cran
2023-05-06 19:30 ` [PATCH v3 3/4] edksetup.bat: if toolsetup.bat fails, just exit Rebecca Cran
2023-05-06 19:30 ` [PATCH v3 4/4] BaseTools: Update toolsetup.bat and Tests/PythonTest.py to check ver Rebecca Cran
2023-05-08 1:30 ` 回复: [PATCH v3 0/4] edksetup.bat, BaseTools: Improve Windows environment setup and BaseTools C compilation gaoliming
2023-05-08 1:32 ` [edk2-devel] " Rebecca Cran
2023-05-08 1:43 ` 回复: " gaoliming
2023-05-08 1:49 ` Rebecca Cran
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230506193052.1835-1-rebecca@bsdio.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox