JSDOC/Packer.vala
authorAlan Knowles <alan@roojs.com>
Wed, 28 Oct 2015 09:52:48 +0000 (17:52 +0800)
committerAlan Knowles <alan@roojs.com>
Wed, 28 Oct 2015 09:52:48 +0000 (17:52 +0800)
JSDOC/Packer.vala

index d72e973..49c6ac2 100644 (file)
@@ -168,159 +168,159 @@ namespace JSDOC
                        if (_this.files.contains(add)) {
                            continue;
                        }
-                       _this.files.push( add );
+                       _this.files.add( add );
                        
-                   })
-               },
-    
-    
-    packAll : function()  // do the packing (run from constructor)
-    {
-        
-        //this.transOrigFile= bpath + '/../lang.en.js'; // needs better naming...
-        //File.write(this.transfile, "");
-        if (this.target) {
-            File.write(this.target, "");
-        }
-        
-        if (this.debugTarget) {
-            File.write(this.debugTarget, "");
-        }
-        if (this.debugTranslateTarget) {
-            File.write(this.debugTarget, "");
-        }
-        
-        for(var i=0; i < this.files.length; i++)  {
-            var file = this.files[i];
-            
-            print("reading " +file );
-            if (!File.isFile(file)) {
-                print("SKIP (is not a file) " + file);
-                continue;
-            }
-           
-            // debug Target
-            
-            if (this.debugTarget) {
-                File.append(this.debugTarget, File.read(file));
-            }
-            // it's a good idea to check with 0 compression to see if the code can parse!!
-            
-            // debug file..
-            //File.append(dout, str +"\n"); 
-            
-       
-            
-            var minfile = this.tmpDir + '/' +file.replace(/\//g, '.');
-            
-            
-            // let's see if we have a min file already?
-            // this might happen if tmpDir is set .. 
-            if (true && File.exists(minfile)) {
-                var mt = File.mtime(minfile);
-                var ot = File.mtime(file);
-                print("compare : " + mt + "=>" + ot);
-                if (mt >= ot) {
-                    continue;
-                    
-                }
-                
-            }
-             
-            print("COMPRESSING ");
-            //var codeComp = pack(str, 10, 0, 0);
-            if (File.exists(minfile)) {
-                File.remove(minfile);
-            }
-            var str = File.read(file);
-            var str = this.pack(str, file, minfile);
-             
-          
-        }
-        
-        
-        
-        // if we are translating, write the translations strings at the top
-        // of the file..
-        
-        if (this.translateJSON) {
-            
-               
-            print("MERGING LANGUAGE");
-            var out = "if (typeof(_T) == 'undefined') { _T={};}\n"
-            if (this.target) {
-                File.write(this.target, out);
-            } else {
-                this.out += out;
-            }
-             
-            File.write(this.translateJSON, "");
-            for(var i=0; i < this.files.length; i++)  {
-                var file = this.files[i];
-                var transfile= this.tmpDir + '/' +file.replace(/\//g, '.') +'.lang.trans';
-                var transmd5 = this.tmpDir  + '/' +file.replace(/\//g, '.') +'.lang';
-                if (File.exists(transmd5)) {
-                    var str = File.read(transmd5);
-                    if (str.length) {
-                        if (this.target) {
-                            File.append(this.target, str + "\n");
-                        } else {
-                            this.out += str + "\n";
-                        }
-                        
-                    }
-                    if (this.cleanup) {
-                        File.remove(transmd5);
-                    }
-                }
-                if (File.exists(transfile)) {
-                    var str = File.read(transfile);
-                    if (str.length) {
-                        File.append(this.translateJSON, str);
-                    }
-                    if (this.cleanup) {
-                        File.remove(transfile);
-                    }
-                }
-                
-               
-            }
-        }
-        
-        print("MERGING SOURCE");
-        
-        for(var i=0; i < this.files.length; i++)  {
-            var file = this.files[i];
-            var minfile = this.tmpDir + '/' + file.replace(/\//g, '.');
-            
-            
-            if (!File.exists(minfile)) {
-                continue;
-            }
-            var str = File.read(minfile);
-            print("using MIN FILE  "+ minfile);
-            if (str.length) {
-                if (this.target) {
-                    File.append(this.target, '//' + file + "\n");   
-                    File.append(this.target, str + "\n");   
-                } else {
-                    this.out += '//' + file + "\n";
-                    this.out += str + "\n";
-                }
-                
-            }
-            if (this.cleanup) {
-                File.remove(minfile);
-            }
-            
-        }
-        print("Output file: " + this.target);
-        if (this.debugTarget) print("Output debug file: " + this.debugTarget);
-        
-         
+                   }
+               }
     
     
-    },
+               private void packAll()  // do the packing (run from constructor)
+               {
+                   
+                   //this.transOrigFile= bpath + '/../lang.en.js'; // needs better naming...
+                   //File.write(this.transfile, "");
+                   if (this.target) {
+                       File.write(this.target, "");
+                   }
+                   
+                   if (this.debugTarget) {
+                       File.write(this.debugTarget, "");
+                   }
+                   if (this.debugTranslateTarget) {
+                       File.write(this.debugTarget, "");
+                   }
+                   
+                   for(var i=0; i < this.files.length; i++)  {
+                       var file = this.files[i];
+                       
+                       print("reading " +file );
+                       if (!File.isFile(file)) {
+                           print("SKIP (is not a file) " + file);
+                           continue;
+                       }
+                      
+                       // debug Target
+                       
+                       if (this.debugTarget) {
+                           File.append(this.debugTarget, File.read(file));
+                       }
+                       // it's a good idea to check with 0 compression to see if the code can parse!!
+                       
+                       // debug file..
+                       //File.append(dout, str +"\n"); 
+                       
+                  
+                       
+                       var minfile = this.tmpDir + '/' +file.replace(/\//g, '.');
+                       
+                       
+                       // let's see if we have a min file already?
+                       // this might happen if tmpDir is set .. 
+                       if (true && File.exists(minfile)) {
+                           var mt = File.mtime(minfile);
+                           var ot = File.mtime(file);
+                           print("compare : " + mt + "=>" + ot);
+                           if (mt >= ot) {
+                               continue;
+                               
+                           }
+                           
+                       }
+                        
+                       print("COMPRESSING ");
+                       //var codeComp = pack(str, 10, 0, 0);
+                       if (File.exists(minfile)) {
+                           File.remove(minfile);
+                       }
+                       var str = File.read(file);
+                       var str = this.packFile(str, file, minfile);
+                        
+                     
+                   }
+                   
+                   
+                   
+                   // if we are translating, write the translations strings at the top
+                   // of the file..
+                   
+                   if (this.translateJSON) {
+                       
+                          
+                       print("MERGING LANGUAGE");
+                       var out = "if (typeof(_T) == 'undefined') { _T={};}\n"
+                       if (this.target) {
+                           File.write(this.target, out);
+                       } else {
+                           this.out += out;
+                       }
+                        
+                       File.write(this.translateJSON, "");
+                       for(var i=0; i < this.files.length; i++)  {
+                           var file = this.files[i];
+                           var transfile= this.tmpDir + '/' +file.replace(/\//g, '.') +'.lang.trans';
+                           var transmd5 = this.tmpDir  + '/' +file.replace(/\//g, '.') +'.lang';
+                           if (File.exists(transmd5)) {
+                               var str = File.read(transmd5);
+                               if (str.length) {
+                                   if (this.target) {
+                                       File.append(this.target, str + "\n");
+                                   } else {
+                                       this.out += str + "\n";
+                                   }
+                                   
+                               }
+                               if (this.cleanup) {
+                                   File.remove(transmd5);
+                               }
+                           }
+                           if (File.exists(transfile)) {
+                               var str = File.read(transfile);
+                               if (str.length) {
+                                   File.append(this.translateJSON, str);
+                               }
+                               if (this.cleanup) {
+                                   File.remove(transfile);
+                               }
+                           }
+                           
+                          
+                       }
+                   }
+                   
+                   print("MERGING SOURCE");
+                   
+                   for(var i=0; i < this.files.length; i++)  {
+                       var file = this.files[i];
+                       var minfile = this.tmpDir + '/' + file.replace(/\//g, '.');
+                       
+                       
+                       if (!File.exists(minfile)) {
+                           continue;
+                       }
+                       var str = File.read(minfile);
+                       print("using MIN FILE  "+ minfile);
+                       if (str.length) {
+                           if (this.target) {
+                               File.append(this.target, '//' + file + "\n");   
+                               File.append(this.target, str + "\n");   
+                           } else {
+                               this.out += '//' + file + "\n";
+                               this.out += str + "\n";
+                           }
+                           
+                       }
+                       if (this.cleanup) {
+                           File.remove(minfile);
+                       }
+                       
+                   }
+                   print("Output file: " + this.target);
+                   if (this.debugTarget) print("Output debug file: " + this.debugTarget);
+                   
+                    
+               
+               
+               },
     /**
      * Core packing routine  for a file
      * 
@@ -330,7 +330,7 @@ namespace JSDOC
      * 
      */
     
-    pack : function (str,fn,minfile)
+    packFile : function (str,fn,minfile)
     {
     
         var tr = new  TokenReader(  {