X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FPacker.vala;h=822e0736b5036f9aa362a940274fa8fc6a0b011f;hb=5952f0a864405366d4da4951db2c01f207b82b35;hp=e4a54b89592d2d2f12b3c868d98fb26be9ac1a74;hpb=bccc3930f07108d67ad61472c91e9ee2bf96af39;p=gnome.introspection-doc-generator

diff --git a/JSDOC/Packer.vala b/JSDOC/Packer.vala
index e4a54b8..822e073 100644
--- a/JSDOC/Packer.vala
+++ b/JSDOC/Packer.vala
@@ -96,7 +96,7 @@ namespace JSDOC
 		 *    usefull for debugging compressed files.
 		 */
 		
-		public bool keepWhite =  true;
+		public bool keepWhite =  false;
 		
 		
 		// list of files to compile...
@@ -283,14 +283,15 @@ namespace JSDOC
 		    }
 		    
 		  
-		    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;
@@ -298,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 {
@@ -312,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);
+			}
 		     
 		
 		
@@ -370,7 +376,7 @@ namespace JSDOC
 			//print(sp.warnings.join("\n"));
 
 		
-			var outf = CompressWhite(new TokenStream(toks.tokens), this, this.keepWhite); // do not kill whitespace..
+			var outf = CompressWhite(new TokenStream(ts.toArray()), this, this.keepWhite); // do not kill whitespace..
 		
 			
 			print("RESULT: \n %s\n", outf);