From: Alan Date: Wed, 24 Jan 2024 07:51:01 +0000 (+0800) Subject: check for meson info X-Git-Tag: release-5.0.2~30^2~1 X-Git-Url: http://git.roojs.org/?p=roobuilder;a=commitdiff_plain;h=45be8f358c440d4422ed87a39a16f57c7ecf6d61 check for meson info --- diff --git a/src/Palete/ValaCompileRequest.vala b/src/Palete/ValaCompileRequest.vala index 90035262e..62319fbe2 100644 --- a/src/Palete/ValaCompileRequest.vala +++ b/src/Palete/ValaCompileRequest.vala @@ -61,11 +61,11 @@ namespace Palete { } async int runMeson() { - if (GLib.FileUtils.test(this.project.path + "/build", GLib.FileTest.EXISTS)) { + if (GLib.FileUtils.test(this.project.path + "/build/meson-info", GLib.FileTest.EXISTS)) { return 0; //assume it's been set up. } - string[] args = { "/usr/bin/meson" ,"setup","build", "--prefix=/" }; - + string[] args = { "/usr/bin/meson" ,"setup", "build", "--prefix=/" }; + GLib.debug("running meson"); this.spawn = new Spawn(this.project.path , args); this.spawn.output_line.connect(( str) => { this.onOutput(str); diff --git a/src/Project/Project.vala b/src/Project/Project.vala index f7b24e632..42aaaf8b2 100644 --- a/src/Project/Project.vala +++ b/src/Project/Project.vala @@ -739,7 +739,7 @@ namespace Project { if (Regex.match_simple("\\.(o|cache|out|stamp|~)$", fn)) { // object.. continue; } - if (Regex.match_simple("^(config1.builder|a.out|stamp-h1|depcomp|config.log|config.status)$", fn)) { // object.. + if (Regex.match_simple("^(config1.builder|a.out|stamp-h1|depcomp|config.log|config.status|obj-x86_64-linux-gnu)$", fn)) { // object.. continue; }