Skip to content

Bring the doctool up to date on v4.x #7668

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

Merged
MylesBorins merged 20 commits into from
Jul 12, 2016
Merged

Bring the doctool up to date on v4.x #7668

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b064daa
tools: add mock-y js-yaml dependency to doctool
addaleax May 1, 2016
f6b5db6
tools: parse documentation metadata
tflanagan Nov 14, 2015
de131cb
test,tools: test yaml parsing of doctool
addaleax Apr 30, 2016
cab73be
tools: allow multiple added: version entries
addaleax Apr 30, 2016
fcb2735
tools: update marked dependency
firedfox Apr 25, 2016
642f214
tools: lint for object literal spacing
Trott May 5, 2016
bad9df9
[SQUASH] extra v4.x-only fixes for object literal spacing spacing
addaleax Jul 12, 2016
5b34603
test: build addons with V8_DEPRECATION_WARNINGS=1
bnoordhuis May 9, 2016
9929173
doc: fix deprecation warnings in addon examples
bnoordhuis May 9, 2016
6faecba
build,test: fix build-addons dependency chain
bnoordhuis May 9, 2016
4e8e59b
tools: fix tools/doc/addon-verify.js regression
addaleax May 9, 2016
ace5efe
build: add Make `doc-only` target
jmm Nov 18, 2015
9c4838f
tools: fix regression in doctool
May 10, 2016
7181973
test: refactor doctool tests
Trott May 12, 2016
d5cb704
tools: restore change of signatures to opts hashes
jmm May 10, 2016
1b0128a
tools: make sure doctool anchors respect includes
addaleax May 23, 2016
5c93e0a
tools,doc: add example usage for REPLACEME tag
addaleax May 19, 2016
2f7685a
build: add REPLACEME tag for version info in docs
bnoordhuis May 13, 2016
383a57a
test: skip doctool tests when js-yaml is missing
addaleax Jun 8, 2016
76c7918
doc: make doc-only -> fallback to user binary
eljefedelrodeodeljefe May 20, 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 @addaleax
bnoordhuis authored and addaleax committed Jul 12, 2016
commit 6faecba8adde128237e4cd1084a11c7c82491b40
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,17 +128,17 @@ 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 := \
$(filter-out test/addons/??_*/binding.gyp, \
$(wildcard test/addons/*/binding.gyp))

# Implicitly depends on $(NODE_EXE), see the build-addons rule for rationale.
test/addons/.buildstamp: $(ADDONS_BINDING_GYPS) | test/addons/.docbuildstamp
test/addons/.buildstamp: $(ADDONS_BINDING_GYPS) 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