Fix for issue that caused plugins to be unable to be required when using a relative path to jsdoc. (hattip kived) See #37.

This commit is contained in:
Michael Mathews 2011-10-14 21:05:48 +01:00
parent 134227b6d4
commit b25a6acce3
3 changed files with 5 additions and 5 deletions

4
jsdoc
View File

@ -2,6 +2,6 @@
# rhino discards the path to the current script file, so we must add it back # rhino discards the path to the current script file, so we must add it back
BASEDIR=`dirname $0` BASEDIR=`dirname $0`
java -classpath ${BASEDIR}/lib/js.jar org.mozilla.javascript.tools.shell.Main -modules ${BASEDIR}/node_modules -modules ${BASEDIR}/rhino_modules ${BASEDIR}/jsdoc.js --dirname=${BASEDIR} $@ java -classpath ${BASEDIR}/lib/js.jar org.mozilla.javascript.tools.shell.Main -modules ${BASEDIR}/node_modules -modules ${BASEDIR}/rhino_modules -modules ${BASEDIR} ${BASEDIR}/jsdoc.js --dirname=${BASEDIR} $@
#java -classpath ${BASEDIR}/lib/js.jar org.mozilla.javascript.tools.debugger.Main -debug -modules ${BASEDIR}/node_modules -modules ${BASEDIR}/rhino_modules ${BASEDIR}/jsdoc.js --dirname=${BASEDIR} $@ #java -classpath ${BASEDIR}/lib/js.jar org.mozilla.javascript.tools.debugger.Main -debug -modules ${BASEDIR}/node_modules -modules ${BASEDIR}/rhino_modules -modules ${BASEDIR} ${BASEDIR}/jsdoc.js --dirname=${BASEDIR} $@

View File

@ -176,7 +176,7 @@ function main() {
// allow user-defined plugins to register listeners // allow user-defined plugins to register listeners
if (env.conf.plugins) { if (env.conf.plugins) {
for (var i = 0, leni = env.conf.plugins.length; i < leni; i++) { for (var i = 0, leni = env.conf.plugins.length; i < leni; i++) {
var plugin = require(__dirname + '/' + env.conf.plugins[i]); var plugin = require(env.conf.plugins[i]);
for (var eventName in plugin) { for (var eventName in plugin) {
app.jsdoc.parser.on(eventName, plugin[eventName]); app.jsdoc.parser.on(eventName, plugin[eventName]);
} }

View File

@ -1,7 +1,7 @@
{ {
"name": "JSDoc", "name": "JSDoc",
"version": "3.0.0beta", "version": "3.0.0alpha",
"revision": "1318544967069", "revision": "1318622611401",
"description": "An automatic documentation generator for javascript.", "description": "An automatic documentation generator for javascript.",
"keywords": [ "documentation", "javascript" ], "keywords": [ "documentation", "javascript" ],
"licenses": [ "licenses": [