From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from walk.intel-email.com (walk.intel-email.com [101.227.64.242]) by mx.groups.io with SMTP id smtpd.web11.8033.1676432995234373963 for ; Tue, 14 Feb 2023 19:49:57 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@byosoft.com.cn header.s=cloud-union header.b=U28DTug7; spf=pass (domain: byosoft.com.cn, ip: 101.227.64.242, mailfrom: gaoliming@byosoft.com.cn) Received: from walk.intel-email.com (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id 201F5CD1F7D0 for ; Wed, 15 Feb 2023 11:49:52 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=byosoft.com.cn; s=cloud-union; t=1676432992; bh=/cqOr7ZQozoLm54KT8lRcRe6t2QeF8pmAwu2N/ffyJY=; h=From:To:Cc:References:In-Reply-To:Subject:Date; b=U28DTug7lukEo21pPFb85HkR+9OzKMmcYAJEtUj/bmMyB/kqHEpvNk042ERqT+AdD SdihWM1ENwLjMskV/FfIoWhDDIvhSIS2geG6yAbXc7rBKlOpR7lMNcfQ3vGtBJPssc tyxdntkJTXDYowTecFq9p+Q0n/MbBy8CK97YYU50= Received: from localhost (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id 1CC94CD1F7D6 for ; Wed, 15 Feb 2023 11:49:52 +0800 (CST) Received: from walk.intel-email.com (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id D33D8CD1F7CE for ; Wed, 15 Feb 2023 11:49:51 +0800 (CST) Authentication-Results: walk.intel-email.com; none Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by walk.intel-email.com (Postfix) with SMTP id 756A8CD1F7D4 for ; Wed, 15 Feb 2023 11:49:49 +0800 (CST) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Wed, 15 Feb 2023 11:49:47 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 58.246.60.130 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: "'Joey Vagedes'" , "'Michael D Kinney'" , "'Bob Feng'" , "'Yuwei Chen'" Cc: , "'Michael Kubacki'" References: <20230201202232.1410-1-joey.vagedes@gmail.com> <20230201202232.1410-2-joey.vagedes@gmail.com> In-Reply-To: Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BBVENIIHYxIDEvMV0gQmFzZVRvb2xzOiBVcGRhdGUgV2luZG93c1ZzVG9vbENoYWluIHBsdWdpbg==?= Date: Wed, 15 Feb 2023 11:49:48 +0800 Message-ID: <046f01d940f0$8d5b4d40$a811e7c0$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQJ0kTXWo5him5FdnxDKlPuoFK3siAGDH6rKAQdcsWcBPctteq16fCVA Sender: "gaoliming" Content-Type: multipart/alternative; boundary="----=_NextPart_000_0470_01D94133.9B7FC5C0" Content-Language: zh-cn ------=_NextPart_000_0470_01D94133.9B7FC5C0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Joey: This patch is good to me. Reviewed-by: Liming Gao = =20 Dose this patch plan to catch this stable tag 202302? =20 Thanks Liming =E5=8F=91=E4=BB=B6=E4=BA=BA: Joey Vagedes =20 =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2023=E5=B9=B42=E6=9C=887=E6=97=A5 = 0:53 =E6=94=B6=E4=BB=B6=E4=BA=BA: Liming Gao ; = Michael D Kinney ; Bob Feng = ; Yuwei Chen =E6=8A=84=E9=80=81: devel@edk2.groups.io; Michael Kubacki = =E4=B8=BB=E9=A2=98: Re: [edk2-devel] [PATCH v1 1/1] BaseTools: Update = WindowsVsToolChain plugin =20 I received an Acked-by, but would like to request a Reviewed-by from a = BaseTools maintainer. @gaoliming@byosoft.com.cn I would = like to request that this change be included in the stable tag. =20 This change updates edk2-pytool-library and edk2-pytool-extensions to = the latest release, which brings in additional features and bug fixes for those building via = edk2-pytools. =20 There are no breaking changes, and no changes in the required python = version. =20 One of the changes made in edk2-pytool-library did result in a change in = interface, which was necessary to provide a better user experience in handling errors for said = function, however this PR provides a tested change (used by Project MU) for a script using the method in BaseTools. =20 This change is also critical for the edk2-pytools project itself as that = project can not successfully perform integration checks (which happen on every change to pytools) for edk2 on = future PRs until this interface is changed. =20 Thanks, Joey =20 On Fri, Feb 3, 2023 at 7:43 PM Michael Kubacki = > = wrote: Acked-by: Michael Kubacki > On 2/1/2023 3:22 PM, Joey Vagedes wrote: > 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. >=20 > Cc: Bob Feng > > Cc: Liming Gao > > Cc: Yuwei Chen > > Cc: Michael D Kinney > >=20 > Signed-off-by: Joey Vagedes > > --- > BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py | 16 = ++++++++++++---- > pip-requirements.txt | 4 ++-- > 2 files changed, 14 insertions(+), 6 deletions(-) >=20 > diff --git a/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py = b/BaseTools/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 >=20 > def _get_vs_install_path(self, vs_version, varname): >=20 > # check if already specified >=20 > - path =3D = shell_environment.GetEnvironment().get_shell_var(varname) >=20 > + path =3D None >=20 > + if varname is not None: >=20 > + path =3D = shell_environment.GetEnvironment().get_shell_var(varname) >=20 > + >=20 > if(path is None): >=20 > # Not specified...find latest >=20 > - (rc, path) =3D FindWithVsWhere(vs_version=3Dvs_version) >=20 > - if rc =3D=3D 0 and path is not None and = os.path.exists(path): >=20 > + try: >=20 > + path =3D FindWithVsWhere(vs_version=3Dvs_version) >=20 > + except (EnvironmentError, ValueError, RuntimeError) as e: >=20 > + self.Logger.error(str(e)) >=20 > + return None >=20 > + >=20 > + if path is not None and os.path.exists(path): >=20 > self.Logger.debug("Found VS instance for %s", = vs_version) >=20 > else: >=20 > self.Logger.error( >=20 > - "Failed to find VS instance with VsWhere (%d)" % = rc) >=20 > + f"VsWhere successfully executed, but could not = find VS instance for {vs_version}.") >=20 > return path >=20 > =20 >=20 > def _get_vc_version(self, path, varname): >=20 > 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 > ## >=20 > =20 >=20 > -edk2-pytool-library=3D=3D0.12.1 >=20 > -edk2-pytool-extensions~=3D0.20.0 >=20 > +edk2-pytool-library=3D=3D0.13.1 >=20 > +edk2-pytool-extensions~=3D0.21.2 >=20 > edk2-basetools=3D=3D0.1.39 >=20 > antlr4-python3-runtime=3D=3D4.7.1 >=20 > lcov-cobertura=3D=3D2.0.2 >=20 ------=_NextPart_000_0470_01D94133.9B7FC5C0 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Joey:

=C2=A0This = patch is good to me. Reviewed-by: Liming Gao = <gaoliming@byosoft.com.cn>

 

=C2=A0Dose = this patch plan to catch this stable tag 202302?

 

Thanks

Liming

=E5=8F=91=E4=BB= =B6=E4=BA=BA: Joey Vagedes = <joey.vagedes@gmail.com>
=E5=8F=91=E9=80= =81=E6=97=B6=E9=97=B4: = 2023=E5=B9=B42=E6=9C=887=E6=97=A5 0:53
=E6=94=B6=E4=BB=B6=E4=BA=BA: Liming Gao = <gaoliming@byosoft.com.cn>; Michael D Kinney = <michael.d.kinney@intel.com>; Bob Feng = <bob.c.feng@intel.com>; Yuwei Chen = <yuwei.chen@intel.com>
=E6=8A=84=E9=80=81: devel@edk2.groups.io; = Michael Kubacki = <mikuback@linux.microsoft.com>
=E4=B8=BB=E9=A2=98: Re: [edk2-devel] [PATCH v1 = 1/1] BaseTools: Update WindowsVsToolChain = plugin

 

I received an Acked-by, but would like to request a = Reviewed-by from a BaseTools maintainer.
@gaoliming@byosoft.com.cn I = would like to request that this change be included in the stable = tag.

 

This = change updates edk2-pytool-library and edk2-pytool-extensions to the = latest release, which
brings in additional features and bug fixes for = those building via edk2-pytools.

 

There are = no breaking changes, and no changes in the required python = version.

 

One of = the changes made in edk2-pytool-library did result in a change in = interface, which was necessary
to provide a better user experience in = handling errors for said function, however this PR provides a = tested
change (used by Project MU) for a script using the method in = BaseTools.

 

This = change is also critical for the edk2-pytools project itself as that = project can not successfully perform
integration checks (which happen = on every change to pytools) for edk2 on future PRs until this = interface
is changed.

 

Thanks,

Joey

 

On Fri, Feb 3, 2023 at 7:43 PM = Michael Kubacki <mikuback@linux.microsoft.com> = wrote:

Acked-by: Michael Kubacki <michael.kubacki@microsoft.com>

On = 2/1/2023 3:22 PM, Joey Vagedes wrote:
> 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 <bob.c.feng@intel.com>
> Cc: Liming Gao = <gaoliming@byosoft.com.cn>
> Cc: Yuwei = Chen <yuwei.chen@intel.com>
> Cc: Michael D = Kinney <michael.d.kinney@intel.com>
>
> = Signed-off-by: Joey Vagedes <joey.vagedes@gmail.com>
> = ---
>  =  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/BaseTools/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):
>   
> =
>       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(varname)
> =
> +
>
>          =  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
>
>   
> =
>       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-speci= fiers
>
>   ##
>
>  =  
>
> -edk2-pytool-library=3D=3D0.12.1
> =
> -edk2-pytool-extensions~=3D0.20.0
>
> = +edk2-pytool-library=3D=3D0.13.1
>
> = +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
> =

------=_NextPart_000_0470_01D94133.9B7FC5C0--