doc: make doc-only -> fallback to user binary #6906
Closed
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
eljefedelrodeodeljefe
added
doc
| out/doc/api/%.json: doc/api/%.md | ||
| $(NODE) tools/doc/generate.js --format=json $< > $@ | ||
| [ $(NODE) ] && $(NODE) $(gen-json) || node $(gen-json) |
There was a problem hiding this comment.
This won’t really work like you want it to, [ $(foobar) ] only checks that foobar is nonempty, not that it corresponds . It should probably be something like [ -x "$(NODE)" ] to make sure that the file is there + executable.
Or you just leave the check out, || takes care of a failure in the first version anyway…
There was a problem hiding this comment.
Didn't know about -x. Thought -n, -z or nothing at all would be appropriate . amended
|
@addaleax output is ugly though. Do you think having it in |
|
@eljefedelrodeodeljefe Makefile output is never truly beautiful. :) It works, so LGTM. |
|
cc @nodejs/build extending #3888 a little to fallback to user binary. |
|
This seems reasonable enough. Works on my machine. If we are going to be doing this we may want to give some sort of better error if node doesn't exist on the system. LGTM either way. |
eljefedelrodeodeljefe
added a commit
that referenced
this pull request
May 23, 2016
After the #3888 it was not possible to "make doc-only" in some situations. This now fallsback to any installed node version and throws "node not found" in error case. Ref: #3888 PR-URL: #6906 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
|
Landed in c111cf2. I have some work for error handling in mind. For now I think something like "node not found" is okay and better than "./node not found" |
Fishrock123
pushed a commit
to Fishrock123/node
that referenced
this pull request
May 30, 2016
After the nodejs#3888 it was not possible to "make doc-only" in some situations. This now fallsback to any installed node version and throws "node not found" in error case. Ref: nodejs#3888 PR-URL: nodejs#6906 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
rvagg
pushed a commit
that referenced
this pull request
Jun 2, 2016
After the #3888 it was not possible to "make doc-only" in some situations. This now fallsback to any installed node version and throws "node not found" in error case. Ref: #3888 PR-URL: #6906 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
addaleax
pushed a commit
to addaleax/node
that referenced
this pull request
Jul 12, 2016
After the nodejs#3888 it was not possible to "make doc-only" in some situations. This now fallsback to any installed node version and throws "node not found" in error case. Ref: nodejs#3888 PR-URL: nodejs#6906 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
MylesBorins
pushed a commit
that referenced
this pull request
Jul 12, 2016
After the #3888 it was not possible to "make doc-only" in some situations. This now fallsback to any installed node version and throws "node not found" in error case. Ref: #3888 PR-URL: #6906 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
MylesBorins
pushed a commit
that referenced
this pull request
Jul 12, 2016
After the #3888 it was not possible to "make doc-only" in some situations. This now fallsback to any installed node version and throws "node not found" in error case. Ref: #3888 PR-URL: #6906 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
Merged
MylesBorins
pushed a commit
that referenced
this pull request
Jul 14, 2016
After the #3888 it was not possible to "make doc-only" in some situations. This now fallsback to any installed node version and throws "node not found" in error case. Ref: #3888 PR-URL: #6906 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
MylesBorins
pushed a commit
that referenced
this pull request
Jul 14, 2016
After the #3888 it was not possible to "make doc-only" in some situations. This now fallsback to any installed node version and throws "node not found" in error case. Ref: #3888 PR-URL: #6906 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
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.
Checklist
Affected core subsystem(s)
build,docDescription of change
Fixes:
When checking out a fresh clone or
rm -rf out/orrm ./nodemake doc-only was not working (Mac OS), failing to find./node. I think this has slipped, because likely contributors have at least some binary, from e.g. a build of another branch still inout/.This then would check if
$(NODE)was set correctly take it or fallback to a user pre-installednodebinary.Bash syntax and implementation is a little too clever unfortunately, but I guess that won't hurt anyone there.