Commit ea20796
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>1 parent b869cdb commit ea20796
1 file changed
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -128,17 +128,17 @@ test/gc/node_modules/weak/build/Release/weakref.node: $(NODE_EXE) | |||
| 128 | 128 | --nodedir="$(shell pwd)" | |
| 129 | 129 | ||
| 130 | 130 | # Implicitly depends on $(NODE_EXE), see the build-addons rule for rationale. | |
| 131 | - test/addons/.docbuildstamp: doc/api/addons.md | ||
| 131 | + test/addons/.docbuildstamp: tools/doc/addon-verify.js doc/api/addons.md | ||
| 132 | 132 | $(RM) -r test/addons/??_*/ | |
| 133 | - $(NODE) tools/doc/addon-verify.js | ||
| 133 | + $(NODE) $< | ||
| 134 | 134 | touch $@ | |
| 135 | 135 | ||
| 136 | 136 | ADDONS_BINDING_GYPS := \ | |
| 137 | 137 | $(filter-out test/addons/??_*/binding.gyp, \ | |
| 138 | 138 | $(wildcard test/addons/*/binding.gyp)) | |
| 139 | 139 | ||
| 140 | 140 | # Implicitly depends on $(NODE_EXE), see the build-addons rule for rationale. | |
| 141 | - test/addons/.buildstamp: $(ADDONS_BINDING_GYPS) | test/addons/.docbuildstamp | ||
| 141 | + test/addons/.buildstamp: $(ADDONS_BINDING_GYPS) test/addons/.docbuildstamp | ||
| 142 | 142 | # Cannot use $(wildcard test/addons/*/) here, it's evaluated before | |
| 143 | 143 | # embedded addons have been generated from the documentation. | |
| 144 | 144 | for dirname in test/addons/*/; do \ | |
0 commit comments