summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDaniel Bevenius <daniel.bevenius@gmail.com>2016-11-04 08:17:21 +0100
committerDaniel Bevenius <daniel.bevenius@gmail.com>2016-11-07 13:22:03 +0100
commitbc229d08678908ff43340b60b53cac57a0fcd346 (patch)
tree6394fcf8ef78a3b3bf7cfb4664c9d9da65b9bdf3 /Makefile
parent4463d2b36003fd58a8e4c9a231f073e92e7d477e (diff)
downloadandroid-node-v8-bc229d08678908ff43340b60b53cac57a0fcd346.tar.gz
android-node-v8-bc229d08678908ff43340b60b53cac57a0fcd346.tar.bz2
android-node-v8-bc229d08678908ff43340b60b53cac57a0fcd346.zip
build: reduce noise from doc target
The doc target currently echos the complete shell command, which might produces a lot of output. Using this change the actual commands run are still shown. Before: [ -e tools/doc/node_modules/js-yaml/package.json ] || \ [ -e tools/eslint/node_modules/js-yaml/package.json ] || \ if [ -x ./node ]; then \ cd tools/doc && ../.././node ../.././deps/npm/bin/npm-cli.js install; \ else \ cd tools/doc && node ../.././deps/npm/bin/npm-cli.js install; \ fi [ -x ./node ] && ./node tools/doc/generate.js --node-version=v8.0.0 --format=html --template=doc/template.html doc/api/assert.md > out/doc/api/assert.html || node tools/doc/generate.js --node-version=v8.0.0 --format=html --template=doc/template.html doc/api/assert.md > out/doc/api/assert.html Input file = doc/api/assert.md After: [ -x ./node ] && ./node tools/doc/generate.js --node-version=v8.0.0 --format=html --template=doc/template.html doc/api/assert.md > out/doc/api/assert.html || node tools/doc/generate.js --node-version=v8.0.0 --format=html --template=doc/template.html doc/api/assert.md > out/doc/api/assert.html Input file = doc/api/assert.md To verify run: $ make docclean $ make doc PR-URL: https://github.com/nodejs/node/pull/9457 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com> Reviewed-By: James Snell <jasnell@gmail.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 5aff7f25c0..369fa22a7a 100644
--- a/Makefile
+++ b/Makefile
@@ -315,7 +315,7 @@ out/doc/%: doc/%
# check if ./node is actually set, else use user pre-installed binary
gen-json = tools/doc/generate.js --format=json $< > $@
out/doc/api/%.json: doc/api/%.md
- [ -e tools/doc/node_modules/js-yaml/package.json ] || \
+ @[ -e tools/doc/node_modules/js-yaml/package.json ] || \
[ -e tools/eslint/node_modules/js-yaml/package.json ] || \
if [ -x $(NODE) ]; then \
cd tools/doc && ../../$(NODE) ../../$(NPM) install; \
@@ -327,7 +327,7 @@ out/doc/api/%.json: doc/api/%.md
# check if ./node is actually set, else use user pre-installed binary
gen-html = tools/doc/generate.js --node-version=$(FULLVERSION) --format=html --template=doc/template.html $< > $@
out/doc/api/%.html: doc/api/%.md
- [ -e tools/doc/node_modules/js-yaml/package.json ] || \
+ @[ -e tools/doc/node_modules/js-yaml/package.json ] || \
[ -e tools/eslint/node_modules/js-yaml/package.json ] || \
if [ -x $(NODE) ]; then \
cd tools/doc && ../../$(NODE) ../../$(NPM) install; \