From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Subject: Re: [gentoo-dev] RFC: ant-tasks.eclass patch
Date: Wed, 25 Sep 2019 21:44:44 +0200 [thread overview]
Message-ID: <bbf22cdfb697213723379066aaa036f6f8fed4ed.camel@gentoo.org> (raw)
In-Reply-To: <bb1db1a6-15fe-ff7a-1114-b04008a81883@gentoo.org>
[-- Attachment #1: Type: text/plain, Size: 2149 bytes --]
On Wed, 2019-09-25 at 20:47 +0200, Miroslav Šulc wrote:
> diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
> index 309df084d156..26df9de26f1a 100644
> --- a/eclass/ant-tasks.eclass
> +++ b/eclass/ant-tasks.eclass
> @@ -54,7 +54,9 @@ ANT_TASK_NAME="${PN#ant-}"
> # @DESCRIPTION:
> # Specifies JAVA_PKG_NAME (PN{-SLOT} used with java-pkg_jar-from) of the package
> # that this one depends on. Defaults to the name of ant task, ebuild can
> -# override it before inheriting this eclass.
> +# override it before inheriting this eclass. In case there is more than one
> +# dependency, the variable can be specified as bash array with multiple strings,
> +# one for each dependency.
> ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}}
>
> # @ECLASS-VARIABLE: ANT_TASK_DISABLE_VM_DEPS
> @@ -105,7 +107,7 @@ S="${WORKDIR}/${MY_P}"
> # base: performs the unpack, build.xml replacement and symlinks ant.jar from
> # ant-core
> #
> -# jar-dep: symlinks the jar file(s) from dependency package
> +# jar-dep: symlinks the jar file(s) from dependency package(s)
> ant-tasks_src_unpack() {
> [[ -z "${1}" ]] && ant-tasks_src_unpack all
>
> @@ -129,9 +131,17 @@ ant-tasks_src_unpack() {
> # ant.jar to build against
> java-pkg_jar-from --build-only ant-core ant.jar;;
> jar-dep)
> - # get jar from the dependency package
> + # get jar from the dependency package(s)
> if [[ -n "${ANT_TASK_DEPNAME}" ]]; then
> - java-pkg_jar-from ${ANT_TASK_DEPNAME}
> + local array=$(declare -p ANT_TASK_DEPNAME | grep "^declare \-a")
> +
> + if [[ -n "${array}" ]]; then
> + for depname in "${ANT_TASK_DEPNAME[@]}"; do
> + java-pkg_jar-from ${depname}
> + done
I don't think you need two branches here. Non-array variable is
equivalent to an array with a single element for the purpose of [@], so
your 'for' loop will work correctly both for non-array and array.
> + else
> + java-pkg_jar-from ${ANT_TASK_DEPNAME}
> + fi
> fi;;
> all)
> ant-tasks_src_unpack base jar-dep;;
--
Best regards,
Michał Górny
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 618 bytes --]
next prev parent reply other threads:[~2019-09-25 19:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 18:47 [gentoo-dev] RFC: ant-tasks.eclass patch Miroslav Šulc
2019-09-25 19:44 ` Michał Górny [this message]
2019-09-26 8:05 ` Miroslav Šulc
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bbf22cdfb697213723379066aaa036f6f8fed4ed.camel@gentoo.org \
--to=mgorny@gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox