X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=pack.js;h=b9d1aff4f9628cc1a2127d7b5276dacf7e94d86c;hb=909bf14ef12fd0ba868cfb98128054c99f36388a;hp=bdd5734d8535c8262ef304ca90a64d3f52c125a1;hpb=f5443aa74aa4ec744692848653f3f625f7efc77f;p=gnome.introspection-doc-generator

diff --git a/pack.js b/pack.js
index bdd5734..b9d1aff 100755
--- a/pack.js
+++ b/pack.js
@@ -1,7 +1,12 @@
 #!/usr/bin/seed
 //<script type="text/javascript">
 /**
- * Simple packer example
+ * packer command line
+ * 
+ * -o Output
+ * -t Translate json file.
+ * -w Cache / working dir.
+ * -C no cleanup (use with -w if you need are using a cache directory.)
  *
  * compresses files listed as arguments and outputs result
  */
@@ -10,56 +15,52 @@ TokenReader     = imports['JSDOC/TokenReader.js'].TokenReader;
 ScopeParser     = imports['JSDOC/ScopeParser.js'].ScopeParser;
 TokenStream     = imports['JSDOC/TokenStream.js'].TokenStream;
 CompressWhite   = imports['JSDOC/CompressWhite.js'].CompressWhite;
+Packer          = imports['JSDOC/Packer.js'].Packer;
 File = imports.File.File;
  
- 
-function pack(str)
-{
-    
-    var tr = new  TokenReader(  { keepDocs :true, keepWhite : true,  keepComments : true, sepIdents : true });
-    var toks = tr.tokenize(new TextStream(str) ); // dont merge xxx + . + yyyy etc.
-    var ts = new   TokenStream(toks);
-   // ts.dump();
-    var sp = new  ScopeParser(ts);
-    sp.buildSymbolTree();
-    sp.mungeSymboltree();
-    print(sp.warnings.join("\n"));
-    var out =  CompressWhite(sp.ts);
-    return out;
-    
-}
-
+  
 
 var args = Array.prototype.slice.call(Seed.argv);
 args.shift(); //seed
 args.shift(); // pack.js
-var files = [];
-var outfn = '';
-if (!args.length) {
-    print( "no files selected");
-    Seed.quit();
+var cfg = {
+    files : [],
+    target : false,
 }
+
+
 for(var i =0; i < args.length;i++) {
     if (args[i] == '-o') {
-        outfn = args[i+1];
+        cfg.target = args[i+1];
         i++;
         continue;
     }
-    files.push(args[i]);
-}
-print(files.join(', '));
-if (!files.length) {
-    throw "no files selected";
+    if (args[i] == '-t') {
+        cfg.translateJSON = args[i+1];
+        i++;
+        continue;
+    }
+    if (args[i] == '-w') {
+        cfg.tmpDir = args[i+1];
+        i++;
+        continue;
+    }
+    
+    if (args[i] == '-C') {
+        cfg.cleanup = false;
+        continue;
+    }
+    cfg.files.push(args[i]);
 }
-var out = '';
-files.forEach(function(f) {
-    out = pack(File.read(f)) + "\n";
-});
-if (outfn) {
-    File.write(outfn, out);
+var pack;
+try {
+    pack = new Packer(cfg)
+} catch (e) {
+    print("ERROR " + e);
     Seed.quit();
 }
-print(out);
-
+if (!pack.target) {
+    print(pack.out);
+}