JSDOC/Packer.js

[gnome.introspection-doc-generator] / JSDOC / Packer.js

diff --git a/JSDOC/Packer.js b/JSDOC/Packer.js
index c78f334..a922598 100644 (file)
--- a/JSDOC/Packer.js
+++ b/JSDOC/Packer.js
@@ -81,6 +81,11 @@ Packer = function(cfg)
  
 }
 Packer.prototype = {
+    /**
+     * @prop srcfiles {String} file containing a list of files/or classes to use.
+     */
+    srcfiles : false,
+    
     /**
      * @prop files {Array} list of files to compress (must be full path)
      */
@@ -105,9 +110,13 @@ Packer.prototype = {
      * @prop cleanup {Boolean} (optional) clean up temp files after done - 
      *    Defaults to false if you set tmpDir, otherwise true.
      */
-    cleanup : true, //
-    
+    cleanup : true,  
     
+    /**
+     * @prop prefix {String} (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
     
     packAll : function()  // do the packing (run from constructor)
@@ -127,8 +136,8 @@ Packer.prototype = {
             var file = this.files[i];
             
             print("reading " +file );
-            if (!File.exists(file)) {
-                print("SKIP (does not exist) " + file);
+            if (!File.isFile(file)) {
+                print("SKIP (is not a file) " + file);
                 continue;
             }
            
@@ -278,7 +287,8 @@ Packer.prototype = {
         
         // at this point we can write a language file...
         if (this.translateJSON) {
-            this.writeTranslateFile(fn, minfile, tr.translateMap);
+            
+            this.writeTranslateFile(fn, minfile, toks);
         }
         
         this.activeFile = fn;
@@ -295,7 +305,7 @@ Packer.prototype = {
         sp.mungeSymboltree();
         this.timerPrint("Munged Sym tree");
         print(sp.warnings.join("\n"));
-        var out = JSDOC.CompressWhite(sp.ts, this);
+        var out = CompressWhite(sp.ts, this);
         this.timerPrint("Compressed");
         return out;
         
@@ -320,10 +330,22 @@ Packer.prototype = {
      * 
      */
     
-    writeTranslateFile : function(fn, minfile, map) 
+    writeTranslateFile : function(fn, minfile, toks) 
     {
+        
+        var map = {};
+        var _this = this;
+        toks.forEach(function (t) {
+            if (t.type == 'STRN' && t.name == 'DOUBLE_QUOTE') {
+                var sval = t.data.substring(1,t.data.length-1);
+                var ffn = fn.substring(_this.prefix.length);
+                map[sval] = _this.md5(ffn + '-' + sval);
+            }
+        })
+        
         var transfile = minfile + '.lang.trans';
         var transmd5 = minfile + '.lang';
+        print("writeTranslateFile "  + transfile);
         var i = 0;
         var v = '';
         if (File.exists(transfile)) {
@@ -336,11 +358,10 @@ Packer.prototype = {
         if (!i ) {
             return; // no strings in file...
         }
-        var ff = fn.split('/');
-        var ffn = ff[ff.length-1];
+        var ffn = fn.substring(this.prefix.length);
          
          
-        File.write(transfile, "\n" + ffn.toSource() + " : {");
+        File.write(transfile, "\n'" + ffn  + "' : {");
         var l = '';
         var _tout = {}
          
@@ -365,14 +386,16 @@ Packer.prototype = {
     {
         //print("STRING HANDLER");
        // callback when outputing compressed file, 
+       var data = tok.data;
         if (!this.translateJSON) {
          //   print("TURNED OFF");
-            return tok.outData;
+            return data;
         }
-        if (tok.name == SINGLE_QUOTE) {
-            return tok.outData;
+        if (tok.name == 'SINGLE_QUOTE') {
+            return data;
         }
-        var sval = tok.data.substring(1,tok.data.length-1);
+        
+        var sval = data.substring(1,data.length-1);
         // we do not clean up... quoting here!??!!?!?!?!?
         
         
@@ -381,12 +404,11 @@ Packer.prototype = {
        //     return tok.outData;
        // }
         
+        var sval = tok.data.substring(1,data.length-1);
+        var fn = this.activeFile.substring(this.prefix.length);
         
         
-        
-        var ff = this.activeFile.split('/');
-        var ffn = ff[ff.length-1];
-        return '_T["' + this.md5(ffn + '-' + sval) + '"]';
+        return '_T["' + this.md5(fn + '-' + sval) + '"]';
         
         
     }