From nobody Thu Mar 28 14:15:21 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+105326+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+105326+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1685059797; cv=none; d=zohomail.com; s=zohoarc; b=O7SVahM5XL+b/RZU4ncxwHHlkIfViT21Os97F2WRhLbc1lxeX4ozAi4Sh2tuzgT2yBXuUd8R3Ykw5EPVsJvNgOe1Cs8sIwEKTd1sQoixQwheCSVEHuLdA4rD//Htt7tjP9P8jJDNmYMg3V33o67HNia63oVevTvr2SIRFeH2VP8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685059797; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=qsHSFo94JPvAjXyomFvYKgyO61DdMc30xT3XuuhH0QM=; b=JSH7UR5FSZk7do5aKVqW5EZvJvKj6bHUk28fmP++S7hLah13FXVlE3x/MEw4Jdffwg8zxBQAuY8VeBpNgy8DegVofebc4jOeY3oy81/xLepWdHglvIzc479Sd//ejqWkWAwi65yQwSD41Q1qI3PjyhTPTTZUoQ0cJzJAkXVptS0= 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+105326+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1685059797056986.5473910752062; Thu, 25 May 2023 17:09:57 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id j2bhYY1788612xXqwvPESfhx; Thu, 25 May 2023 17:09:56 -0700 X-Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web11.5442.1685059794045210915 for ; Thu, 25 May 2023 17:09:54 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10721"; a="354083923" X-IronPort-AV: E=Sophos;i="6.00,192,1681196400"; d="scan'208";a="354083923" X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2023 17:09:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10721"; a="699218635" X-IronPort-AV: E=Sophos;i="6.00,192,1681196400"; d="scan'208";a="699218635" X-Received: from gguo-desk.gar.corp.intel.com ([10.5.215.23]) by orsmga007.jf.intel.com with ESMTP; 25 May 2023 17:09:51 -0700 From: "Guo, Gua" To: devel@edk2.groups.io Cc: gua.guo@intel.com, Rebecca Cran , Liming Gao , Bob Feng , Yuwei Chen Subject: [edk2-devel] [PATCH v1] BaseTools: toolsetup.bat always execute PYTHON_HOME Date: Fri, 26 May 2023 08:09:48 +0800 Message-Id: <20230526000948.1862-1-gua.guo@intel.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,gua.guo@intel.com X-Gm-Message-State: cFhzaKKn2dqCUNkZpp3TvoNlx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1685059796; bh=Pz3bTnAzHj1bSAhQqVo5rAWyzXU0pse3w4F8aZ9cBQQ=; h=Cc:Date:From:Reply-To:Subject:To; b=YBe/WFTzObMIHjhgbWuQwLCrMVy815Hjf+52gLv+MW64yynmFIkQd+zWTlEywvvWz8u jX8Q4QafvAv8hIBqJbR/a/rtb74eXARKSX9uz33wvv7tPH/QR9YUi8MOetSgH0d3ieM6H 3e1JIntXnJ0c7kIzAtSakaty+eUabeSXONc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1685059798939100003 Content-Type: text/plain; charset="utf-8" From: Gua Guo Ideally behavior is like below order that can support one local build machine, clone multiple Edk2, some of edk2 repo use old tag and some of edk2 repo use new tag, they can both support on one machine. 1. if defined PYTHON_COMMAND only - use PYTHON_COMMAND =3D user assigned 2. if not defined PYTHON_COMMAND, auto detect py -3 - use PYTHON_COMMAND =3D py -3 3. if defined PYTHON_COMMAND and PYTHON_HOME, use PYTHON_COMMAND - use PYTHON_COMMAND =3D user assigned 4. if defined PYTHON_HOME only, - use PYTHON_COMMAND =3D %PYTHON_HOME%/python.exe SCRIPT_ERROR should return for paraent batch file to consume for error handle. Cc: Rebecca Cran Cc: Liming Gao Cc: Bob Feng Cc: Yuwei Chen Signed-off-by: Gua Guo --- BaseTools/toolsetup.bat | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 9521f67c02..8aef28192e 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -313,23 +313,25 @@ if not defined PYTHON_COMMAND ( ) ) =20 -if defined PYTHON_HOME ( - if EXIST "%PYTHON_HOME%" ( - set PYTHON_COMMAND=3D%PYTHON_HOME%\python.exe - ) else ( - echo . - echo !!! ERROR !!! PYTHON_HOME=3D"%PYTHON_HOME%" does not exist. - echo . - goto end +if not defined PYTHON_COMMAND ( + if defined PYTHON_HOME ( + if EXIST "%PYTHON_HOME%" ( + set PYTHON_COMMAND=3D%PYTHON_HOME%\python.exe + ) else ( + echo . + echo !!! ERROR !!! PYTHON_HOME=3D"%PYTHON_HOME%" does not exist. + echo . + goto end + ) ) -) =20 -%PYTHON_COMMAND% %BASE_TOOLS_PATH%\Tests\PythonTest.py %PYTHON_VER_MAJOR% = %PYTHON_VER_MINOR% >NUL 2>NUL -if %ERRORLEVEL% EQU 1 ( - echo. - echo !!! ERROR !!! Python %PYTHON_VER_MAJOR%.%PYTHON_VER_MINOR% or newer= is required. - echo. - goto end + %PYTHON_COMMAND% %BASE_TOOLS_PATH%\Tests\PythonTest.py %PYTHON_VER_MAJOR= % %PYTHON_VER_MINOR% >NUL 2>NUL + if %ERRORLEVEL% EQU 1 ( + echo. + echo !!! ERROR !!! Python %PYTHON_VER_MAJOR%.%PYTHON_VER_MINOR% or new= er is required. + echo. + goto end + ) ) if %ERRORLEVEL% NEQ 0 ( echo. @@ -447,5 +449,4 @@ set VS2015=3D set VSTool=3D set PYTHON_VER_MAJOR=3D set PYTHON_VER_MINOR=3D -set SCRIPT_ERROR=3D popd --=20 2.39.2.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 (#105326): https://edk2.groups.io/g/devel/message/105326 Mute This Topic: https://groups.io/mt/99141348/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-