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;
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",
*
*/
- 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>();
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(
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???
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>();
GLib.debug("SKIP %s - .o",fn);
continue;
}
- if ("stamp-h1" == bn)) {
+ if ("stamp-h1" == bn) {
GLib.debug("SKIP %s - .o",fn);
continue;
}
}
}
- if (Regex.match_simple("^\\.", GLib.Path.get_basename(fn))) {
+ if (Regex.match_simple("^\\.", bn)) {
GLib.debug("SKIP %s - hidden",fn);
continue;
}
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 ...)
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;
this.target_bin = "";
this.packages = new Gee.ArrayList<string>();
this.sources = new Gee.ArrayList<string>();
+ this.execute_args = "";
}
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)
{
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));