From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=EvIg3nE0; spf=pass (domain: gmail.com, ip: 209.85.216.50, mailfrom: joey.vagedes@gmail.com) Received: by mail-pj1-f50.google.com with SMTP id mi9so9274722pjb.4 for ; Wed, 01 Feb 2023 12:22:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fayhkySIWbj3dfrtkQNBuDAXr23NITepNGhBhNv8jCc=; b=EvIg3nE0Xxmlor1AKpbozHauq1/N5kIJjhaX/s+5FGHRbhRl0e7+WW5H8eJAlSNMsC reUBanU7ZEAzka+y9J4gEAWgF2clpOVziOHaj8NPpH4udvF1XYYXiECurEIYwjob2oXd TRrluMaDN6wbsShmJR9Rgpliozb0YS3nf49UL/mu+VufCB0u1HTI+geAMSbL/jNZDqNg t5HmpV6buza6PzA5cbWTb/7fzktQTVbj7jhpxYQypcpEe1FSqOho8qBNEkayiFyo6quy maMxnxCpixZ2HoID2tnMIvn11rCLlLQJ9qn4p+9iQUyEFcfKud6uhQLYlrDsStTnn1Qh 9BAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fayhkySIWbj3dfrtkQNBuDAXr23NITepNGhBhNv8jCc=; b=xDfA28s1D6wRFuAN/G8raXCZvxpOJQ9M10I7Li9OoH9FNwwkiid1KMrcseFvFi9tsT oXDNxJck9ECgwS9E7+p8EP+d4daTSEZk++gH6brZSWmGntH8cnITVmxHHfv8jWHEQNXg i/+T1zVep5L5ZFihZ+p3dsVdZQHnrE0VT/uvsBHy5FkJ0XH5A54CMiVFIF1Rl/jnMddy Kv1lRSBdRBdSyU/JgnZsoMH2K3NmXjVzw7Zgg0ZEWSS2x7w0KViDBJbr0BtWZRX/v6vc gyAzwojNVNIJkZ4OEtFsEA3SoBISmhXkfCaK5tp6N1eRKo17CarpB1okgDUrM8f7WXwM C2oA== X-Gm-Message-State: AO0yUKVsSMt3oZoCzupC9K1qf0ZWXKWATb/vVJ1Bp9UEfQ8y0Zs9G4HE MfcJLQIw34GJ6ZccNAedMi9clts4b0mi/w== 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) Return-Path: 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: [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> X-Mailer: git-send-email 2.39.0.windows.2 In-Reply-To: <20230201202232.1410-1-joey.vagedes@gmail.com> References: <20230201202232.1410-1-joey.vagedes@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 --- 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): =0D def _get_vs_install_path(self, vs_version, varname):=0D # check if already specified=0D - path =3D shell_environment.GetEnvironment().get_shell_var(varname)= =0D + path =3D None=0D + if varname is not None:=0D + path =3D shell_environment.GetEnvironment().get_shell_var(varn= ame)=0D +=0D if(path is None):=0D # Not specified...find latest=0D - (rc, path) =3D FindWithVsWhere(vs_version=3Dvs_version)=0D - if rc =3D=3D 0 and path is not None and os.path.exists(path):= =0D + try:=0D + path =3D FindWithVsWhere(vs_version=3Dvs_version)=0D + except (EnvironmentError, ValueError, RuntimeError) as e:=0D + self.Logger.error(str(e))=0D + return None=0D +=0D + if path is not None and os.path.exists(path):=0D self.Logger.debug("Found VS instance for %s", vs_version)= =0D else:=0D self.Logger.error(=0D - "Failed to find VS instance with VsWhere (%d)" % rc)=0D + f"VsWhere successfully executed, but could not find VS= instance for {vs_version}.")=0D return path=0D =0D def _get_vc_version(self, path, varname):=0D 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=0D ##=0D =0D -edk2-pytool-library=3D=3D0.12.1=0D -edk2-pytool-extensions~=3D0.20.0=0D +edk2-pytool-library=3D=3D0.13.0=0D +edk2-pytool-extensions~=3D0.21.2=0D edk2-basetools=3D=3D0.1.39=0D antlr4-python3-runtime=3D=3D4.7.1=0D lcov-cobertura=3D=3D2.0.2=0D --=20 2.39.0.windows.2