From nobody Sun May 19 16:31:35 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+99423+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+99423+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1675300477; cv=none; d=zohomail.com; s=zohoarc; b=YrneMXwjUJpDC7SowfjBwqHQN2EM7cLnHv0uA7MMsPgrcGZFkSd5vL5i6E/O5zwaYoHMeBdrY6muov8TsqxieycsewLzRLv4I22eFwH5g28JXuu1qHaLWdsL5zroOeQOVkDZvPB5XSwb2LDar1MvoaLcCfQaSc4FUzBSNlsAulE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675300477; 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=iy8d8hii/H8gkVoYFwzBvLotqWRwQAAP6XxrPvpRl0M=; b=IIa/ScH/Pbd963r54NUe4scCh9DhOl2SN08hp6P9M8rLoM/zg3bMha842LLWW1TjfvICV67UlMZSq7fiCqTANVmuaUCyX7IaRZsO2uoC7h13AGtQRWtkEdkCj3TR7gURTQ/vvMsdMhk6hT9rBkhuvO9lR4dN1dimSwQVfRg02iU= 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+99423+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 1675300476864897.0470031229173; Wed, 1 Feb 2023 17:14:36 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 7zdqYY1788612xCriB5OowvI; Wed, 01 Feb 2023 17:14:36 -0800 X-Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web10.35406.1675282966636295765 for ; Wed, 01 Feb 2023 12:22:46 -0800 X-Received: by mail-pj1-f50.google.com with SMTP id mi9so9274722pjb.4 for ; Wed, 01 Feb 2023 12:22:46 -0800 (PST) X-Gm-Message-State: eC6s3POlmUXTf8CmiVrS3OXwx1787277AA= X-Google-Smtp-Source: AK7set/QouhYJSxV9MzqJhQFJrzztAM2Xx0EerktQqbeiS4ncfPUzoGwtH4z95FXM/U9NrcKbVcV1w== X-Received: by 2002:a17:90a:1988:b0:22c:717b:cb23 with SMTP id 8-20020a17090a198800b0022c717bcb23mr3717444pji.35.1675282965881; Wed, 01 Feb 2023 12:22:45 -0800 (PST) X-Received: from localhost.localdomain ([2001:4898:80e8:37:5ce6:5b34:9ec1:b619]) by smtp.gmail.com with ESMTPSA id y7-20020a17090abd0700b0022bb6d75a6fsm1772119pjr.15.2023.02.01.12.22.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 12:22:45 -0800 (PST) From: Joey Vagedes To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao , Yuwei Chen , Michael D Kinney Subject: [edk2-devel] [PATCH v1 1/1] BaseTools: Update WindowsVsToolChain plugin Date: Wed, 1 Feb 2023 12:22:32 -0800 Message-Id: <20230201202232.1410-2-joey.vagedes@gmail.com> In-Reply-To: <20230201202232.1410-1-joey.vagedes@gmail.com> References: <20230201202232.1410-1-joey.vagedes@gmail.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,joey.vagedes@gmail.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1675300476; bh=ACrIRYKQTJGUov9kpJn6ptjNHBvvQ/oy3Kf41IFK7Pc=; h=Cc:Date:From:Reply-To:Subject:To; b=OsT7t97ahZDq49uWrM761yc+KgiTTMQ06bqwPxjs9aqy8g+bUbg/19Kzwtk62IuMklQ Y8n7tsVkzEyTYwR77M5UvG8bi5C73lS458ziqhEqdYzKPKpaURn8rg7eQvOVhdmffYwg/ 695vL7EiLQ/NqkmTusa7EQDjkzAdd8RdgUA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1675300478588100003 Content-Type: text/plain; charset="utf-8" This patch updates edk2-pytool-library dependency to v0.13.0, which has an interface change to FindWithVsWhere. The BaseTools plugin uses this function, so it is being updated to account for the interface change. Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Cc: Michael D Kinney Signed-off-by: Joey Vagedes Acked-by: Michael Kubacki > Acked-by: Michael Kubacki > Acked-by: Michael Kubacki --- BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py | 16 +++++++++++= +---- pip-requirements.txt | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py b/Ba= seTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py index 0fba2c1b5325..615b5ed6d131 100644 --- a/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py +++ b/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py @@ -177,15 +177,23 @@ class WindowsVsToolChain(IUefiBuildPlugin): =20 def _get_vs_install_path(self, vs_version, varname): # check if already specified - path =3D shell_environment.GetEnvironment().get_shell_var(varname) + path =3D None + if varname is not None: + path =3D shell_environment.GetEnvironment().get_shell_var(varn= ame) + if(path is None): # Not specified...find latest - (rc, path) =3D FindWithVsWhere(vs_version=3Dvs_version) - if rc =3D=3D 0 and path is not None and os.path.exists(path): + try: + path =3D FindWithVsWhere(vs_version=3Dvs_version) + except (EnvironmentError, ValueError, RuntimeError) as e: + self.Logger.error(str(e)) + return None + + if path is not None and os.path.exists(path): self.Logger.debug("Found VS instance for %s", vs_version) else: self.Logger.error( - "Failed to find VS instance with VsWhere (%d)" % rc) + f"VsWhere successfully executed, but could not find VS= instance for {vs_version}.") return path =20 def _get_vc_version(self, path, varname): diff --git a/pip-requirements.txt b/pip-requirements.txt index 4ffcadddd8cf..d3256ff1ade7 100644 --- a/pip-requirements.txt +++ b/pip-requirements.txt @@ -12,8 +12,8 @@ # https://www.python.org/dev/peps/pep-0440/#version-specifiers ## =20 -edk2-pytool-library=3D=3D0.12.1 -edk2-pytool-extensions~=3D0.20.0 +edk2-pytool-library=3D=3D0.13.0 +edk2-pytool-extensions~=3D0.21.2 edk2-basetools=3D=3D0.1.39 antlr4-python3-runtime=3D=3D4.7.1 lcov-cobertura=3D=3D2.0.2 --=20 2.39.0.windows.2 -=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 (#99423): https://edk2.groups.io/g/devel/message/99423 Mute This Topic: https://groups.io/mt/96691434/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-