sync

diff --git a/.roobuilder.jcfg b/.roobuilder.jcfg
index ef31a59..4e2ff37 100644 (file)
--- a/.roobuilder.jcfg
+++ b/.roobuilder.jcfg
@@ -3,6 +3,7 @@
     "compilegroups" : [
         {
             "name" : "roobuilder",
+            "is_library" : false,
             "execute_args" : "",
             "sources" : [
                 "src/Builder4/About.bjs",
@@ -74,6 +75,8 @@
         }
     ],
     "compile_flags" : "",
+    "version" : "5.3",
+    "licence" : "LGPL",
     "packages" : [
         "gtk4",
         "gee-0.8",
@@ -89,6 +92,7 @@
         "gtksourceview-5",
         "jsonrpc-glib-1.0",
         "gio-unix-2.0",
-        "libadwaita-1"
+        "libadwaita-1",
+        "roojspack-1.5"
     ]
 }
\ No newline at end of file

diff --git a/meson.build b/meson.build
index 7f59afc..7a75fff 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('roobuilder', 'vala', 'c',
-  version: '1.0',
+  version: '5.3',
   license: 'LGPL',
   default_options: [
     'default_library=static',
@@ -31,6 +31,7 @@ deps = [
    dependency('jsonrpc-glib-1.0'),
    dependency('gio-unix-2.0'),
    dependency('libadwaita-1'),
+   dependency('roojspack-1.5'),
 
 ]
  
@@ -159,8 +160,8 @@ roobuilder_src = files([
 
 
 roobuilder = executable('roobuilder',
-   dependencies: deps,
-   sources: [ roobuilder_src , roobuilder_resources ],
-   install: true
+    dependencies: deps,
+    sources: [  roobuilder_src , roobuilder_resources ],
+    install: true
 )
 

diff --git a/src/Palete/Javascript.vala b/src/Palete/Javascript.vala
index 6a7512b..066e89c 100644 (file)
--- a/src/Palete/Javascript.vala
+++ b/src/Palete/Javascript.vala
@@ -103,32 +103,44 @@ namespace Palete {
                         
                        
                }
-               /*
+                
                
-               public Json.Object   compressionErrors(string code , string fn)
+               public  async   Json.Object   compressionErrors(string code , string fn) throws ThreadError
                {
                        // this uses the roojspacker code to try and compress the code.
                        // it should highlight errors before we actually push live the code.
-                       
+                       SourceFunc callback = compressionErrors.callback;
+                       owned Json.Object ret = new Json.Object();
+                  
+                  
+                   ThreadFunc<bool> run = () => {
+
                        // standard error format:  file %s, line %s, Error 
-                        
-                       
-                       var cfg = new JSDOC.PackerRun();
-                       cfg.opt_keep_whitespace = false;
-                       cfg.opt_skip_scope = false;
-                       cfg.opt_dump_tokens = false;                    
-                       cfg.opt_clean_cache = false;
-                       
+                         
+                               var cfg = new JSDOC.PackerRun();
+                               cfg.opt_keep_whitespace = false;
+                               cfg.opt_skip_scope = false;
+                               cfg.opt_dump_tokens = false;                    
+                               cfg.opt_clean_cache = false;
+                               
 
-                       var p = new JSDOC.Packer(cfg);
-                        
-                 
-                       p.packFile(code, fn,"");
-                        
-                       return p.result;
-                        
+                               var p = new JSDOC.Packer(cfg);
+                                
+                         
+                               p.packFile(code, fn,"");
+                                
+                               ret = p.result;
+                               Idle.add((owned) callback); 
+                               return true;
+                       };
+                       new Thread<bool>("roopacker", run);
+                       yield;
+                       return ret;
+               
+               
                }
-               */
+                
+        
                
                /**
                 * extension API concept..