X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FBuildDocs.js;h=eb39bf98428c8a3d7b877c8c8682af8b3f5b7621;hb=723fb71d74c6b1da27fa7447b3efdff78166a283;hp=15c5621f0d402e0152005c92671d53ccf15b3248;hpb=c232edf81e87bd3c3eda3e84beea40c157420346;p=gnome.introspection-doc-generator

diff --git a/JSDOC/BuildDocs.js b/JSDOC/BuildDocs.js
index 15c5621..eb39bf9 100644
--- a/JSDOC/BuildDocs.js
+++ b/JSDOC/BuildDocs.js
@@ -10,9 +10,9 @@ File = imports.File.File;
 
 Template = imports.JsTemplate.Template.Template;
 
-Options = imports.Options.Options;
-Parser   = imports.Parser.Parser;
 
+Parser   = imports.Parser.Parser;
+TextStream = imports.TextStream.TextStream;
 TokenReader = imports.TokenReader.TokenReader;
 TokenStream = imports.TokenStream.TokenStream;
 Symbol = imports.Symbol.Symbol;
@@ -21,7 +21,7 @@ Symbol = imports.Symbol.Symbol;
 // should not realy be here -- or anywhere...??
 
 
-
+Options = false; // refer to this everywhere!
 
 
 BuildDocs = {
@@ -31,19 +31,16 @@ BuildDocs = {
     
     srcFiles : [],
     
+    
     build : function (opts)
     {
-        
-        XObject.extend(Options, opts);
-         
+        Options = opts; 
         Options.init();
         
-     
-        
         Options.LOG.inform("JsDoc Toolkit main() running at "+new Date()+".");
         //Options.LOG.inform("With options: ");
         
-        if (!File.isDirectory(Options.cacheDirectory)) {   
+        if (Options.cacheDirectory.length && !File.isDirectory(Options.cacheDirectory)) {   
             File.mkdir(Options.cacheDirectory)
         }
         
@@ -70,18 +67,21 @@ BuildDocs = {
         }
         
         for (var i = 0; i < Options.src.length; i++) {
-            this.srcFiles = this.srcFiles.concat(
+            // add to sourcefiles..
             
-                File.list(Options.src[i] ).filter(
-                    function($) {
-                        var thisExt = $.split(".").pop().toLowerCase();
-                        return (ext.indexOf(thisExt) > -1); // || thisExt in JSDOC.handlers);
-                            // we're only interested in files with certain extensions
-                    }
-                )
-            );
+            File.list(Options.src[i] ).forEach($) {
+                if (Options['exclude-src'].indexOf($) > -1) {
+                    return;
+                }
+                var thisExt = $.split(".").pop().toLowerCase();
+                if (ext.indexOf(thisExt) < 0) {
+                    return;
+                }
+                this.srcFiles.push(Options.src[i] + '/' + $);
+            });
+                
         }
-        
+        Seed.print(JSON.stringify(this.srcFiles, null,4));Seed.quit();
         return this.srcFiles;
     },
 
@@ -125,16 +125,19 @@ BuildDocs = {
             
             var src = ''
             try {
+                Options.LOG.warn("reading : " + srcFile);
                 src = File.read(srcFile);
             }
             catch(e) {
-                LOG.warn("Can't read source file '"+srcFile+"': "+e.message);
+                Options.LOG.warn("Can't read source file '"+srcFile+"': "+e.message);
                 continue;
             }
 
-             
-            var tr = new TokenReader();
-            var ts = new TokenStream(tr.tokenize(src));
+            var txs = new TextStream(src);
+            
+            var tr = new TokenReader({ keepComments : true, keepWhite : true });
+            
+            var ts = new TokenStream(tr.tokenize(txs));
         
             Parser.parse(ts, srcFile);
               
@@ -150,7 +153,7 @@ BuildDocs = {
         
         
         Parser.finish();
-    }
+    },
     
      
         
@@ -280,7 +283,7 @@ BuildDocs = {
         
     },
 
-    publishJSON = function(file, data)
+    publishJSON : function(file, data)
     {
         // what we need to output to be usefull...
         // a) props..
@@ -350,7 +353,7 @@ BuildDocs = {
         
         
         var pretty = imports.PrettyPrint.toPretty(File.read(sourceFile));
-        File.write(Options.target+"/symbols/src" + name, 
+        File.write(Options.target+"/symbols/src/" + name, 
             '<html><head>' +
             '<title>' + sourceFile + '</title>' +
             '<link rel="stylesheet" type="text/css" href="../../../highlight-js.css"/>' +