Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools: fix tools/doc/addon-verify.js regression (and more) #6652

Merged
merged 4 commits into from
May 10, 2016
Merged

tools: fix tools/doc/addon-verify.js regression (and more) #6652

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f644368
test: build addons with V8_DEPRECATION_WARNINGS=1
bnoordhuis May 9, 2016
2c75a6b
doc: fix deprecation warnings in addon examples
bnoordhuis May 9, 2016
0ea4855
build,test: fix build-addons dependency chain
bnoordhuis May 9, 2016
4f925dd
tools: fix tools/doc/addon-verify.js regression
addaleax May 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
build,test: fix build-addons dependency chain 
* Make the 'extract embedded addons in the documentations' step a normal
  prerequisite.  As an order-only prerequisite, it's sometimes skipped
  when it shouldn't be.

* Make `tools/doc/addon-verify.js` a dependency of that step.  Changes
  to that file should result in a rebuild.

PR-URL: #6652
Reviewed-By: Anna Henningsen <anna@addaleax.net>
  • Loading branch information
@bnoordhuis
bnoordhuis committed May 10, 2016
commit 0ea485554699b008e28eab73add8739080292422
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@ test/gc/node_modules/weak/build/Release/weakref.node: $(NODE_EXE)
--nodedir="$(shell pwd)"

# Implicitly depends on $(NODE_EXE), see the build-addons rule for rationale.
test/addons/.docbuildstamp: doc/api/addons.md
test/addons/.docbuildstamp: tools/doc/addon-verify.js doc/api/addons.md
$(RM) -r test/addons/??_*/
$(NODE) tools/doc/addon-verify.js
$(NODE) $<
touch $@

ADDONS_BINDING_GYPS := \
Expand All @@ -144,7 +144,7 @@ ADDONS_BINDING_GYPS := \
test/addons/.buildstamp: $(ADDONS_BINDING_GYPS) \
deps/uv/include/*.h deps/v8/include/*.h \
src/node.h src/node_buffer.h src/node_object_wrap.h \
| test/addons/.docbuildstamp
test/addons/.docbuildstamp
# Cannot use $(wildcard test/addons/*/) here, it's evaluated before
# embedded addons have been generated from the documentation.
for dirname in test/addons/*/; do \
Expand Down