// return this.checkString(JsRender.NodeToVala.mungeFile(this.file));
//}
- public void checkFileWithNodePropChange(
+ public bool checkFileWithNodePropChange(
JsRender.JsRender file,
JsRender.Node node,
this.file = file;
if (this.compiler != null) {
- return;
+ return false;
}
- Gee.HashMap<int,string> ret = new Gee.HashMap<int,string> ();
+
var hash = ptype == "listener" ? node.listeners : node.props;
// untill we get a smarter renderer..
// we have some scenarios where changing the value does not work
if (prop == "* xns" || prop == "xtype") {
- this.compiled(new Json.Object());
- return ;
+ return false;
}
//this.dumpCode(tmpstring);
//print("offset %d\n", offset);
- this.checkStringSpawn(tmpstring );
+ return this.checkStringSpawn(tmpstring );
// modify report
}
Spawn compiler;
- public void checkStringSpawn(
- string contents
- )
+ public bool checkStringSpawn(
+ string contents
+ )
{
if (this.compiler != null) {
- return;
+ return false;
}
FileIOStream iostream;
valafn = regex.replace(this.file.path,this.file.path.length , 0 , ".vala");
} catch (GLib.RegexError e) {
- var ret = new Json.Object();
- ret.set_boolean_member("success", false);
- ret.set_string_member("message", e.message);
- this.compiled(ret);
- return;
+
+ return false;
}
string[] args = {};
try {
this.compiler.run();
} catch (GLib.SpawnError e) {
- var ret = new Json.Object();
- ret.set_boolean_member("success", false);
- ret.set_string_member("message", e.message);
- this.compiled(ret);
- this.compiler = null;
+ GLib.debug(e.message);
+ this.compiler = null;
+ return false;
+
}
+ return true;
}
- public void checkFileSpawn(JsRender.JsRender file )
+ public bool checkFileSpawn(JsRender.JsRender file )
{
// race condition..
if (this.compiler != null) {
- return;
+ return false;
}
this.file = file;
- this.compiler = new Spawn("/tmp", args);
- this.compiler.complete.connect(spawnResult);
try {
- this.compiler.run();
- } catch (GLib.SpawnError e) {
- var ret = new Json.Object();
- ret.set_boolean_member("success", false);
- ret.set_string_member("message", e.message);
- this.compiled(ret);
+ this.compiler = new Spawn("/tmp", args);
+ this.compiler.complete.connect(spawnResult);
+
+ this.compiler.run();
+
+
+ } catch (GLib.Error e) {
+ GLib.debug(e.message);
this.compiler = null;
- }
+ return false;
+ }
+ return true;
}
-
-
- public void checkFileSpawn(JsRender.JsRender file )
+ /**
+ * Used to compile a non builder file..
+ */
+
+ public bool checkPlainFileSpawn( JsRender.JsRender file, string contents )
{
// race condition..
if (this.compiler != null) {
- return;
+ return false;
}
+ var pr = (Project.Gtk)(file.project);
- this.file = file;
- this.line_offset = 0;
-
- string[] args = {};
- args += BuilderApplication._self;
- args += "--project";
- args += this.file.project.fn;
- args += "--target";
- args += this.file.build_module;
-
-
+ var m = pr.firstBuildModule();
+ var cg = pr.compilegroups.get(m);
+ var foundit = false;
+ for (var i = 0; i < cg.sources.size; i++) {
+ var path = pr.resolve_path(
+ pr.resolve_path_combine_path(pr.firstPath(),cg.sources.get(i)));
+ if (path == file.path) {
+ foundit = true;
+ break;
+ }
- this.compiler = new Spawn("/tmp", args);
- this.compiler.complete.connect(spawnResult);
-
- try {
- this.compiler.run();
- } catch (GLib.SpawnError e) {
- var ret = new Json.Object();
- ret.set_boolean_member("success", false);
- ret.set_string_member("message", e.message);
- this.compiled(ret);
- this.compiler = null;
}
-
- }
- public void checkFilePlainSpawn(Project.Project proj, string filename )
- {
- // race condition..
- if (this.compiler != null) {
- return;
+ if (!foundit) {
+
+ this.compiler = null;
+
+ return false; // do not run the compile..
}
+ // is the file in the module?
+
- this.file = file;
+ FileIOStream iostream;
+ var tmpfile = File.new_tmp ("test-XXXXXX.vala", out iostream);
+ tmpfile.ref();
+
+ OutputStream ostream = iostream.output_stream;
+ DataOutputStream dostream = new DataOutputStream (ostream);
+ dostream.put_string (contents);
+
+
+ this.file = null;
this.line_offset = 0;
string[] args = {};
args += BuilderApplication._self;
args += "--project";
- args += this.file.project.fn;
+ args += file.project.fn;
args += "--target";
- args += this.file.build_module;
-
+ args += pr.firstBuildModule();
+ args += "--add-file";
+ args += tmpfile.get_path();
+ args += "--skip-file";
+ args += file.path;
- this.compiler = new Spawn("/tmp", args);
- this.compiler.complete.connect(spawnResult);
+
try {
- this.compiler.run();
- } catch (GLib.SpawnError e) {
- var ret = new Json.Object();
- ret.set_boolean_member("success", false);
- ret.set_string_member("message", e.message);
- this.compiled(ret);
+ this.compiler = new Spawn("/tmp", args);
+ this.compiler.complete.connect(spawnResult);
+ this.compiler.run();
+ } catch (GLib.Error e) {
+
this.compiler = null;
+ return false;
}
+ return true;
}
try {
- GLib.debug("GOT output %s", output);
+ //GLib.debug("GOT output %s", output);
var pa = new Json.Parser();
pa.load_from_data(output);
this.compiled(ret);
- } catch (Error e) {
+ } catch (GLib.Error e) {
var ret = new Json.Object();
ret.set_boolean_member("success", false);
ret.set_string_member("message", e.message);
projects / app.Builder.js / blobdiff