X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FPacker.vala;h=1f0ac7cc8446ff13640a5df671f3e12e634aa44d;hb=cc935efc3f7afc2b006802fc8e53ce6f2f49996c;hp=077599823c8ef68de9c378cc4287d32d9a89b8bd;hpb=beb6eade33157f6da325f821dd63ac1975eda94f;p=gnome.introspection-doc-generator

diff --git a/JSDOC/Packer.vala b/JSDOC/Packer.vala
index 0775998..1f0ac7c 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...
@@ -268,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);
@@ -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);
+			}
 		     
 		
 		
@@ -368,17 +374,19 @@ namespace JSDOC
 			sp.mungeSymboltree();
 			sp.printWarnings();
 			//print(sp.warnings.join("\n"));
-
-		
+			
+			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;