X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FBuildDocs.js;h=85f33ac36abca939f4d2cd70bcf72f75114473f0;hb=7d79987b2c0f1b02a8823dcc95764d787e4c91e4;hp=fac451dccc6c60443b1ee5720135e44a0bbc285b;hpb=7e0c58e6c06915dad40a04b582612b60175c4fee;p=gnome.introspection-doc-generator

diff --git a/JSDOC/BuildDocs.js b/JSDOC/BuildDocs.js
index fac451d..85f33ac 100644
--- a/JSDOC/BuildDocs.js
+++ b/JSDOC/BuildDocs.js
@@ -3,16 +3,16 @@
 	This is the main container for the JSDOC application.
 	@namespace
 */
-
+Gio = imports.gi.Gio;
 
 XObject = imports.XObject.XObject;
 File = imports.File.File;
 
 Template = imports.JsTemplate.Template.Template;
-
+Link = imports.JsTemplate.Link.Link; // ?? fixme!??
 
 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,16 +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 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);
               
@@ -152,50 +158,55 @@ 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");
         
-        // copy everything in 'static' into 
-        File.list(Options.templatesDir + '/static').forEach(function (f) {
-            File.copy(Options.templatesDir + '/static/' + f, Options.target + '/' + f);
-        });
         if (!File.isDirectory(Options.target +"/json")) {
-            File.makeDir(Options.target +"/json");
+            File.mkdir(Options.target +"/json");
         }
         
+        Options.LOG.inform("Copying files from static: " +Options.templateDir);
+        // copy everything in 'static' into 
+        File.list(Options.templateDir + '/static').forEach(function (f) {
+            Options.LOG.inform("Copy " + Options.templateDir + '/static/' + f + ' to  ' + Options.target + '/' + f);
+            File.copyFile(Options.templateDir + '/static/' + f, Options.target + '/' + f,  Gio.FileCopyFlags.OVERWRITE);
+        });
+        
+        
+        Options.LOG.inform("Setting up templates");
         // used to check the details of things being linked to
-        Link.symbolSet = symbolSet;
+        Link.symbolSet = this.symbolSet;
         Link.base = "../";
         
         var classTemplate = new Template({
-             templateFile : Options.templatesDir  + "/class.tmpl",
+             templateFile : Options.templateDir  + "/class.tmpl",
              Link : Link
         });
         var classesTemplate = new Template({
-            templateFile : Options.templatesDir +"/allclasses.tmpl",
+            templateFile : Options.templateDir +"/allclasses.tmpl",
             Link : Link
         });
         var classesindexTemplate = new Template({
-            templateFile : Options.templatesDir +"/index.tmpl",
+            templateFile : Options.templateDir +"/index.tmpl",
             Link : Link
         });
         var fileindexTemplate = new Template({   
-            templateFile : Options.templatesDir +"/allfiles.tmpl",
+            templateFile : Options.templateDir +"/allfiles.tmpl",
             Link: Link
         });
 
         
-        classTemplate.symbolSet = symbolSet;
+        classTemplate.symbolSet = this.symbolSet;
         
         
         function hasNoParent($) {
@@ -208,7 +219,7 @@ BuildDocs = {
             return ($.is("CONSTRUCTOR") || $.isNamespace); 
         }
         
-        var symbols = symbolSet.toArray();
+        var symbols = this.symbolSet.toArray();
         
         var files = Options.srcFiles;
         
@@ -341,11 +352,12 @@ BuildDocs = {
     {
         
         
-        name = sourceFile.substring(Options.baseDir.length);
+        name = sourceFile.substring(Options.baseDir.length+1);
         name = name.replace(/\.\.?[\\\/]/g, "").replace(/[\\\/]/g, "_");
-        name = name.replace(/\:/g, "_"); //??
         
+        name = name.replace(/\:/g, "_"); //??
         
+        Options.LOG.inform("Write Source file :" + sourceFile);
         var pretty = imports.PrettyPrint.toPretty(File.read(sourceFile));
         File.write(Options.target+"/symbols/src/" + name, 
             '<html><head>' +