X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FPacker.vala;h=62ac749c95255b39d155e8ea1b72e9f8addc7c1d;hp=69aaf99f79b842068472891e6b5d6c3c32cc1e74;hb=954be6f9897a8e3866089bb5f67fbe5409b608b9;hpb=a98d3de62c507cf8b4aab81fc8ba1805a5da7ec2

diff --git a/JSDOC/Packer.vala b/JSDOC/Packer.vala
index 69aaf99..62ac749 100644
--- a/JSDOC/Packer.vala
+++ b/JSDOC/Packer.vala
@@ -75,6 +75,10 @@ namespace JSDOC
 		/**
 		 * @cfg {String} tmpDir  (optional) where to put the temporary files. 
 		 *      if you set this, then files will not be cleaned up
+		 *  
+		 *  at present we need tmpfiles - as we compile multiple files into one.
+		 *  we could do this in memory now, as I suspect vala will not be as bad as javascript for leakage...
+		 *
 		 */
 		public string tmpDir = "/tmp";  // FIXME??? in ctor?
 	
@@ -92,7 +96,7 @@ namespace JSDOC
 		 *    usefull for debugging compressed files.
 		 */
 		
-		public bool keepWhite =  true;
+		public bool keepWhite =  false;
 		
 		
 		// list of files to compile...
@@ -112,6 +116,8 @@ namespace JSDOC
 			this.target = target;
 			this.targetDebug  = targetDebug;
 			this.files = new Gee.ArrayList<string>();
+			
+			new Lang_Class(); ///initilizaze lang..
 			 
 		}
 		
@@ -216,7 +222,7 @@ namespace JSDOC
 		        
 		        print("reading %s\n",file );
 		        
-		        if (FileUtils.test (file, FileTest.EXISTS) && ! FileUtils.test (file, FileTest.IS_DIR)) {
+		        if (!FileUtils.test (file, FileTest.EXISTS) || FileUtils.test (file, FileTest.IS_DIR)) {
 		            print("SKIP (is not a file) %s\n ", file);
 		            continue;
 		        }
@@ -245,7 +251,7 @@ namespace JSDOC
 		        // this might happen if tmpDir is set .. 
 
 		        
-		        if (true && FileUtils.test (minfile, FileTest.EXISTS)) {
+		        if (false && FileUtils.test (minfile, FileTest.EXISTS)) {
 		    		
 		    		var otv = File.new_for_path(file).query_info (FileAttribute.TIME_MODIFIED, 0).get_modification_time();
 		    		var mtv = File.new_for_path(minfile).query_info (FileAttribute.TIME_MODIFIED, 0).get_modification_time();
@@ -262,7 +268,7 @@ namespace JSDOC
 		            
 		        }
 		         
-		        print("COMPRESSING ");
+		        print("COMPRESSING to %s\n", minfile);
 		        //var codeComp = pack(str, 10, 0, 0);
 		        if (FileUtils.test (minfile, FileTest.EXISTS)) {
 		            FileUtils.remove(minfile);
@@ -276,63 +282,16 @@ namespace JSDOC
 		      
 		    }
 		    
-		    
-		    
-		    // 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");
+		  
+		    print("MERGING SOURCE\n");
 		    
 		    for(var i=0; i < this.files.size; i++)  {
 		        var file = this.files[i];
 		        var minfile = this.tmpDir + "/" + file.replace("/", ".");
 		        
 		        
-		        if ( FileUtils.test(minfile, FileTest.EXISTS)) {
+		        if ( !FileUtils.test(minfile, FileTest.EXISTS)) {
+		    		print("skipping source %s - does not exist\n", minfile);
 		            continue;
 		        }
 		        string str;
@@ -340,7 +299,7 @@ namespace JSDOC
 		        print("using MIN FILE  %s\n", minfile);
 		        if (str.length > 0) {
 		            if (this.targetStream != null) {
-		        		this.targetStream.write(("//" + file + "\n").data); 
+		        		this.targetStream.write(("// " + file + "\n").data); 
 		        		this.targetStream.write((str + "\n").data); 
 
 		            } else {
@@ -354,11 +313,16 @@ namespace JSDOC
 		        }
 		        
 		    }
-		    print("Output file: " + this.target);
+		    if (this.target.length > 0 ) {
+			    print("Output file: " + this.target);
+		    }
 		    if (this.targetDebug.length > 0) {
-				 print("Output debug file: " + this.targetDebug);
-			 }
-		    
+				 print("Output debug file: %s\n" , this.targetDebug);
+			}  
+			
+			if (this.outstr.length > 0 ) {
+				print(this.outstr);
+			}
 		     
 		
 		
@@ -397,6 +361,9 @@ namespace JSDOC
 			//var ts = new TokenStream(toks);
 			//print(JSON.stringify(toks, null,4 )); Seed.quit();
 			var ts = new Collapse(toks.tokens);
+			
+			//ts.dumpAll(""); 			print("Done collaps"); Process.exit(1);
+			
 		   // print(JSON.stringify(ts.tokens, null,4 )); Seed.quit();
 			//return;//
 			var sp = new ScopeParser(ts);
@@ -407,17 +374,19 @@ namespace JSDOC
 			sp.mungeSymboltree();
 			sp.printWarnings();
 			//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, this.keepWhite); // do not kill whitespace..
 		
-		
-		
+			
+			print("RESULT: \n %s\n", outf);
 		
 			 if (outf.length > 0) {
 				FileUtils.set_contents(minfile, outf);
 				 
-			}
+			}  
+
 		
 			return outf;