JSDOC/Options.js

[gnome.introspection-doc-generator] / JSDOC / Options.js

diff --git a/JSDOC/Options.js b/JSDOC/Options.js
index 7ea5bea..a85908a 100644 (file)
--- a/JSDOC/Options.js
+++ b/JSDOC/Options.js
@@ -2,8 +2,8 @@
 /**
  * Options management...
  */
-XObject = import.XObject.XObject;
-File = import.File.File;
+XObject = imports.XObject.XObject;
+File = imports.File.File;
 
 Options = {
 
@@ -18,7 +18,7 @@ Options = {
     
     // options get defined like this..
     "--src"           :  "source directory (either absolute - starts with "/" or relative " + 
-                        "- without, in which case it's added to baseDir"
+                        "- without, in which case it's added to baseDir",
     "--baseDir"       :  'Base Directory (root directory of code)',
     "--target"        :  'Target Directory (where html files go)',
     "--cacheDirectory": 'Cached Files Directory',
@@ -91,17 +91,21 @@ Options = {
          
         this.LOG.verbose = this.verbose;
         
-        // this is most likely to come from the command line..
-        if (this.conf) {
-            XObject.extend(this, JSON.parse(File.read(this.conf)));;
-        }
-        // help ?? -- usage..
-        if (!this.baseDir) {
+        if (!this.baseDir) { // should we set this to cwd?
             throw {
                 name: "ArgumentError", 
                 message: "No baseDir specified" 
             };
         }
+        
+        // this is most likely to come from the command line..
+        if (this.conf) {
+            var conf = this.conf[0] == '/' ? this.conf : this.baseDir + '/' + this.conf;
+        
+            XObject.extend(this, JSON.parse(File.read(conf)));;
+        }
+        // help ?? -- usage..
+       
         if (!this.src.length) {
             throw {
                 name: "ArgumentError", 
@@ -110,17 +114,20 @@ Options = {
         }
         // append full path to source directories.
         var _this= this;
-        this.src.forEach(function(v, i) {
-            if (v[0] != '/') {
-                this.src[i] = _this.baseDir + '/' + v;
+        var src = this.src;
+        this.src = [];
+        src.forEach(function(v, i) {
+            if (!v.length || v[0] != '/') {
+                v = _this.baseDir + (v.length ?  '/' + v : '');
             }
-            if (File.isDirectory(this.src[i])) {
+            if (!File.isDirectory(v)) {
                 throw {
                     name: "ArgumentError", 
-                    message: "invalid Source Directory : " +  v;
+                    message: "invalid Source Directory : " +  v
                 };
             }
-        }
+            _this.src.push(v);
+        });
         
         
         if (!this.template) {
@@ -129,7 +136,11 @@ Options = {
                 message: "No template Directory specified" 
             };
         }
-         
+        if (this.template[0] !='/') {
+            this.template = this.baseDir + '/' + this.template;
+        }
+        
+        
         if (!this.target) {
             throw {
                 name: "ArgumentError", 
@@ -167,8 +178,8 @@ Options = {
                     message: "Unknown argument: " + args[i] 
                 };
             }
-            var a = arg[i].substring(2);
-            if (typeof(argTypes[arg[i]]) == 'undefined') {
+            var a = args[i].substring(2);
+            if (typeof(this[args[i]]) == 'undefined') {
                 throw {
                     name: "ArgumentError", 
                     message: "Unknown argument: " + args[i] 
@@ -213,7 +224,7 @@ Options = {
     },
     
     
-    function showHelp()
+    showHelp: function()
     {
         print(this.usage);
         for(var i in this) {