summaryrefslogtreecommitdiff
path: root/tools/doc/generate.js
diff options
context:
space:
mode:
authorMyles Borins <mborins@us.ibm.com>2016-05-10 11:56:56 -0700
committerMyles Borins <mborins@us.ibm.com>2016-05-10 14:11:49 -0700
commit572e28efa2e3cde78b5e7984b7760fd4c270f619 (patch)
tree932425188f990496916b77609242a9ce95c3e2b8 /tools/doc/generate.js
parent0912b8832050042fdf7098e6fecfae97c71b27de (diff)
downloadandroid-node-v8-572e28efa2e3cde78b5e7984b7760fd4c270f619.tar.gz
android-node-v8-572e28efa2e3cde78b5e7984b7760fd4c270f619.tar.bz2
android-node-v8-572e28efa2e3cde78b5e7984b7760fd4c270f619.zip
tools: fix regression in doctool
101dd1e introduced a regression in the doctool. This commit reverts the changes that were made to the function signature of the various doctool functions while maintaining support for passing in specific node versions. Refs: https://github.com/nodejs/node/commit/101dd1e PR-URL: https://github.com/nodejs/node/pull/6680 Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com> Reviewed-By: Robert Lindstaedt <robert.lindstaedt@gmail.com>
Diffstat (limited to 'tools/doc/generate.js')
-rw-r--r--tools/doc/generate.js16
1 files changed, 7 insertions, 9 deletions
diff --git a/tools/doc/generate.js b/tools/doc/generate.js
index 94c0905468..7df987e1cf 100644
--- a/tools/doc/generate.js
+++ b/tools/doc/generate.js
@@ -24,6 +24,8 @@ args.forEach(function(arg) {
}
});
+nodeVersion = nodeVersion || process.version;
+
if (!inputFile) {
throw new Error('No input file specified');
}
@@ -46,15 +48,11 @@ function next(er, input) {
break;
case 'html':
- require('./html.js')({
- input: input,
- filename: inputFile,
- template: template,
- nodeVersion: nodeVersion,
- }, function(er, html) {
- if (er) throw er;
- console.log(html);
- });
+ require('./html.js')(input, inputFile, template, nodeVersion,
+ function(er, html) {
+ if (er) throw er;
+ console.log(html);
+ });
break;
default: