Fix for issue that caused plugins to be unable to be required when us…

…ing a relative path to jsdoc. (hattip kived) See jsdoc#37.
alerizzo · Oct 14, 2011 · b25a6ac · b25a6ac
1 parent 134227b
commit b25a6ac
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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} $@
+#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} $@
diff --git 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
@@ -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": [