X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FBuildDocs.js;h=d11416a1cbd79c963d2f44866b166d5964b44692;hb=f01cf79c67addcf90ef57a17911e45e2d6746a05;hp=88b361cf72987a5fd1bfe33ecac836bf8fcc7107;hpb=14695a492296b2f4eeef5f5cad7d5edc3f13d5ae;p=gnome.introspection-doc-generator
diff --git a/JSDOC/BuildDocs.js b/JSDOC/BuildDocs.js
index 88b361c..d11416a 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: ");
+ //Options.LOG.inform("With options: ");
- if (!File.isDirectory(Options.cacheDirectory)) {
+ if (Options.cacheDirectory.length && !File.isDirectory(Options.cacheDirectory)) {
File.mkdir(Options.cacheDirectory)
}
@@ -125,6 +122,7 @@ BuildDocs = {
var src = ''
try {
+ Options.LOG.warn("reading : " + srcFile);
src = File.read(srcFile);
}
catch(e) {
@@ -132,9 +130,10 @@ BuildDocs = {
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(txs);
Parser.parse(ts, srcFile);
@@ -150,7 +149,7 @@ BuildDocs = {
Parser.finish();
- }
+ },
@@ -280,7 +279,7 @@ BuildDocs = {
},
- publishJSON = function(file, data)
+ publishJSON : function(file, data)
{
// what we need to output to be usefull...
// a) props..
@@ -344,13 +343,13 @@ BuildDocs = {
{
- if (!name) {
- name = sourceFile.replace(/\.\.?[\\\/]/g, "").replace(/[\\\/]/g, "_");
- name = name.replace(/\:/g, "_");
- }
+ name = sourceFile.substring(Options.baseDir.length);
+ name = name.replace(/\.\.?[\\\/]/g, "").replace(/[\\\/]/g, "_");
+ name = name.replace(/\:/g, "_"); //??
+
- var pretty = PrettyPrint.toPretty(File.read(sourceFile));
- File.write(Options.target+"/symbols/src" + prettyfile,
+ var pretty = imports.PrettyPrint.toPretty(File.read(sourceFile));
+ File.write(Options.target+"/symbols/src/" + name,
'' +
'' + sourceFile + '' +
'' +