Commit 2a467a5
committed
Revert "build, doc: generate node.1 with doc-kit"
This reverts commit 81e93df.
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #64091
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Stewart X Addison <sxa@redhat.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Richard Lau <richard.lau@ibm.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>1 parent bbef54b commit 2a467a5
8 files changed
Lines changed: 2444 additions & 41 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -558,7 +558,7 @@ NODE=/path/to/node make doc-only | |||
| 558 | 558 | To read the man page: | |
| 559 | 559 | ||
| 560 | 560 | ```bash | |
| 561 | - man out/doc/node.1 | ||
| 561 | + man doc/node.1 | ||
| 562 | 562 | ``` | |
| 563 | 563 | ||
| 564 | 564 | If you prefer to read the full documentation in a browser, run the following. | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -196,7 +196,7 @@ config.gypi: configure configure.py src/node_version.h | |||
| 196 | 196 | fi | |
| 197 | 197 | ||
| 198 | 198 | .PHONY: install | |
| 199 | - install: all out/doc/node.1 ## Install node into $PREFIX (default=/usr/local). | ||
| 199 | + install: all ## Install node into $PREFIX (default=/usr/local). | ||
| 200 | 200 | $(PYTHON) tools/install.py $@ --dest-dir '$(DESTDIR)' --prefix '$(PREFIX)' | |
| 201 | 201 | ||
| 202 | 202 | .PHONY: uninstall | |
@@ -856,7 +856,7 @@ VERSION=v$(RAWVER) | |||
| 856 | 856 | ||
| 857 | 857 | .PHONY: doc-only | |
| 858 | 858 | .NOTPARALLEL: doc-only | |
| 859 | - doc-only: $(apidoc_dirs) $(apidocs_html) $(apidocs_json) out/doc/node.1 out/doc/api/all.html out/doc/api/all.json out/doc/llms.txt out/doc/apilinks.json ## Builds the docs with the local or the global Node.js binary. | ||
| 859 | + doc-only: $(apidoc_dirs) $(apidocs_html) $(apidocs_json) out/doc/api/all.html out/doc/api/all.json out/doc/llms.txt out/doc/apilinks.json ## Builds the docs with the local or the global Node.js binary. | ||
| 860 | 860 | ||
| 861 | 861 | .PHONY: doc | |
| 862 | 862 | doc: $(NODE_EXE) doc-only ## Build Node.js, and then build the documentation with the new binary. | |
@@ -932,19 +932,6 @@ out/doc/apilinks.json: $(wildcard lib/*.js) tools/doc/node_modules | out/doc | |||
| 932 | 932 | ) \ | |
| 933 | 933 | fi | |
| 934 | 934 | ||
| 935 | - out/doc/node.1: doc/api/cli.md tools/doc/node_modules | out/doc | ||
| 936 | - @if [ "$(shell $(node_use_openssl_and_icu))" != "true" ]; then \ | ||
| 937 | - echo "Skipping $@ (no crypto and/or no ICU)"; \ | ||
| 938 | - else \ | ||
| 939 | - $(call available-node, \ | ||
| 940 | - $(DOC_KIT) generate \ | ||
| 941 | - -t man-page \ | ||
| 942 | - -i $< \ | ||
| 943 | - -o $(@D) \ | ||
| 944 | - -v $(VERSION) \ | ||
| 945 | - ) \ | ||
| 946 | - fi | ||
| 947 | - | ||
| 948 | 935 | .PHONY: docopen | |
| 949 | 936 | docopen: doc-only ## Open the documentation in a web browser. | |
| 950 | 937 | @$(PYTHON) -mwebbrowser file://$(abspath $<) | |
@@ -1282,7 +1269,7 @@ $(TARBALL): $(TARBALL_DEPS) | |||
| 1282 | 1269 | git checkout-index -a -f --prefix=$(TARNAME)/ | |
| 1283 | 1270 | ifneq ($(SKIP_SHARED_DEPS), 1) | |
| 1284 | 1271 | mkdir -p $(TARNAME)/doc/api | |
| 1285 | - cp out/doc/node.1 $(TARNAME)/doc/node.1 | ||
| 1272 | + cp doc/node.1 $(TARNAME)/doc/node.1 | ||
| 1286 | 1273 | cp -r out/doc/api/* $(TARNAME)/doc/api/ | |
| 1287 | 1274 | endif | |
| 1288 | 1275 | sed 's/fileset = fileset.intersection (fileset.gitTracked root)/fileset =/' tools/nix/v8.nix > $(TARNAME)/tools/nix/v8.nix | |
0 commit comments