X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FOptions.js;h=7fac06f828ce910e0e993102eb49a33a1043e086;hp=0d899506eb9d517f2ff145b6cfdeeb6e56ec2ab9;hb=a67931117fc1f532da5016752f7dd3c625ce25d3;hpb=4268580e3e99ccd638a5fcd42420454289c47840

diff --git a/JSDOC/Options.js b/JSDOC/Options.js
index 0d89950..7fac06f 100644
--- 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 = {
 
@@ -12,15 +12,19 @@ Options = {
     "help": false,   // was h;se
     
     
+    // configurable settings.. - 
+    "usage" : "Usage seed jsdocbuild.js OPTIONS \n",
+    
     
     // 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",
+    "--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)',
@@ -41,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',
@@ -62,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 );
@@ -88,17 +98,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", 
@@ -107,33 +121,41 @@ 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) {
+        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", 
                 message: "No directory specified" 
             };
         }
-      
+        
+        //print(JSON.stringify(this, null,4));
         
         // should cacheDirectory be a subdirectory of target??
         // if not set..
@@ -164,8 +186,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] 
@@ -210,9 +232,9 @@ Options = {
     },
     
     
-    function showHelp()
+    showHelp: function()
     {
-        print (""Usage seed jsdocbulid.js /var/www/seed [Gtk] \n": ");
+        print(this.usage);
         for(var i in this) {
             if (i.substring(0,2) != '--') {
                 continue;