Re: [gentoo-dev] [PATCH] wxwidgets.eclass: Support EAPI 8
On Sun, 2021-08-01 at 16:40 +0200, Ulrich Mueller wrote:
> > > > > > On Sun, 01 Aug 2021, Michał Górny wrote:
>
> > > + 3.0) [[ ${EAPI} == 7 ]] \
> > > + || die "GTK 2 no longer supported
> > > in EAPI ${EAPI}" ;;
>
> > Let's make it:
>
> > [[ ${EAPI} != 7 ]] && die ...
>
> > to keep the logic more straightforward (and consistent with 'if ...;
> > then').
>
> Generally, I like the " || die" style more,
> because it is more common. It is also more consistent about the return
> status of the whole expression. With the && operator above, it would
> return shell false in case of success.
A user requested the other style in one of my earlier patches,
and I kinda agree that this reverse logic can easily get confusing.
> Of course, there's no functional difference here, but if you have it
> at
> the end of a function or before an explicit return statement it may
> play
> a role.
...only if it's nonfatal-friendly.
--
Best regards,
Michał Górny
Re: [gentoo-dev] [PATCH] wxwidgets.eclass: Support EAPI 8
> On Sun, 01 Aug 2021, Michał Górny wrote:
>> +3.0) [[ ${EAPI} == 7 ]] \
>> + || die "GTK 2 no longer supported in EAPI
>> ${EAPI}" ;;
> Let's make it:
> [[ ${EAPI} != 7 ]] && die ...
> to keep the logic more straightforward (and consistent with 'if ...;
> then').
Generally, I like the " || die" style more,
because it is more common. It is also more consistent about the return
status of the whole expression. With the && operator above, it would
return shell false in case of success.
Of course, there's no functional difference here, but if you have it at
the end of a function or before an explicit return statement it may play
a role.
Ulrich
signature.asc
Description: PGP signature
Re: [gentoo-dev] [PATCH] wxwidgets.eclass: Support EAPI 8
On Sun, 2021-08-01 at 14:36 +0200, Ulrich Müller wrote:
> Reviewed-by: Mart Raudsepp
> Reviewed-by: David Seifert
> Signed-off-by: Ulrich Müller
> ---
> eclass/wxwidgets.eclass | 13 +++--
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
> index 4357e7367cc7..28735aaac6fd 100644
> --- a/eclass/wxwidgets.eclass
> +++ b/eclass/wxwidgets.eclass
> @@ -4,7 +4,7 @@
> # @ECLASS: wxwidgets.eclass
> # @MAINTAINER:
> # wxwidg...@gentoo.org
> -# @SUPPORTED_EAPIS: 7
> +# @SUPPORTED_EAPIS: 7 8
> # @BLURB: Manages build configuration for wxGTK-using packages.
> # @DESCRIPTION:
> # This eclass sets up the proper environment for ebuilds using the wxGTK
> @@ -21,10 +21,9 @@
> # The configuration chosen is based on the version required and the flags
> # wxGTK was built with.
>
> -case ${EAPI:-0} in
> - [0-6]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
> - 7) ;;
> - *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
> +case ${EAPI} in
> + 7|8) ;;
> + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
> esac
>
> if [[ -z ${_WXWIDGETS_ECLASS} ]]; then
> @@ -37,7 +36,9 @@ _WXWIDGETS_ECLASS=1
> # The SLOT of the x11-libs/wxGTK you're targeting. Needs to be defined
> before
> # inheriting the eclass. Can be either "3.0" or "3.0-gtk3".
> case ${WX_GTK_VER} in
> - 3.0|3.0-gtk3) ;;
> + 3.0-gtk3) ;;
> + 3.0) [[ ${EAPI} == 7 ]] \
> + || die "GTK 2 no longer supported in EAPI
> ${EAPI}" ;;
Let's make it:
[[ ${EAPI} != 7 ]] && die ...
to keep the logic more straightforward (and consistent with 'if ...;
then').
> "") die "WX_GTK_VER not declared" ;;
> *)die "Invalid WX_GTK_VER: must be set to a valid wxGTK
> SLOT ('3.0' or '3.0-gtk3')" ;;
> esac
--
Best regards,
Michał Górny
[gentoo-dev] [PATCH] wxwidgets.eclass: Support EAPI 8
Reviewed-by: Mart Raudsepp
Reviewed-by: David Seifert
Signed-off-by: Ulrich Müller
---
eclass/wxwidgets.eclass | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
index 4357e7367cc7..28735aaac6fd 100644
--- a/eclass/wxwidgets.eclass
+++ b/eclass/wxwidgets.eclass
@@ -4,7 +4,7 @@
# @ECLASS: wxwidgets.eclass
# @MAINTAINER:
# wxwidg...@gentoo.org
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Manages build configuration for wxGTK-using packages.
# @DESCRIPTION:
# This eclass sets up the proper environment for ebuilds using the wxGTK
@@ -21,10 +21,9 @@
# The configuration chosen is based on the version required and the flags
# wxGTK was built with.
-case ${EAPI:-0} in
- [0-6]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
- 7) ;;
- *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
+case ${EAPI} in
+ 7|8) ;;
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
if [[ -z ${_WXWIDGETS_ECLASS} ]]; then
@@ -37,7 +36,9 @@ _WXWIDGETS_ECLASS=1
# The SLOT of the x11-libs/wxGTK you're targeting. Needs to be defined before
# inheriting the eclass. Can be either "3.0" or "3.0-gtk3".
case ${WX_GTK_VER} in
- 3.0|3.0-gtk3) ;;
+ 3.0-gtk3) ;;
+ 3.0) [[ ${EAPI} == 7 ]] \
+ || die "GTK 2 no longer supported in EAPI
${EAPI}" ;;
"") die "WX_GTK_VER not declared" ;;
*)die "Invalid WX_GTK_VER: must be set to a valid wxGTK
SLOT ('3.0' or '3.0-gtk3')" ;;
esac
--
2.32.0
