directly use doc-kit bin instead of npx

Signed-off-by: flakey5 <[email protected]>

Author: flakey5

Makefile

@@ -86,7 +86,6 @@ NODE_EXE = node$(EXEEXT)
 NODE ?= "$(PWD)/$(NODE_EXE)"
 NODE_G_EXE = node_g$(EXEEXT)
 NPM ?= ./deps/npm/bin/npm-cli.js
-NPX ?= ./deps/npm/bin/npx-cli.js
 
 # Flags for packaging.
 BUILD_DOWNLOAD_FLAGS ?= --download=all
@@ -100,7 +99,7 @@ V ?= 0
 # Use -e to double check in case it's a broken link
 available-node = \
 	if [ -x "$(NODE)" ] && [ -e "$(NODE)" ]; then \
-		"$(NODE)" $(1); \
+		PATH="$(PWD)/out/$(BUILDTYPE):$$PATH" "$(NODE)" $(1); \
 	elif [ -x `command -v node` ] && [ -e `command -v node` ] && [ `command -v node` ]; then \
 		`command -v node` $(1); \
 	else \
@@ -382,14 +381,16 @@ ifeq ($(OSTYPE),os400)
 DOCBUILDSTAMP_PREREQS := $(DOCBUILDSTAMP_PREREQS) out/$(BUILDTYPE)/node.exp
 endif
 
+DOC_KIT ?= tools/doc/node_modules/.bin/doc-kit
+
 node_use_openssl_and_icu = $(call available-node,"-p" \
 			 "process.versions.openssl != undefined && process.versions.icu != undefined")
 test/addons/.docbuildstamp: $(DOCBUILDSTAMP_PREREQS) tools/doc/node_modules
 	@if [ "$(shell $(node_use_openssl_and_icu))" != "true" ]; then \
 		echo "Skipping .docbuildstamp (no crypto and/or no ICU)"; \
 	else \
 		$(RM) -r test/addons/??_*/; \
-		$(call available-node, $(NPX) --prefix tools/doc doc-kit generate -t addon-verify -i doc/api/addons.md -o test/addons/ --type-map doc/type-map.json) \
+		$(call available-node, $(DOC_KIT) generate -t addon-verify -i doc/api/addons.md -o test/addons/ --type-map doc/type-map.json) \
 		[ $$? -eq 0 ] && touch $@; \
 	fi
 
@@ -798,14 +799,6 @@ tools/doc/node_modules: tools/doc/package.json
 	if [ "$(shell $(node_use_openssl_and_icu))" != "true" ]; then \
 		echo "Skipping tools/doc/node_modules (no crypto and/or no ICU)"; \
 	else \
-		if ! [ `command -v node` ]; then \
-			if [ -x "$(NODE)" ] && [ -e "$(NODE)" ]; then \
-				export PATH="$(dir $(subst $\",,$(NODE))):${PATH};" \
-			else \
-				echo "No available node, cannot install dependencies"; \
-				exit 1; \
-			fi; \
-		fi; \
 		cd tools/doc && $(call available-node,$(run-npm-ci)) \
 	fi
 
@@ -837,7 +830,7 @@ out/doc/api: doc/api
 # For generating individual doc files instead of all at once
 out/doc/api/%.html out/doc/api/%.json: doc/api/%.md tools/doc/node_modules | out/doc/api
 	$(call available-node, \
-		$(NPX) --prefix tools/doc doc-kit generate \
+		$(DOC_KIT) generate \
 		-t $(subst .,legacy-, $(suffix $@)) \
 		-i $< \
 		--ignore $(skip_apidoc_files) \
@@ -850,7 +843,7 @@ out/doc/api/%.html out/doc/api/%.json: doc/api/%.md tools/doc/node_modules | out
 
 out/doc/api/all.html: $(apidocs_html) | out/doc/api
 	$(call available-node, \
-		$(NPX) --prefix tools/doc doc-kit generate \
+		$(DOC_KIT) generate \
 		-t legacy-html-all \
 		-i doc/api/*.md \
 		--ignore $(skip_apidoc_files) \
@@ -863,7 +856,7 @@ out/doc/api/all.html: $(apidocs_html) | out/doc/api
 
 out/doc/api/all.json: $(apidocs_json) | out/doc/api
 	$(call available-node, \
-		$(NPX) --prefix tools/doc doc-kit generate \
+		$(DOC_KIT) generate \
 		-t legacy-json-all \
 		-i doc/api/*.md \
 		--ignore $(skip_apidoc_files) \

tools/doc/update.sh

@@ -13,7 +13,7 @@ if ! [ -x "$NPM" ]; then
     NPM=../../deps/npm/bin/npm-cli.js
 
     if ! [ -x "$NPM" ]; then
-        echo npm not found
+        echo 'npm not found' >&2
         exit 1
     fi
 fi

vcbuild.bat

@@ -183,7 +183,7 @@ if defined package set stage_package=1
 set "node_exe=%config%\node.exe"
 set "node_gyp_exe="%node_exe%" deps\npm\node_modules\node-gyp\bin\node-gyp"
 set "npm_exe="%~dp0%node_exe%" %~dp0deps\npm\bin\npm-cli.js"
-set "npx_exe="%~dp0%node_exe%" %~dp0deps\npm\bin\npx-cli.js"
+set "doc_kit_exe="%~dp0%node_exe%" %~dp0tools\doc\node_modules\.bin\doc-kit"
 if "%target_env%"=="vs2022" set "node_gyp_exe=%node_gyp_exe% --msvs_version=2022"
 
 :: skip building if the only argument received was lint
@@ -591,7 +591,7 @@ if errorlevel 1 goto exit
 
 :install-doctools
 REM only install if building doc OR testing doctool OR building addons
-if not defined doc if not defined build_addons if not defined lint_md (
+if not defined doc if not defined build_addons (
   echo.%test_args% | findstr doctool 1>nul
   if errorlevel 1 goto :skip-install-doctools
 )
@@ -616,8 +616,8 @@ if not exist %node_exe% (
 mkdir %config%\doc
 robocopy /e doc\api %config%\doc\api
 
-%npx_exe% ^
-  --prefix tools/doc doc-kit generate ^
+%doc_kit_exe% ^
+  generate ^
   -t legacy-html-all legacy-json-all api-links ^
   -i doc/api/*.md ^
   -i lib/*.js ^
@@ -640,7 +640,7 @@ for /d %%F in (test\addons\??_*) do (
   rd /s /q %%F
 )
 :: generate
-"%npx_exe%" --prefix tools/doc doc-kit generate -t addon-verify -i "%~dp0doc\api\addons.md" -o "%~dp0test\addons" --type-map "%~dp0doc\type-map.json"
+%doc_kit_exe% generate -t addon-verify -i "%~dp0doc\api\addons.md" -o "%~dp0test\addons" --type-map "%~dp0doc\type-map.json"
 if %errorlevel% neq 0 exit /b %errorlevel%
 :: building addons
 setlocal