upgrade to vala 56 complete

diff --git a/src/Builder4/config1.builder b/src/Builder4/config1.builder
index 57dbd0e..78a9539 100644 (file)
--- a/src/Builder4/config1.builder
+++ b/src/Builder4/config1.builder
@@ -66,11 +66,97 @@
             "../Builder4/PopoverProperty.vala",
             "../Builder4/ValaProjectSettingsPopover.vala",
             "../Builder4/RooProjectSettings.vala",
-            "../Project/Flutter.vala",
-            "../Palete/Flutter.vala",
-            "../JsRender/Flutter.vala",
             "../JsRender/Json.vala",
-            "../JsRender/JsonGen.vala"
+            "../JsRender/JsonGen.vala",
+            "..//codegen/valaccodearraymodule.vala",
+            "..//codegen/valaccodeassignmentmodule.vala",
+            "..//codegen/valaccodeattribute.vala",
+            "..//codegen/valaccodebasemodule.vala",
+            "..//codegen/valaccodecompiler.vala",
+            "..//codegen/valaccodecontrolflowmodule.vala",
+            "..//codegen/valaccodedelegatemodule.vala",
+            "..//codegen/valaccodememberaccessmodule.vala",
+            "..//codegen/valaccodemethodcallmodule.vala",
+            "..//codegen/valaccodemethodmodule.vala",
+            "..//codegen/valaccodestructmodule.vala",
+            "..//codegen/valaccode.vala",
+            "..//codegen/valaclassregisterfunction.vala",
+            "..//codegen/valactype.vala",
+            "..//codegen/valaenumregisterfunction.vala",
+            "..//codegen/valagasyncmodule.vala",
+            "..//codegen/valagdbusclientmodule.vala",
+            "..//codegen/valagdbusmodule.vala",
+            "..//codegen/valagdbusservermodule.vala",
+            "..//codegen/valagerrormodule.vala",
+            "..//codegen/valagirwriter.vala",
+            "..//codegen/valaglibvalue.vala",
+            "..//codegen/valagobjectmodule.vala",
+            "..//codegen/valagsignalmodule.vala",
+            "..//codegen/valagtkmodule.vala",
+            "..//codegen/valagtypemodule.vala",
+            "..//codegen/valagvaluemodule.vala",
+            "..//codegen/valagvariantmodule.vala",
+            "..//codegen/valainterfaceregisterfunction.vala",
+            "..//codegen/valastructregisterfunction.vala",
+            "..//codegen/valatyperegisterfunction.vala",
+            "..//codegen",
+            "..//ccode/valaccodeassignment.vala",
+            "..//ccode/valaccodebinaryexpression.vala",
+            "..//ccode/valaccodeblock.vala",
+            "..//ccode/valaccodebreakstatement.vala",
+            "..//ccode/valaccodecasestatement.vala",
+            "..//ccode/valaccodecastexpression.vala",
+            "..//ccode/valaccodecommaexpression.vala",
+            "..//ccode/valaccodecomment.vala",
+            "..//ccode/valaccodeconditionalexpression.vala",
+            "..//ccode/valaccodeconstantidentifier.vala",
+            "..//ccode/valaccodeconstant.vala",
+            "..//ccode/valaccodecontinuestatement.vala",
+            "..//ccode/valaccodedeclaration.vala",
+            "..//ccode/valaccodedeclarator.vala",
+            "..//ccode/valaccodedefine.vala",
+            "..//ccode/valaccodedostatement.vala",
+            "..//ccode/valaccodeelementaccess.vala",
+            "..//ccode/valaccodeemptystatement.vala",
+            "..//ccode/valaccodeenum.vala",
+            "..//ccode/valaccodeenumvalue.vala",
+            "..//ccode/valaccodeexpressionstatement.vala",
+            "..//ccode/valaccodeexpression.vala",
+            "..//ccode/valaccodefile.vala",
+            "..//ccode/valaccodeforstatement.vala",
+            "..//ccode/valaccodefragment.vala",
+            "..//ccode/valaccodefunctioncall.vala",
+            "..//ccode/valaccodefunctiondeclarator.vala",
+            "..//ccode/valaccodefunction.vala",
+            "..//ccode/valaccodeggnucsection.vala",
+            "..//ccode/valaccodegotostatement.vala",
+            "..//ccode/valaccodeidentifier.vala",
+            "..//ccode/valaccodeifsection.vala",
+            "..//ccode/valaccodeifstatement.vala",
+            "..//ccode/valaccodeincludedirective.vala",
+            "..//ccode/valaccodeinitializerlist.vala",
+            "..//ccode/valaccodeinvalidexpression.vala",
+            "..//ccode/valaccodelabel.vala",
+            "..//ccode/valaccodelinedirective.vala",
+            "..//ccode/valaccodemacroreplacement.vala",
+            "..//ccode/valaccodememberaccess.vala",
+            "..//ccode/valaccodemodifiers.vala",
+            "..//ccode/valaccodenewline.vala",
+            "..//ccode/valaccodenode.vala",
+            "..//ccode/valaccodeoncesection.vala",
+            "..//ccode/valaccodeparameter.vala",
+            "..//ccode/valaccodeparenthesizedexpression.vala",
+            "..//ccode/valaccodereturnstatement.vala",
+            "..//ccode/valaccodestatement.vala",
+            "..//ccode/valaccodestruct.vala",
+            "..//ccode/valaccodeswitchstatement.vala",
+            "..//ccode/valaccodetypedefinition.vala",
+            "..//ccode/valaccodeunaryexpression.vala",
+            "..//ccode/valaccode.vala",
+            "..//ccode/valaccodevariabledeclarator.vala",
+            "..//ccode/valaccodewhilestatement.vala",
+            "..//ccode/valaccodewriter.vala",
+            "..//ccode"
         ],
         "packages" : []
     },
