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.38450.1683393859995222697 for ; Sat, 06 May 2023 10:24:20 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm1 header.b=tJiQaVr5; 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 36D905C00DF; Sat, 6 May 2023 13:24:19 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sat, 06 May 2023 13:24:19 -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:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm1; t=1683393859; x=1683480259; bh=Gxmg4kz7Fz 1Koi8JMwvWkytMyzSaMdFQGvj0vtwLuPM=; b=tJiQaVr5+TQyhhIe3kzMrqopfm lgfdIPLSFj1aXfOy1eHBVcJgqxM0Qyvhm+H9TLM6HXDp58JGprnBT7c/0Gw46tnH rrwB8hhY6ygbMjgWy8kejuTwF+GCGF5GsXDYTSMju05cMtSBJ4PI4Wi0SAKZl45U SfHZd3FghaIRckIuEe7AzZ/CczPW2A3HJ92OoNfuwq7QpWuV7cvBhb4IsI1h4v6x 3Ukk6/UYKQG/jBtV+ibb4BJN1+3I8ZbPMlhWKo4G0E8h46jjyYIzYbWA5ToB+0VT 8v+eGaHJ5Pioz+D5lof24zODYR8duHqlHLd2GDKFPTgvm2XyKJ3wiYejOJ9Q== 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:message-id:mime-version: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=1683393859; x=1683480259; bh=Gxmg4kz7Fz1Ko i8JMwvWkytMyzSaMdFQGvj0vtwLuPM=; b=AXMv8H5uFbTRWFDpwryjtgfbyemT7 YQMl3hI9Fll3khzkRFERcNlFb9zOnfntaZPZaV1QZBstITrYo7FEAepYQSPeBYGM hgUpME0WYCy0DqxJtl9bW/xHu90a3j9wdAgB2kqmK27KISxLsaYc2iz0EH/hrY1l TCW4jvgAEmPBr1Lwgl3s3fSDRy3dOjxcrQIClQ7LJQQ12N2nceV8fvYmHFHNWCH1 XlNK8/2SmfLPPC52ailQyHwQbcZ1QuZJ21+uHaQNHSlJfIWgjA4n0oq8IgRZ4UoD 5HbURDaLZX2agjdLrfZegG6YXmaGU7K45nsuryYxyX/6EeT5M6Oe9eGJQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeefgedgledtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheptfgvsggvtggt rgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrthhtvg hrnhepuddtfeduheeuveekhfdtkeduvdekteehgeevtdduieehhfdthfekffdtgeduffej necuffhomhgrihhnpehgihhthhhusgdrtghomhdpfhgufhdrihhntgenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehrvggsvggttggrsegsshgu ihhordgtohhm X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 6 May 2023 13:24:17 -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 v2 0/7] edksetup.bat, BaseTools: Improve Windows environment setup and BaseTools C compilation Date: Sat, 6 May 2023 11:23:55 -0600 Message-Id: <20230506172402.116-1-rebecca@bsdio.com> X-Mailer: git-send-email 2.40.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. Dongyan Qian (1): BaseSynchronizationLib: Fix LoongArch64 synchronization functions Gerd Hoffmann (2): OvmfPkg: move OvmfTpmPei.fdf.inc to Include/Fdf OvmfPkg: move OvmfTpmDxe.fdf.inc to Include/Fdf 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 ++++++++------------ MdePkg/Library/BaseSynchronizationLib/LoongArch64/AsmSynchronization.S | 30 ++--- MdePkg/Library/BaseSynchronizationLib/LoongArch64/Synchronization.c | 2 +- OvmfPkg/AmdSev/AmdSevX64.fdf | 4 +- OvmfPkg/CloudHv/CloudHvX64.fdf | 4 +- OvmfPkg/{ => Include/Fdf}/OvmfTpmDxe.fdf.inc | 0 OvmfPkg/{ => Include/Fdf}/OvmfTpmPei.fdf.inc | 0 OvmfPkg/OvmfPkgIa32.fdf | 4 +- OvmfPkg/OvmfPkgIa32X64.fdf | 4 +- OvmfPkg/OvmfPkgX64.fdf | 4 +- edksetup.bat | 1 + 13 files changed, 92 insertions(+), 104 deletions(-) rename OvmfPkg/{ => Include/Fdf}/OvmfTpmDxe.fdf.inc (100%) rename OvmfPkg/{ => Include/Fdf}/OvmfTpmPei.fdf.inc (100%) -- 2.40.0.windows.1