X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FBuildDocs.js;h=e85c99c8343c6449a495b93bcbb30ab1b689e80a;hb=d56985f1898989ac6236528f762e69837f185914;hp=b614cc62590c755a287282d4f22cb3f534257626;hpb=5092f4b1e952ade5926c2e04cc0577a0878a747e;p=gnome.introspection-doc-generator

diff --git a/JSDOC/BuildDocs.js b/JSDOC/BuildDocs.js
index b614cc6..e85c99c 100644
--- a/JSDOC/BuildDocs.js
+++ b/JSDOC/BuildDocs.js
@@ -3,19 +3,21 @@
 	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;
+Parser      = imports.Parser.Parser;
+TextStream  = imports.TextStream.TextStream;
 TokenReader = imports.TokenReader.TokenReader;
 TokenStream = imports.TokenStream.TokenStream;
-Symbol = imports.Symbol.Symbol;
+Symbol      = imports.Symbol.Symbol;
+DocComment  = imports.DocComment.DocComment;
+
 /******************    INCLUDES ARE ALL AT THE BOTTOM OF THIS FILE!!!!! *******************/
 
 // should not realy be here -- or anywhere...??
@@ -49,7 +51,7 @@ BuildDocs = {
         this.symbolSet = Parser.symbols;
         
         // this currently uses the concept of publish.js...
-             
+        
         this.publish();
          
         
@@ -81,7 +83,7 @@ BuildDocs = {
             });
                 
         }
-        Seed.print(JSON.stringify(this.srcFiles, null,4));Seed.quit();
+        //Seed.print(JSON.stringify(this.srcFiles, null,4));Seed.quit();
         return this.srcFiles;
     },
 
@@ -125,7 +127,7 @@ BuildDocs = {
             
             var src = ''
             try {
-                Options.LOG.warn("reading : " + srcFile);
+                Options.LOG.inform("reading : " + srcFile);
                 src = File.read(srcFile);
             }
             catch(e) {
@@ -158,50 +160,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($) {
@@ -213,8 +220,27 @@ BuildDocs = {
         function isaClass($) { 
             return ($.is("CONSTRUCTOR") || $.isNamespace); 
         }
+        function makeSortby(attribute) {
+            return function(a, b) {
+                if (a[attribute] != undefined && b[attribute] != undefined) {
+                    a = a[attribute]; //.toLowerCase();
+                    b = b[attribute];//.toLowerCase();
+                    if (a < b) return -1;
+                    if (a > b) return 1;
+                    return 0;
+                }
+            }
+        }
+        
+        
+        
+        
         
-        var symbols = symbolSet.toArray();
+        
+        
+        
+        
+        var symbols = this.symbolSet.toArray();
         
         var files = Options.srcFiles;
         
@@ -268,7 +294,7 @@ BuildDocs = {
         var allFiles = [];
         
         for (var i = 0; i < files.length; i++) {
-            allFiles.push(new  Symbol(files[i], [], "FILE", new JSDOC.DocComment("/** */")));
+            allFiles.push(new  Symbol(files[i], [], "FILE", new DocComment("/** */")));
         }
         
         for (var i = 0; i < documentedFiles.length; i++) {
@@ -347,11 +373,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 : " + Options.target+"/symbols/src/" + name);
         var pretty = imports.PrettyPrint.toPretty(File.read(sourceFile));
         File.write(Options.target+"/symbols/src/" + name, 
             '<html><head>' +