@@ -91,7 +177,8 @@
             "../..//tests",
             "../..//pixmaps",
             "../../..//gitlive",
-            "..//codegen"
+            "..//codegen",
+            "..//ccode"
         ],
         "packages" : [
             "gdk-3.0",
@@ -117,8 +204,9 @@
             "libvala-0.34",
             "roojspacker-1.0",
             "libvala-0.36",
-            "roojspacker-1.2",
-            "gee-0.8"
+            "gee-0.8",
+            "roojspacker-1.4",
+            "libvala-0.56"
         ]
     }
 ]
\ No newline at end of file

diff --git a/src/Palete/ValaSourceCompiler.vala b/src/Palete/ValaSourceCompiler.vala
index d9fab2d..38dc078 100644 (file)
--- a/src/Palete/ValaSourceCompiler.vala
+++ b/src/Palete/ValaSourceCompiler.vala
@@ -228,16 +228,16 @@ namespace Palete {
                        context.experimental = false;
                        context.experimental_non_null = false;
 #if VALA_0_56
-                       var ver=48;
+                       var ver=56;
 
 #elif VALA_0_36
                        var ver=36;
  
 #endif
-                       
-                       for (int i = 2; i <= ver; i += 2) {
-                               context.add_define ("VALA_0_%d".printf (i));
-                       }
+                       // this is automatic now.. no need to do it manually apparently..
+                       //for (int i = 2; i <= ver; i += 2) {
+                       //      context.add_define ("VALA_0_%d".printf (i));
+                       //}
                        
                        
                        
@@ -248,6 +248,8 @@ namespace Palete {
                         vapidirs +=  Path.get_dirname (context.get_vapi_path("glib-2.0")) ; // usr/share/vala-XXX/vapi
                                                        
                        for(var i =0 ; i < vapidirs.length; i++) {
+                               GLib.debug("Add Vapidir = %s" , vapidirs[i]);
+                       
                                valac += " --vapidir=" + vapidirs[i];
                        }
                                
@@ -345,12 +347,14 @@ namespace Palete {
                        
                var dcg = pr.compilegroups.get("_default_");
                for (var i = 0; i < dcg.packages.size; i++) {
-               
+                       
                        var pkg = dcg.packages.get(i);
                        // do not add libvala versions except the one that matches the one we are compiled against..
                        if (Regex.match_simple("^libvala", pkg) && pkg != ("libvala-0." + ver.to_string())) {
+                       GLib.debug("Skip libvala Package: %s" , dcg.packages.get(i));
                                continue;
                        }
+                       GLib.debug("Add Package: %s" , dcg.packages.get(i));
                                valac += " --pkg " + dcg.packages.get(i);
                                if (!this.has_vapi(context.vapi_directories, dcg.packages.get(i))) {
                                        GLib.debug("Skip vapi '%s' - does not exist", dcg.packages.get(i));