Upgrade to jsdoc 3.3.
This commit is contained in:
@@ -1,10 +1,5 @@
|
|||||||
before_install:
|
before_install:
|
||||||
- "sudo pip install -r requirements.txt"
|
- "sudo pip install -r requirements.txt"
|
||||||
- "git clone --depth=50 https://github.com/jsdoc3/jsdoc build/jsdoc"
|
|
||||||
- "cd build/jsdoc"
|
|
||||||
- "git fetch origin refs/tags/v3.2.2:refs/tags/v3.2.2"
|
|
||||||
- "git checkout tags/v3.2.2"
|
|
||||||
- "cd ../.."
|
|
||||||
- "npm install"
|
- "npm install"
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
@@ -13,4 +8,4 @@ before_script:
|
|||||||
- "rm src/ol/renderer/webgl/*shader.js"
|
- "rm src/ol/renderer/webgl/*shader.js"
|
||||||
- "sleep 3"
|
- "sleep 3"
|
||||||
|
|
||||||
script: "./build.py JSDOC=build/jsdoc/jsdoc integration-test"
|
script: "./build.py integration-test"
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"plugins": [
|
"plugins": [
|
||||||
"plugins/markdown",
|
"node_modules/jsdoc/plugins/markdown",
|
||||||
"apidoc/plugins/inheritdoc",
|
"apidoc/plugins/inheritdoc",
|
||||||
"apidoc/plugins/exports",
|
"apidoc/plugins/exports",
|
||||||
"apidoc/plugins/todo",
|
"apidoc/plugins/todo",
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
* TODO: Remove this hack when https://github.com/jsdoc3/jsdoc/issues/53
|
* TODO: Remove this hack when https://github.com/jsdoc3/jsdoc/issues/53
|
||||||
* is addressed.
|
* is addressed.
|
||||||
*/
|
*/
|
||||||
exports.nodeVisitor = {
|
exports.astNodeVisitor = {
|
||||||
|
|
||||||
visitNode: function(node, e, parser, currentSourceName) {
|
visitNode: function(node, e, parser, currentSourceName) {
|
||||||
if (/@(inheritDoc)(\n|\r)/.test(e.comment)) {
|
if (/@(inheritDoc)(\n|\r)/.test(e.comment)) {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*global env: true */
|
/*global env: true */
|
||||||
var template = require('jsdoc/template'),
|
var template = require('jsdoc/template'),
|
||||||
fs = require('fs'),
|
fs = require('jsdoc/fs'),
|
||||||
path = require('path'),
|
path = require('jsdoc/path'),
|
||||||
taffy = require('taffydb').taffy,
|
taffy = require('taffydb').taffy,
|
||||||
helper = require('jsdoc/util/templateHelper'),
|
helper = require('jsdoc/util/templateHelper'),
|
||||||
scopeToPunc = helper.scopeToPunc,
|
scopeToPunc = helper.scopeToPunc,
|
||||||
|
|||||||
4
build.py
4
build.py
@@ -20,7 +20,7 @@ if sys.platform == 'win32':
|
|||||||
'GJSLINT': 'gjslint.exe',
|
'GJSLINT': 'gjslint.exe',
|
||||||
'JAVA': 'java.exe',
|
'JAVA': 'java.exe',
|
||||||
'JAR': 'jar.exe',
|
'JAR': 'jar.exe',
|
||||||
'JSDOC': 'jsdoc.cmd',
|
'JSDOC': './node_modules/.bin/jsdoc',
|
||||||
'JSHINT': './node_modules/.bin/jshint',
|
'JSHINT': './node_modules/.bin/jshint',
|
||||||
'PYTHON': 'python.exe',
|
'PYTHON': 'python.exe',
|
||||||
'PHANTOMJS': 'phantomjs.cmd'
|
'PHANTOMJS': 'phantomjs.cmd'
|
||||||
@@ -75,7 +75,7 @@ else:
|
|||||||
variables.JSHINT = './node_modules/.bin/jshint'
|
variables.JSHINT = './node_modules/.bin/jshint'
|
||||||
variables.JAVA = 'java'
|
variables.JAVA = 'java'
|
||||||
variables.JAR = 'jar'
|
variables.JAR = 'jar'
|
||||||
variables.JSDOC = 'jsdoc'
|
variables.JSDOC = './node_modules/.bin/jsdoc'
|
||||||
variables.PYTHON = 'python'
|
variables.PYTHON = 'python'
|
||||||
variables.PHANTOMJS = 'phantomjs'
|
variables.PHANTOMJS = 'phantomjs'
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
"closure-util": "~0.9.0",
|
"closure-util": "~0.9.0",
|
||||||
"async": "~0.2.10",
|
"async": "~0.2.10",
|
||||||
"htmlparser2": "~3.7.1",
|
"htmlparser2": "~3.7.1",
|
||||||
"jshint": "~2.4.4"
|
"jshint": "~2.4.4",
|
||||||
|
"jsdoc": "^3.3.0-alpha5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user