projects
/
roobuilder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
:Revert "fix line numbering issues with vala generator - hopefully fixes completion...
[roobuilder]
/
src
/
Project
/
GtkValaSettings.vala
diff --git
a/src/Project/GtkValaSettings.vala
b/src/Project/GtkValaSettings.vala
index
c0020e6
..
ed51c68
100644
(file)
--- a/
src/Project/GtkValaSettings.vala
+++ b/
src/Project/GtkValaSettings.vala
@@
-36,8
+36,8
@@
namespace Project
this.execute_args = "";
}
// sources and packages.
this.execute_args = "";
}
// sources and packages.
- this.sources = this.
project.readArray(el.get_array_member("sources"))
;
-
+ this.sources = this.
filterFiles(this.project.readArray(el.get_array_member("sources")))
;
+
}
}
@@
-51,7
+51,7
@@
namespace Project
ret.set_string_member("name", this.name);
ret.set_string_member("execute_args", this.execute_args);
ret.set_string_member("name", this.name);
ret.set_string_member("execute_args", this.execute_args);
- ret.set_array_member("sources", this.writeArray(
this.sources
));
+ ret.set_array_member("sources", this.writeArray(
this.filterFiles(this.sources)
));
return ret;
return ret;
@@
-66,21
+66,33
@@
namespace Project
public bool has_file(JsRender.JsRender file)
{
public bool has_file(JsRender.JsRender file)
{
- GLib.debug("Checking %s has file %s", this.name, file.path);
+
//
GLib.debug("Checking %s has file %s", this.name, file.path);
var pr = (Gtk) file.project;
for(var i = 0; i < this.sources.size;i++) {
var path = pr.path + "/" + this.sources.get(i);
var pr = (Gtk) file.project;
for(var i = 0; i < this.sources.size;i++) {
var path = pr.path + "/" + this.sources.get(i);
-
GLib.debug("check %s", path
);
+
//GLib.debug("check %s =%s or %s", path , file.path, file.targetName()
);
- if (path == file.path) {
- GLib.debug("GOT IT");
+ if (path == file.path
|| path == file.targetName()
) {
+
//
GLib.debug("GOT IT");
return true;
}
}
return true;
}
}
- GLib.debug("CANT FIND IT");
+
//
GLib.debug("CANT FIND IT");
return false;
}
return false;
}
+ public Gee.ArrayList<string> filterFiles( Gee.ArrayList<string> ar)
+ {
+ var ret = new Gee.ArrayList<string>();
+ foreach(var f in ar) {
+ if (null == this.project.getByRelPath(f)) {
+ continue;
+ }
+ ret.add(f);
+ }
+ return ret;
+ }
+
}
}
\ No newline at end of file
}
}
\ No newline at end of file