X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FPacker.js;h=f7a324684b1d182a99558842427fd64bd1ec7062;hb=8354fa26bae86b85a5a6c28fc1efdbe19d6665d5;hp=8694fb7677b6fc48ea704e36663a415df243b25c;hpb=5e9f1487fe4ef6355c3b48ba2e52b9fde2f2f960;p=gnome.introspection-doc-generator diff --git a/JSDOC/Packer.js b/JSDOC/Packer.js index 8694fb7..f7a3246 100644 --- a/JSDOC/Packer.js +++ b/JSDOC/Packer.js @@ -2,13 +2,15 @@ XObject = imports.XObject.XObject; File = imports.File.File; -TextStream = imports['JSDOC/TextStream.js'].TextStream; -TokenReader = imports['JSDOC/TokenReader.js'].TokenReader; -ScopeParser = imports['JSDOC/ScopeParser.js'].ScopeParser; -TokenStream = imports['JSDOC/TokenStream.js'].TokenStream; -CompressWhite = imports['JSDOC/CompressWhite.js'].CompressWhite; +TextStream = imports.TextStream.TextStream; +TokenReader = imports.TokenReader.TokenReader; +ScopeParser = imports.ScopeParser.ScopeParser; +TokenStream = imports.TokenStream.TokenStream; +CompressWhite = imports.CompressWhite.CompressWhite; +Collapse = imports.Collapse.Collapse; GLib = imports.gi.GLib; +Gio = imports.gi.Gio; /** * @namespace JSDOC * @class Packer @@ -70,41 +72,73 @@ Packer = function(cfg) { XObject.extend(this, cfg); - - if (this.srcfile) { - this.loadSourceFile(); + var _this = this; + if (this.srcfiles && this.srcfiles.length) { + this.srcfiles.forEach(function(f) { + _this.loadSourceFile(f); + }); + } if (!this.files) { throw "No Files"; } - + var link = false; + if (cfg.autoBuild) { + var version = 0; + this.files.forEach(function(f) { + version = Math.max(File.mtime(f), version); + }); + var dirname = GLib.path_get_dirname(this.files[0]); + var outname = this.module ? this.module : GLib.path_get_basename(dirname); + this.target = dirname + '/compiled/' + outname + '-' + version + '.js'; + if (File.exists(this.target)) { + print("Target file already exists"); + Seed.quit(); + } + this.prefix = dirname +'/'; + this.translateJSON = dirname + '/compiled/_translation_.js'; + + } + + print(this.translateJSON); this.timer = new Date() * 1; this.packAll(); + + } Packer.prototype = { /** - * @prop srcfiles {String} file containing a list of files/or classes to use. + * @cfg {String} srcfiles file containing a list of files/or classes to use. */ - srcfiles : false, + srcfile : false, /** - * @prop files {Array} list of files to compress (must be full path) + * @cfg {Array} files list of files to compress (must be full path) */ files : false, /** - * @prop target {String} target to write files to - must be full path. + * @cfg {String} target to write files to - must be full path. */ target : '', /** - * @prop debugTarget {String} target to write files debug version to (uncompacted)- must be full path. + * @cfg {Boolean} autoBuild - turn on autobuild feature (puts files in compiled directory, + * and enables translation toolkit. + */ + autoBuild : false, + /** + * @cfg {String} module used with autoBuild to force a file name + */ + module: false, + /** + * @cfg {String} debugTargettarget to write files debug version to (uncompacted)- must be full path. */ debugTarget : '', // merged file without compression. /** - * @prop tmpDir {String} (optional) where to put the temporary files. + * @cfg {String} tmpDir (optional) where to put the temporary files. * if you set this, then files will not be cleaned up */ tmpDir : '/tmp', @@ -112,22 +146,53 @@ Packer.prototype = { translateJSON : '', // json based list of strings in all files. /** - * @prop cleanup {Boolean} (optional) clean up temp files after done - + * @cfg {Boolean} cleanup (optional) clean up temp files after done - * Defaults to false if you set tmpDir, otherwise true. */ cleanup : true, + /** + * @cfg {Boolean} keepWhite (optional) do not remove white space in output. + * usefull for debugging compressed files. + */ + + keepWhite: true, /** - * @prop prefix {String} (optional) prefix of directory to be stripped of when + * @cfg {String} prefix (optional) prefix of directory to be stripped of when * Calculating md5 of filename */ prefix : '', out : '', // if no target is specified - then this will contain the result + /** + * load a dependancy list -f option + * @param {String} srcfile sourcefile to parse + * + */ - loadSourceFile : function() + loadSourceFile : function(srcfile) { - var lines = File.read(this.srcfile).split("\n");; + var lines = File.read(srcfile).split("\n"); + var _this = this; + lines.forEach(function(f) { + + if (/^\s*\//.test(f) || !/[a-z]+/i.test(f)) { // skip comments.. + return; + } + if (/\.js$/.test(f)) { + _this.files.push( f); + // js file.. + return; + } + + //println("ADD"+ f.replace(/\./g, '/')); + var add = f.replace(/\./g, '/').replace(/\s+/g,'')+'.js'; + if (_this.files.indexOf(f) > -1) { + return; + } + _this.files.push( add ); + + }) }, @@ -290,7 +355,13 @@ Packer.prototype = { pack : function (str,fn,minfile) { - var tr = new TokenReader( { keepDocs :true, keepWhite : true, keepComments : true, sepIdents : true }); + var tr = new TokenReader( { + keepDocs :true, + keepWhite : true, + keepComments : true, + sepIdents : true, + collapseWhite : false + }); this.timerPrint("START" + fn); // we can load translation map here... @@ -308,8 +379,12 @@ Packer.prototype = { // and replace if we are generating a different language.. this.timerPrint("Tokenized"); + //var ts = new TokenStream(toks); + //print(JSON.stringify(toks, null,4 )); Seed.quit(); + var ts = new Collapse(toks); + // print(JSON.stringify(ts.tokens, null,4 )); Seed.quit(); //return;// - var sp = new ScopeParser(new TokenStream(toks)); + var sp = new ScopeParser(ts); this.timerPrint("Converted to Parser"); sp.packer = this; sp.buildSymbolTree(); @@ -317,7 +392,10 @@ Packer.prototype = { sp.mungeSymboltree(); this.timerPrint("Munged Sym tree"); print(sp.warnings.join("\n")); - var out = CompressWhite(sp.ts, this); + + + var out = CompressWhite(new TokenStream(toks), this, this.keepWhite); // do not kill whitespace.. + this.timerPrint("Compressed"); return out; @@ -379,10 +457,13 @@ Packer.prototype = { File.write(transmd5, ''); for(v in map) { - File.append(transfile, l + "\n\t \"" + v + '" : "' + v + '"'); + if (!v.length) { + continue; + } + File.append(transfile, l + "\n\t" + JSON.stringify(v) + " : " + JSON.stringify(v)); l = ','; // strings are raw... - as the where encoded to start with!!! - File.append(transmd5, '_T["' + this.md5(ffn + '-' + v) + '"]="'+v+"\";\n"); + File.append(transmd5, '_T["' + this.md5(ffn + '-' + v) + '"]='+JSON.stringify(v)+";\n"); } File.append(transfile, "\n},"); // always one trailing..