src/jsdoc/Packer.vala

[roojspacker] / src / jsdoc / Packer.vala

diff --git a/src/jsdoc/Packer.vala b/src/jsdoc/Packer.vala
index 5527dff..de38574 100644 (file)
--- a/src/jsdoc/Packer.vala
+++ b/src/jsdoc/Packer.vala
@@ -18,7 +18,7 @@ x.srcfiles = array of files (that list other files...) << not supported?
 x.target = "output.pathname.js"
 x.debugTarget = "output.pathname.debug.js"
 
- 
+  
     
 x.pack();  // writes files  etc..
     
@@ -83,54 +83,24 @@ namespace JSDOC
                 */
                //public string tmpDir = "/tmp";  // FIXME??? in ctor?
        
-       
-                 
-               /**
-                * @cfg {Boolean} cleanup  (optional) clean up temp files after done - 
-                *    Defaults to false if you set tmpDir, otherwise true.
-                */
-               public bool cleanup =  false;
-               
-               
-                /**
-                * @cfg {Boolean} skipScope (optional) skip Scope parsing and replacement.
-                *    usefull for debugging...
-                */
-               
-               public bool skipScope = false;
-               
-               
-               /**
-                * @cfg {Boolean} dumpTokens (optional) read the first file and dump the tokens.
-                *    usefull for debugging...
-                */
-               
-               public bool dumpTokens = false;
-               
+        
+                
                // list of files to compile...
-               Gee.ArrayList<string> files;
+               public Gee.ArrayList<string> files;
                
                /**
                * @cfg activeFile ??? used???
                */
                 
                public string activeFile = "";
-               
-                       
-               /**
-               * @cfg baseDir -- prefix the files listed in indexfiles with this.
-               */
-                
-               public string baseDir = "";
-               
-               
+                       
                public  string outstr = ""; // if no target is specified - then this will contain the result
                
+               public PackerRun config;
                
-               
-               
-               public Packer()
+               public Packer(PackerRun config)
                {
+                       this.config = config;
 #if HAVE_JSON_GLIB
                        this.result = new Json.Object();
 #else
@@ -375,7 +345,7 @@ namespace JSDOC
                    
                    var srcfile = in_srcfile;
                    if (srcfile[0] != '/') {
-                               srcfile = this.baseDir + in_srcfile;
+                               srcfile = config.opt_real_basedir + in_srcfile;
                        }
                    string str;
                    FileUtils.get_contents(srcfile,out str);
@@ -403,7 +373,7 @@ namespace JSDOC
                        var add = f.replace(".", "/") + ".js";
                        
                        if (add[0] != '/') {
-                                       add = this.baseDir + add;
+                                       add = config.opt_real_basedir + add;
                                }
                        
                        if (this.files.contains(add)) {
@@ -483,7 +453,7 @@ namespace JSDOC
                         
                        print("COMPRESSING to %s\n", minfile);
                        //var codeComp = pack(str, 10, 0, 0);
-                       if (this.cleanup && FileUtils.test (minfile, FileTest.EXISTS)) {
+                       if (config.opt_clean_cache && FileUtils.test (minfile, FileTest.EXISTS)) {
                            FileUtils.remove(minfile);
                        }
                        if (!loaded_string) {
@@ -504,7 +474,7 @@ namespace JSDOC
                        
                        
                        
-                       if (this.dumpTokens || this.hasErrors("")) {
+                       if (config.opt_dump_tokens || this.hasErrors("")) {
                                 
                                GLib.Process.exit(0);
                        }
@@ -525,23 +495,26 @@ namespace JSDOC
                        if (str.length > 0) {
                            if (this.targetStream != null) {
                                        this.targetStream.write(("// " + 
-                                               ( (file.length > this.baseDir.length) ? file.substring(this.baseDir.length)  : file ) + 
+                                               ( (file.length > config.opt_real_basedir.length) ? file.substring(config.opt_real_basedir.length)  : file ) + 
                                                "\n").data); 
-                                       this.targetStream.write((str + "\n").data); 
+
+                                       this.targetStream.write((str + "\n").data); 
 
                            } else {
                                this.outstr += "//" + 
-                                       ( (file.length > this.baseDir.length) ? file.substring(this.baseDir.length)  : file ) +  "\n";
-                               this.outstr += str + "\n";
+                                       ( (file.length > config.opt_real_basedir.length) ? file.substring(config.opt_real_basedir.length)  : file ) +  "\n";
+                               this.outstr += "//" +  file  +"\n";
+
+                                    this.outstr += str + "\n";
                            }
                            
                        }
-                       if (this.cleanup) {
+                       if (config.opt_clean_cache) {
                            FileUtils.remove(minfile);
                        }
                        
                    }
-                   if (this.cleanup) {
+                   if (config.opt_clean_cache) {
                                FileUtils.remove(tmpDir);
                        }
                    
@@ -587,7 +560,7 @@ namespace JSDOC
                
                        TokenArray toks = tr.tokenize(new TextStream(str)); // dont merge xxx + . + yyyy etc.
                
-                       if (this.dumpTokens) {
+                       if (config.opt_dump_tokens) {
                                toks.dump();
                                return "";
                                //GLib.Process.exit(0);
@@ -606,7 +579,7 @@ namespace JSDOC
                        
                   // print(JSON.stringify(ts.tokens, null,4 )); Seed.quit();
                        //return;//
-                       if (!this.skipScope) {
+                       if (!config.opt_skip_scope) {
                                var sp = new ScopeParser(ts, this, fn);
  
                                //sp.packer = this;
@@ -621,10 +594,10 @@ namespace JSDOC
                        //print(sp.warnings.join("\n"));
                        //(new TokenStream(toks.tokens)).dumpAll(""); GLib.Process.exit(1);
                        // compress works on the original array - in theory the replacements have already been done by now 
-                       var outf = CompressWhite(new TokenStream(toks.tokens), this, PackerRun.opt_keep_whitespace); // do not kill whitespace..
+                       var outf = CompressWhite(new TokenStream(toks.tokens), this, config.opt_keep_whitespace); // do not kill whitespace..
                
                        
-                       debug("RESULT: \n %s\n", outf);
+       //              debug("RESULT: \n %s\n", outf);