1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: remove duplicated code

Browse Source 
Makefile contains copy-pasted code in some targets and this commit
aims to remove it.

PR-URL: https://github.com/nodejs/node/pull/13482
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Kunal Pathak <kunal.pathak@microsoft.com>
This commit is contained in:
Ruslan Bekenev 2017-06-05 22:32:57 +03:00 committed by Tobias Nießen
parent 949aec5c32
commit 2710616d53
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Makefile
View File

@ -492,28 +492,25 @@ 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/eslint/node_modules/js-yaml/package.json ] || \
if [ -x $(NODE) ]; then \
cd tools/doc && ../../$(NODE) ../../$(NPM) install; \
else \
cd tools/doc && node ../../$(NPM) install; \
fi
[ -x $(NODE) ] && $(NODE) $(gen-json) || node $(gen-json)
# 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 --analytics=$(DOCS_ANALYTICS) $< > $@
out/doc/api/%.html: doc/api/%.md
@[ -e tools/doc/node_modules/js-yaml/package.json ] || \
gen-doc = \
[ -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; \
else \
cd tools/doc && node ../../$(NPM) install; \
fi
[ -x $(NODE) ] && $(NODE) $(gen-html) || node $(gen-html)
fi;\
[ -x $(NODE) ] && $(NODE) $(gen-json) || node
out/doc/api/%.json: doc/api/%.md
$(gen-doc) $(gen-json)
# check if ./node is actually set, else use user pre-installed binary
out/doc/api/%.html: doc/api/%.md
$(gen-doc) $(gen-html)
docopen: $(apidocs_html)
@$(PYTHON) -mwebbrowser file://$(PWD)/out/doc/api/all.html
@ -880,15 +877,17 @@ bench: bench-net bench-http bench-fs bench-tls
bench-ci: bench
JSLINT_TARGETS = benchmark doc lib test tools
jslint:
@echo "Running JS linter..."
$(NODE) tools/eslint/bin/eslint.js --cache --rulesdir=tools/eslint-rules --ext=.js,.md \
benchmark doc lib test tools
$(JSLINT_TARGETS)
jslint-ci:
@echo "Running JS linter..."
$(NODE) tools/jslint.js $(PARALLEL_ARGS) -f tap -o test-eslint.tap \
benchmark doc lib test tools
$(JSLINT_TARGETS)
CPPLINT_EXCLUDE ?=
CPPLINT_EXCLUDE += src/node_root_certs.h