From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] asciidoc: use absolute path for resources
Date: Tue, 26 Jul 2016 23:31:16 +0200 [thread overview]
Message-ID: <20160726213116.GA3354@free.fr> (raw)
In-Reply-To: <1469567242-49978-1-git-send-email-matthew.weber@rockwellcollins.com>
Matt, Atul, Brandon, All,
On 2016-07-26 16:07 -0500, Matt Weber spake thusly:
> From: Atul Singh <atul.singh.mandla@rockwellcollins.com>
>
> One of the "features" of a2x is that the '-r|--resource' flag imports
> resources relative to the [SOURCE_FILE], not the CWD. The current
> implementation tries to import resources from the destination dir $(D),
> which works fine for out-of-tree builds because $(D) is an absolute
> path, however in-tree builds treat $(D) as a relative path, which breaks
> because a2x treats $(D) relative to SOURCE_FILE.
You meant $(@D), right?
I can see the problem, and indeed a2x' man page is explicit about it.
So I'm Ok with the change, but I could not observe the breakage with
the current master.
> Use the make command $(abspath names...) to convert the dest dir to an
> absolute path before passing it as a resource.
>
> Signed-off-by: Brandon Maier <brandon.maier@rockwellcollins.com>
> Signed-off-by: Atul Singh Mandla <atul.singh.mandla@rockwellcollins.com>
> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
> ---
> package/doc-asciidoc.mk | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/package/doc-asciidoc.mk b/package/doc-asciidoc.mk
> index 6ab5ad2..c5ff2ae 100644
> --- a/package/doc-asciidoc.mk
> +++ b/package/doc-asciidoc.mk
> @@ -117,7 +117,8 @@ $$(O)/docs/$(1)/$(1).$(6): $$($(2)_SOURCES) \
> $$(Q)$$(call MESSAGE,"Generating $(7) $(1)...")
> $$(Q)mkdir -p $$(@D)
> $$(Q)a2x $(8) -f $(4) -d book -L \
> - $$(foreach r,$$($(2)_RESOURCES),-r $$(r)) -r $$(@D) \
> + $$(foreach r,$$($(2)_RESOURCES) $$(@D), \
> + --resource="$$(abspath $$(r))") \
There's a space added just before the $$(foreach and just before the
--resource.
Otherwise, you can add my:
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
when you respin.
Regards,
Yann E. MORIN.
> $$($(2)_$(4)_A2X_OPTS) \
> --asciidoc-opts="$$($(2)_$(4)_ASCIIDOC_OPTS)" \
> $$(BUILD_DIR)/docs/$(1)/$(1).txt
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
prev parent reply other threads:[~2016-07-26 21:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-26 21:07 [Buildroot] [PATCH] asciidoc: use absolute path for resources Matt Weber
2016-07-26 21:31 ` Yann E. MORIN [this message]
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=20160726213116.GA3354@free.fr \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/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