[v1] edksetup.bat, BaseTools: Improve Windows environment setup and BaseTools C compilation

[edk2-devel] [PATCH 0/6] edksetup.bat, BaseTools: Improve Windows environment setup and BaseTools C compilation

Rebecca Cran posted 6 patches 1 year ago

Diff against v2 v3
Download series mbox

Failed in applying to current master (apply log)

There is a newer version of this series

BaseTools/Source/C/Makefiles/NmakeSubdirs.py |   2 +-
BaseTools/Tests/PythonTest.py                |  21 ++-
BaseTools/toolsetup.bat                      | 157 ++++++++------------
edksetup.bat                                 |   1 +
4 files changed, 85 insertions(+), 96 deletions(-)

Expand all Fold all

[edk2-devel] [PATCH 0/6] edksetup.bat, BaseTools: Improve Windows environment setup and BaseTools C compilation

Posted by Rebecca Cran 1 year ago

There are remnants of Python 2 support in BaseTools/toolsetup.bat that it's
probably time to remove since we only support Python 3.9 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

Rebecca Cran (6):
  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: Update toolsetup.bat to not use BASETOOLS_PYTHON_SOURCE
  BaseTools: only print the environment once in toolsetup.bat

 BaseTools/Source/C/Makefiles/NmakeSubdirs.py |   2 +-
 BaseTools/Tests/PythonTest.py                |  21 ++-
 BaseTools/toolsetup.bat                      | 157 ++++++++------------
 edksetup.bat                                 |   1 +
 4 files changed, 85 insertions(+), 96 deletions(-)

-- 
2.40.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#103587): https://edk2.groups.io/g/devel/message/103587
Mute This Topic: https://groups.io/mt/98497580/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-