X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FOptions.js;h=ed4a1eb6b7c84760f1ac4f04177df38658711673;hp=290d64e66fd22788fb99d1f91ae339cefb171907;hb=730b246bf79d0c06ca211bb0fc1d12c94f22f466;hpb=4bf0ad66405c1e2e1b85200a2ffb2248bc0086e6

diff --git a/JSDOC/Options.js b/JSDOC/Options.js
index 290d64e..ed4a1eb 100644
--- a/JSDOC/Options.js
+++ b/JSDOC/Options.js
@@ -19,11 +19,12 @@ Options = {
     // options get defined like this..
     "--src"           :  "source directory (either absolute - starts with "/" or relative " + 
                         "- without, in which case it's added to baseDir",
+    "--exclude-src"       : 'Ex',   
     "--baseDir"       :  'Base Directory (root directory of code)',
     "--target"        :  'Target Directory (where html files go)',
     "--cacheDirectory": 'Cached Files Directory',
     "--conf"          : 'Read From a Configuration file',       // was c. - configuration file.. - parsed with JSON.parse
-    "--template"      : 'Template Directory',   // was t.
+    "--templateDir"      : 'Template Directory',   // was t.
     // "recurse": false,   // was r. - not supported..
     "--ext"           :  'Extension of code files to read (normally js)',   // was x.
     "--publishExt"    : 'Extension of html files to write (normally html)',
@@ -44,11 +45,12 @@ Options = {
     
     // and now the defaults.. (which type can be infered from..)
     "src" : [],
+    "exclude-src" : [],
     "baseDir" :  '',  // base directory - 
     "target" : '',   // was d. ?? source directory (needed to put temporary files..)
     "cacheDirectory" : '',
     "conf" : '',       // was c. - configuration file.. - parsed with JSON.parse
-    "template": '',   // was t.
+    "templateDir": '',   // was t.
     // "recurse": false,   // was r. - not supported..
     "ext": 'js',   // was x.
     "publishExt" : 'html',
@@ -65,6 +67,11 @@ Options = {
     "disablecache": '',   // was C
     "define" : [],   // was D.
     "handler" : [],  // was H -- not supported..
+    
+    
+    "version" : "1.0",
+    "copyright" : "LGPL",
+    
     LOG : {
         warn : function(str) {
             print("Warn: " +str );
@@ -101,7 +108,7 @@ Options = {
         // this is most likely to come from the command line..
         if (this.conf) {
             var conf = this.conf[0] == '/' ? this.conf : this.baseDir + '/' + this.conf;
-            print("loading : " + conf);
+        
             XObject.extend(this, JSON.parse(File.read(conf)));;
         }
         // help ?? -- usage..
@@ -114,26 +121,33 @@ 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
                 };
             }
+            _this.src.push(v);
         });
         
         
-        if (!this.template) {
+        if (!this.templateDir) {
             throw {
                 name: "ArgumentError", 
-                message: "No template Directory specified" 
+                message: "No templateDir Directory specified" 
             };
         }
-         
+        if (this.templateDir[0] !='/') {
+            this.templateDir = this.baseDir + '/' + this.templateDir;
+        }
+        
+        
         if (!this.target) {
             throw {
                 name: "ArgumentError",