X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FBuildDocs.js;h=59d571d2910917af98df87056257833221940736;hb=7e20bee87f8a9611dedd3b3707ba21a50e8ebfd5;hp=c085131a7884491ce37a812dbabc62b177223710;hpb=f6d8d01594a572b30a2431e53de5b62e9b4ce5bf;p=gnome.introspection-doc-generator

diff --git a/JSDOC/BuildDocs.js b/JSDOC/BuildDocs.js
index c085131..59d571d 100644
--- a/JSDOC/BuildDocs.js
+++ b/JSDOC/BuildDocs.js
@@ -12,7 +12,7 @@ Template = imports.JsTemplate.Template.Template;
 
 
 Parser   = imports.Parser.Parser;
-
+TextStream = imports.TextStream.TextStream;
 TokenReader = imports.TokenReader.TokenReader;
 TokenStream = imports.TokenStream.TokenStream;
 Symbol = imports.Symbol.Symbol;
@@ -49,7 +49,7 @@ BuildDocs = {
         this.symbolSet = Parser.symbols;
         
         // this currently uses the concept of publish.js...
-             
+        
         this.publish();
          
         
@@ -60,25 +60,28 @@ BuildDocs = {
     _getSrcFiles : function() 
     {
         this.srcFiles = [];
-        
+        var _this = this;
         var ext = ["js"];
         if (Options.ext) {
             ext = Options.ext.split(",").map(function($) {return $.toLowerCase()});
         }
         
         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(function($) {
+                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;
     },
 
@@ -122,17 +125,19 @@ BuildDocs = {
             
             var src = ''
             try {
+                Options.LOG.inform("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 txs = new TextStream(src);
             
             var tr = new TokenReader({ keepComments : true, keepWhite : true });
-            var ts = new TokenStream(txs);
+            
+            var ts = new TokenStream(tr.tokenize(txs));
         
             Parser.parse(ts, srcFile);
               
@@ -153,27 +158,32 @@ BuildDocs = {
      
         
     publish  : function() {
-        
+        Options.LOG.inform("Publishing");
          
         // link!!!
         
         
-        
-        if (!File.exists(Options.target))
+        Options.LOG.inform("Making directories");
+        if (!File.isDirectory(Options.target))
             File.mkdir(Options.target);
-        if (!File.exists(Options.target+"/symbols"))
+        if (!File.isDirectory(Options.target+"/symbols"))
             File.mkdir(Options.target+"/symbols");
-        if (!File.exists(Options.target+"/symbols/src"))
+        if (!File.isDirectory(Options.target+"/symbols/src"))
             File.mkdir(Options.target+"/symbols/src");
         
+        if (!File.isDirectory(Options.target +"/json")) {
+            File.mkdir(Options.target +"/json");
+        }
+        
+        Options.LOG.inform("Copying files from static: " +Options.templatesDir);
         // copy everything in 'static' into 
         File.list(Options.templatesDir + '/static').forEach(function (f) {
+            Options.LOG.inform("Copy " + Options.templatesDir + '/static/' + f + ' to  ' + Options.target + '/' + f);
             File.copy(Options.templatesDir + '/static/' + f, Options.target + '/' + f);
         });
-        if (!File.isDirectory(Options.target +"/json")) {
-            File.makeDir(Options.target +"/json");
-        }
         
+        
+        Options.LOG.inform("Setting up templates");
         // used to check the details of things being linked to
         Link.symbolSet = symbolSet;
         Link.base = "../";