From b25a6acce34ea951dc036ef2dda271c8af7e35c4 Mon Sep 17 00:00:00 2001 From: Michael Mathews Date: Fri, 14 Oct 2011 21:05:48 +0100 Subject: [PATCH] Fix for issue that caused plugins to be unable to be required when using a relative path to jsdoc. (hattip kived) See #37. --- jsdoc | 4 ++-- jsdoc.js | 2 +- package.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jsdoc b/jsdoc index 1aeffb71..a968aad2 100755 --- a/jsdoc +++ b/jsdoc @@ -2,6 +2,6 @@ # rhino discards the path to the current script file, so we must add it back 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} $@ \ No newline at end of file +#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} $@ \ No newline at end of file diff --git a/jsdoc.js b/jsdoc.js index bc02085e..4353576b 100644 --- a/jsdoc.js +++ b/jsdoc.js @@ -176,7 +176,7 @@ function main() { // allow user-defined plugins to register listeners if (env.conf.plugins) { 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) { app.jsdoc.parser.on(eventName, plugin[eventName]); } diff --git a/package.json b/package.json index d7e00cc6..2d513c69 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "JSDoc", - "version": "3.0.0beta", - "revision": "1318544967069", + "version": "3.0.0alpha", + "revision": "1318622611401", "description": "An automatic documentation generator for javascript.", "keywords": [ "documentation", "javascript" ], "licenses": [