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.85947.1682442945684298224 for ; Tue, 25 Apr 2023 10:15:45 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm1 header.b=TOLdN15V; spf=pass (domain: bsdio.com, ip: 66.111.4.27, mailfrom: rebecca@bsdio.com) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id F2C825C0159; Tue, 25 Apr 2023 13:15:44 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 25 Apr 2023 13:15:44 -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=1682442944; x= 1682529344; bh=OQ0KEbm8dU0VmtDsc1Rk+fg/WixpEI3Wt7A1Eezzseg=; b=T OLdN15VzBVboQ1xaz3AzGGA/cJbPnli2JoGVf+xuyZBtDpJViTVmer67PiMtrzmP RetO2ouN4nZJJvou/N2IGgcjgALG06dpseNeUWUWNcXjGdLDIB9nSXcs58iS4DKB b4hwimqFwpCF8YLu2zFVVPsVYoIP1y8y+hLROBOxdgENI6DqOsXJX/2OydVO6KZY J06Za2hP1LRZFpLOE4oiCvM7mR+NBnLAnLfZZw6R1jn921cBJqaCg8WmCzYqXf9N K4rHXT3yPw+di09YuhBVpfg0C/fRreJY32kedmiwVJpN89HkZU1hcdktDa6q3L21 ybHsRFTnMqtFyydH8v9gg== 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=1682442944; x= 1682529344; bh=OQ0KEbm8dU0VmtDsc1Rk+fg/WixpEI3Wt7A1Eezzseg=; b=R kj3+5KK5/fw1t0EoMJhc4NuCZjrv+uqw0ryr7jvetphe/niTOzjBtZ8Qvwpmx6Y1 NXnSE6LcreNpOiJNbNtPuDz3xKXjyIbtVk7sZgUP0BX2NRT8tRHSp8iwgwpvkbOe 4BppmXqKp2woJysrDg3lkpK4cjOTUBt+jZp0B2crIh0RTmCQ6TrjBYhTUhECmWvE R8q1rgXNY9Ro1AkX/V5zBKHJ4cGrGqSJl5JP6IsxONAHyPPW4MZH+/qSEenTChtm 99lnoyMPgI+zBuxcQQEu2yxfE2Z+OxTIJsP6R4GY+Ns9KNpp7Gu6YOvaYhuQVaW6 7/O/g5fzd3+7UXG9ZAD2g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeduvddgudduudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeftvggs vggttggrucevrhgrnhcuoehrvggsvggttggrsegsshguihhordgtohhmqeenucggtffrrg htthgvrhhnpeegffeuueelvdeggfdvvdfgtedvudfhfeekudekieektddukeefteetieef vdelfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hrvggsvggttggrsegsshguihhordgtohhm X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 25 Apr 2023 13:15:43 -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 5/6] BaseTools: Update toolsetup.bat to not use BASETOOLS_PYTHON_SOURCE Date: Tue, 25 Apr 2023 11:15:17 -0600 Message-Id: <20230425171518.1584-6-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 The BASETOOLS_PYTHON_SOURCE environment variable is only used temporarily to set PYTHONPATH. Since it doesn't help improve clarity, remove it. While here, make sure we set PYTHONPATH when we're using Pip BaseTools so that build etc. can be found. Signed-off-by: Rebecca Cran --- BaseTools/toolsetup.bat | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 66df628eac5f..80aa2992ba80 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -389,14 +389,13 @@ if %ERRORLEVEL% EQU 0 ( @echo Using EDK2 in-source Basetools if defined BASETOOLS_PYTHON_SOURCE goto print_python_info set "PATH=%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%" - set BASETOOLS_PYTHON_SOURCE=%BASE_TOOLS_PATH%\Source\Python - set PYTHONPATH=%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH% + set PYTHONPATH=%BASE_TOOLS_PATH%\Source\Python;%PYTHONPATH% goto print_python_info :use_pip_basetools @echo Using Pip Basetools set "PATH=%BASE_TOOLS_PATH%\BinPipWrappers\WindowsLike;%PATH%" - set BASETOOLS_PYTHON_SOURCE=edk2basetools + set PYTHONPATH=%BASE_TOOLS_PATH%\Source\Python;%PYTHONPATH% goto print_python_info :print_python_info -- 2.40.0.windows.1