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

build: simplify execution of built binary

Browse Source 
Since we aleady have a variable with path to the newly built
binary, use that instead of prefixing path. This also allows us
to pass a different path through the environment (NODE=)

PR-URL: https://github.com/nodejs/io.js/pull/1955
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Rod Vagg <rod@vagg.org>
This commit is contained in:
Johan Bergström 2015-06-12 15:12:20 +10:00
parent 4b4b1760b5
commit 1ec53c044d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -87,16 +87,16 @@ test-valgrind: all
$(PYTHON) tools/test.py --mode=release --valgrind sequential parallel message $(PYTHON) tools/test.py --mode=release --valgrind sequential parallel message
test/gc/node_modules/weak/build/Release/weakref.node: $(NODE_EXE) test/gc/node_modules/weak/build/Release/weakref.node: $(NODE_EXE)
./$(NODE_EXE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \ $(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
--directory="$(shell pwd)/test/gc/node_modules/weak" \ --directory="$(shell pwd)/test/gc/node_modules/weak" \
--nodedir="$(shell pwd)" --nodedir="$(shell pwd)"
build-addons: $(NODE_EXE) build-addons: $(NODE_EXE)
rm -rf test/addons/doc-*/ rm -rf test/addons/doc-*/
./$(NODE_EXE) tools/doc/addon-verify.js $(NODE) tools/doc/addon-verify.js
$(foreach dir, \ $(foreach dir, \
$(sort $(dir $(wildcard test/addons/*/*.gyp))), \ $(sort $(dir $(wildcard test/addons/*/*.gyp))), \
./$(NODE_EXE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \ $(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
--directory="$(shell pwd)/$(dir)" \ --directory="$(shell pwd)/$(dir)" \
--nodedir="$(shell pwd)" && ) echo "build done" --nodedir="$(shell pwd)" && ) echo "build done"
@ -141,7 +141,7 @@ test-npm: $(NODE_EXE)
NODE_EXE=$(NODE_EXE) tools/test-npm.sh NODE_EXE=$(NODE_EXE) tools/test-npm.sh
test-npm-publish: $(NODE_EXE) test-npm-publish: $(NODE_EXE)
npm_package_config_publishtest=true ./$(NODE_EXE) deps/npm/test/run.js npm_package_config_publishtest=true $(NODE) deps/npm/test/run.js
test-addons: test-build test-addons: test-build
$(PYTHON) tools/test.py --mode=release addons $(PYTHON) tools/test.py --mode=release addons
@ -173,10 +173,10 @@ out/doc/%: doc/%
cp -r $< $@ cp -r $< $@
out/doc/api/%.json: doc/api/%.markdown $(NODE_EXE) out/doc/api/%.json: doc/api/%.markdown $(NODE_EXE)
out/Release/$(NODE_EXE) tools/doc/generate.js --format=json $< > $@ $(NODE) tools/doc/generate.js --format=json $< > $@
out/doc/api/%.html: doc/api/%.markdown $(NODE_EXE) out/doc/api/%.html: doc/api/%.markdown $(NODE_EXE)
out/Release/$(NODE_EXE) tools/doc/generate.js --format=html --template=doc/template.html $< > $@ $(NODE) tools/doc/generate.js --format=html --template=doc/template.html $< > $@
docopen: out/doc/api/all.html docopen: out/doc/api/all.html
-google-chrome out/doc/api/all.html -google-chrome out/doc/api/all.html
@ -370,12 +370,12 @@ bench-http-simple:
benchmark/http_simple_bench.sh benchmark/http_simple_bench.sh
bench-idle: bench-idle:
./$(NODE_EXE) benchmark/idle_server.js & $(NODE) benchmark/idle_server.js &
sleep 1 sleep 1
./$(NODE_EXE) benchmark/idle_clients.js & $(NODE) benchmark/idle_clients.js &
jslint: jslint:
./$(NODE_EXE) tools/eslint/bin/eslint.js src lib test --rulesdir tools/eslint-rules --reset --quiet $(NODE) tools/eslint/bin/eslint.js src lib test --rulesdir tools/eslint-rules --reset --quiet
CPPLINT_EXCLUDE ?= CPPLINT_EXCLUDE ?=
CPPLINT_EXCLUDE += src/node_lttng.cc CPPLINT_EXCLUDE += src/node_lttng.cc