From nobody Sat Sep 21 02:58:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+103592+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+103592+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1682442948; cv=none; d=zohomail.com; s=zohoarc; b=HbouJnPJtJbcFd3+ofgIpFzDd/LIEbWsWuowPLgbuzyW/gvI/hRcQ3xVNEcKB3deiRDrZ1nosbeZOPxLlsRv5L9BvK2vwPNVEXq+Iu5Xh+ev/ia0x0z0KGhBGtlNJY7BZLaY8spE8ATmfpoE0rgVC/X2VjLSmp0Am2Tc9yGeT6s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682442948; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=d+flBmBFXwgLJToaxYB8j7hS8dkrmnYBhSRWpHytJzg=; b=hm8hssziHkW+SA0VGEzbGSGd57YGUU9L+Ncn7jkcb9dkaZ/fjSx4/+nPSs5c7e8BCWsAAxOICuR38kuNi8Ve7AWqPGFfsRj6WBH8TfIPVYg/9saHeo9Yz3Xr0VxER5+m0IbGiYKfdULUG2iO1Vp+F4VyEB4yU/riN5felTFEjek= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+103592+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1682442948696941.4560974497996; Tue, 25 Apr 2023 10:15:48 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id XguVYY1788612xaC56XLwZBI; Tue, 25 Apr 2023 10:15:46 -0700 X-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 X-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) X-Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 25 Apr 2023 13:15:44 -0400 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 X-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: [edk2-devel] [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> In-Reply-To: <20230425171518.1584-1-rebecca@bsdio.com> References: <20230425171518.1584-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: OVDlqTHAZoPLc0SCBiL2OXS3x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1682442946; bh=EB3SMbguJBA2fEjr8WTML09Pcr2kyb7ZaxoPnnR7Xlg=; h=Cc:Date:From:Reply-To:Subject:To; b=YpdOHPpnI0y7ovHp2VQ/T8vhmVRchBBiQDeSkF834S0lRiSFOoUHUVQ9F5pmxxLhkwe o4rgD5sHG8v7TgB858ZtJWGYNjpVFssyApJ2XjGvRnJz5JnjlZ5pFzHQjQ1Wj95GYp54k PHRHEI+u8wCxk/4ZSZezePQSjCCL83cr4B4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1682442949140100025 Content-Type: text/plain; charset="utf-8" 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=3D%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%" - set BASETOOLS_PYTHON_SOURCE=3D%BASE_TOOLS_PATH%\Source\Python - set PYTHONPATH=3D%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH% + set PYTHONPATH=3D%BASE_TOOLS_PATH%\Source\Python;%PYTHONPATH% goto print_python_info =20 :use_pip_basetools @echo Using Pip Basetools set "PATH=3D%BASE_TOOLS_PATH%\BinPipWrappers\WindowsLike;%PATH%" - set BASETOOLS_PYTHON_SOURCE=3Dedk2basetools + set PYTHONPATH=3D%BASE_TOOLS_PATH%\Source\Python;%PYTHONPATH% goto print_python_info =20 :print_python_info --=20 2.40.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#103592): https://edk2.groups.io/g/devel/message/103592 Mute This Topic: https://groups.io/mt/98497588/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-