X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FPacker.vala;h=b6d7e28a2563c5c0174190ba59d20002391ebe1d;hb=dad53f90789b90b0767d049a5c449b305d64941b;hp=3e2005fffd9c49efdf2456f6150065a9a3b1cbbc;hpb=7674a38fce9ccceac1966ee913c05bb350ddf9e8;p=gnome.introspection-doc-generator diff --git a/JSDOC/Packer.vala b/JSDOC/Packer.vala index 3e2005f..b6d7e28 100644 --- a/JSDOC/Packer.vala +++ b/JSDOC/Packer.vala @@ -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 { @@ -373,8 +374,8 @@ 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..