Makefile: Replace vbatts/pandoc with a PANDOC variable #428
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The former is in POSIX [1], but the latter is not [2]. [1]: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html [2]: http://pubs.opengroup.org/onlinepubs/9699919799/idx/utilities.html Signed-off-by: W. Trevor King <wking@tremily.us>
Defaulting to whichever PANDOC is first in your path. This mirrors the existing DOCKER handling. Folks who want to use the old path can run: $ make PANDOC=vbatts/pandoc ... I'm not sure why 4ee036f (*: printable documents, 2015-12-09, opencontainers#263) went with a variable for 'docker' but a hard-coded path for 'pandoc'. I expect it was just oversight. Signed-off-by: W. Trevor King <wking@tremily.us>
| @@ -1,5 +1,6 @@ | |||
|
|
|||
| DOCKER ?= $(shell which docker) | |||
| DOCKER ?= $(shell command -v docker) | |||
There was a problem hiding this comment.
@wking It looks like it should work fine, but I got error make: command: Command not found, I have to change it back to which, any insight on this? Maybe related to bash version?
|
LGTM |
| @@ -32,7 +33,7 @@ output/docs.pdf: $(DOC_FILES) | |||
| -v $(shell pwd)/:/input/:ro \ | |||
| -v $(shell pwd)/output/:/output/ \ | |||
| -u $(shell id -u) \ | |||
| vbatts/pandoc -f markdown_github -t latex -o /$@ $(patsubst %,/input/%,$(DOC_FILES)) | |||
| $(PANDOC) -f markdown_github -t latex -o /$@ $(patsubst %,/input/%,$(DOC_FILES)) | |||
There was a problem hiding this comment.
I'm just curious before any test or investigation, $(PANDOC) is a path to the pandoc executive when default, but we expect pandoc image here, how this replacement works?
There was a problem hiding this comment.
On Thu, May 19, 2016 at 08:40:21PM -0700, Lai Jiangshan wrote:
- vbatts/pandoc -f markdown_github -t latex -o /$@
$(patsubst %,/input/%,$ (DOC_FILES))$(PANDOC) -f markdown_github -t latex -o /$ @$(patsubst %,/input/%,$ (DOC_FILES))I'm just curious before any test or investigation, $(PANDOC) is a
path to the pandoc executive when default, but we expect
pandoc image here, how this replacement works?
Oops, I had missed this. See #440 for some paths forward.
wking
added a commit
to wking/opencontainer-runtime-spec
that referenced
this pull request
May 24, 2016
In dc9daf9 (Makefile: Replace vbatts/pandoc with a PANDOC variable 2016-05-06, opencontainers#428) I'd misunderstood vbatts/pandoc as a call to a locally-installed pandoc, when it's actually the name of a Docker image [1,2]. With this commit, we prefer a local pandoc if one exists, fall back to Docker and vbatts/pandoc if a local 'docker' exists, and raise an error if neither 'pandoc' nor 'docker' exist. [1]: opencontainers#440 [2]: opencontainers#428 (comment) Reported-by: Qiang Huang <h.huangqiang@huawei.com> Reported-by: Lai Jiangshan <jiangshanlai@gmail.com> Signed-off-by: W. Trevor King <wking@tremily.us>
Mashimiao
pushed a commit
to Mashimiao/specs
that referenced
this pull request
Aug 19, 2016
In dc9daf9 (Makefile: Replace vbatts/pandoc with a PANDOC variable 2016-05-06, opencontainers#428) I'd misunderstood vbatts/pandoc as a call to a locally-installed pandoc, when it's actually the name of a Docker image [1,2]. With this commit, we prefer a local pandoc if one exists, fall back to Docker and vbatts/pandoc if a local 'docker' exists, and raise an error if neither 'pandoc' nor 'docker' exist. [1]: opencontainers#440 [2]: opencontainers#428 (comment) Reported-by: Qiang Huang <h.huangqiang@huawei.com> Reported-by: Lai Jiangshan <jiangshanlai@gmail.com> Signed-off-by: W. Trevor King <wking@tremily.us>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
And use
command -vinstead ofwhich. Details in the commit messages.