sync

[app.Builder.js] / src / Project / Gtk.vala

diff --git a/src/Project/Gtk.vala b/src/Project/Gtk.vala
index 376306c..bca1667 100644 (file)
--- a/src/Project/Gtk.vala
+++ b/src/Project/Gtk.vala
@@ -33,7 +33,11 @@ namespace Project {
                        this.xtype = "Gtk";
                        var gid = "project-gtk-%d".printf(gtk_id++);
                        this.id = gid;
-                       this.loadConfig();
+                       try {
+                               this.loadConfig();
+                       } catch (GLib.Error e )  {
+                               // is tihs ok?
+                       }
                
                }
                public Gee.HashMap<string,GtkValaSettings> compilegroups;
@@ -139,7 +143,7 @@ namespace Project {
                                if (    bb.length < target.length &&
                                        target.substring(0, bb.length) == bb) {
                                        
-                                       return prefix + target.substring(bb.length +1);
+                                       return prefix + target.substring(bb.length );
                                }
                                if (bb.length < 1) {
                                        throw new Error.INVALID_FORMAT ("Could not work out relative path %s to %s",
@@ -163,7 +167,7 @@ namespace Project {
                 *  
                 */
                
-               public Gee.ArrayList<string> filesAll(string in_path)
+               public Gee.ArrayList<string> filesAll(string in_path,bool abspath = true)
                {
                        var ret =  new Gee.ArrayList<string>();
                        
@@ -179,7 +183,7 @@ namespace Project {
                                GLib.debug("SCAN %s - skip - does not exist\n", dirname);
                                return ret;
                        }
-         
+                       var pathprefix = abspath ? dirname : in_path;
           
                        try {
                                var file_enum = dir.enumerate_children(
@@ -202,7 +206,7 @@ namespace Project {
                                                continue;
                                        }
                                        GLib.debug("SCAN ADD %s : %s", fn, next_file.get_content_type());
-                                       ret.add(in_path + "/" + fn);
+                                       ret.add(pathprefix + "/" + fn);
                                         
                                        // any other valid types???
                                
@@ -215,9 +219,9 @@ namespace Project {
                        return ret;
                }
                
-               public Gee.ArrayList<string> filesForCompile(string in_path)
+               public Gee.ArrayList<string> filesForCompile(string in_path, bool abspath = true)
                {
-                       var allfiles = this.filesAll(in_path);
+                       var allfiles = this.filesAll(in_path,abspath);
                        var ret =  new Gee.ArrayList<string>();
                        
                        
@@ -270,6 +274,7 @@ namespace Project {
                        
                        for (var i = 0; i < allfiles.size; i ++) {
                                var fn = allfiles.get(i);
+                               var bn  = GLib.Path.get_basename(fn);
                                try {
                                        
                                        if (Regex.match_simple("\\.vala\\.c$", fn)) {
@@ -291,12 +296,25 @@ namespace Project {
                                                GLib.debug("SKIP %s - .o",fn);
                                                continue;
                                        }
-                                       if (Regex.match_simple("stamp-h1$",  GLib.Path.get_basename(fn))) {
+                                       if ("stamp-h1" == bn) {
                                                GLib.debug("SKIP %s - .o",fn);
                                                continue;
                                        }
                                        
-                                       if (Regex.match_simple("^\\.", GLib.Path.get_basename(fn))) {
+                                       // confgure.am
+                                       if ("config.h" == bn || "config.h.in" == bn || "config.log" == bn  || "configure" == bn ) {
+                                               if (allfiles.index_of( in_path +"/configure.ac") > -1) {
+                                                       continue;
+                                               }
+                                       }
+                                       // makefile
+                                       if ("Makefile" == bn || "Makefile.in" == bn ) {
+                                               if (allfiles.index_of( in_path +"/Makefile.am") > -1) {
+                                                       continue;
+                                               }
+                                       }
+                                       
+                                       if (Regex.match_simple("^\\.", bn)) {
                                                GLib.debug("SKIP %s - hidden",fn);
                                                continue;
                                        }
@@ -432,7 +450,27 @@ namespace Project {
                        return ret;
                        
                }
+               public string[] sourcedirs()
+               {
+                       string[] ret = {};
+                       var sources = this.compilegroups.get("_default_").sources;
+                       ret += this.firstPath();  
+                       for(var i =0; i< sources.size; i++) {
+                               
+                               var path = this.resolve_path( this.firstPath(), sources.get(i));
+                               if (path == this.firstPath()) {
+                                       continue;
+                               }
+                               if (Path.get_basename (path) == "vapi") {
+                                       continue;
+               
+                               }
+               //                      GLib.debug("Adding VAPIDIR: %s\n", path);
+                               ret += path;            
+                       }
+                       return ret;
                        
+               }       
 
        }
        // an object describing a build config (or generic ...)
@@ -445,7 +483,9 @@ namespace Project {
                public Gee.ArrayList<string> sources; // list of files+dirs (relative to project)
                public string target_bin;
 
-
+               public string execute_args;
+               
+               
                public GtkValaSettings(string name) 
                {
                        this.name = name;
@@ -453,6 +493,7 @@ namespace Project {
                        this.target_bin = "";
                        this.packages = new Gee.ArrayList<string>();
                        this.sources = new Gee.ArrayList<string>();
+                       this.execute_args = "";
                                
                }
                
@@ -462,14 +503,19 @@ namespace Project {
                        
                        this.name = el.get_string_member("name");
                        this.compile_flags = el.get_string_member("compile_flags");
+                       if ( el.has_member("execute_args")) {
+                               this.execute_args = el.get_string_member("execute_args");
+                       } else {
+                               this.execute_args = "";
+                       }
                        this.target_bin = el.get_string_member("target_bin");
                        // sources and packages.
                        this.sources = this.readArray(el.get_array_member("sources"));
                        this.packages = this.readArray(el.get_array_member("packages"));
-                       
+
                }
                
-               
+               // why not array of strings?
                
                public Gee.ArrayList<string> readArray(Json.Array ar) 
                {
@@ -485,6 +531,7 @@ namespace Project {
                        var ret = new Json.Object();
                        ret.set_string_member("name", this.name);
                        ret.set_string_member("compile_flags", this.compile_flags);
+                       ret.set_string_member("execute_args", this.execute_args);
                        ret.set_string_member("target_bin", this.target_bin);
                        ret.set_array_member("sources", this.writeArray(this.sources));
                        ret.set_array_member("packages", this.writeArray(this.packages));