check for meson info
authorAlan <alan@roojs.com>
Wed, 24 Jan 2024 07:51:01 +0000 (15:51 +0800)
committerAlan <alan@roojs.com>
Wed, 24 Jan 2024 07:51:01 +0000 (15:51 +0800)
src/Palete/ValaCompileRequest.vala
src/Project/Project.vala

index 9003526..62319fb 100644 (file)
@@ -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);
index f7b24e6..42aaaf8 100644 (file)
@@ -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;
                                        }