Fix #8010 - problem with directory scan

diff --git a/org.roojs.roobuilder.json b/org.roojs.roobuilder.json
index 0aa1338..8c51d14 100644 (file)
--- a/org.roojs.roobuilder.json
+++ b/org.roojs.roobuilder.json
@@ -1,48 +1,102 @@
 {
-    "id": "org.roojs.roobuilder",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "3.32",
+    "app-id": "org.roojs.roobuilder",
+    "runtime": "org.gnome.Sdk",
+    "runtime-version": "45",
     "sdk": "org.gnome.Sdk",
     "command": "roobuilder",
-    "clean": [ "/include", "*.la" ],
-    "build-options" : {
-        "cflags": "-O2 -g",
-        "cxxflags": "-O2 -g",
-        "env": {
-            "V": "1"
-        },
-        "arch": {
-            "x86_64": {
-                "cflags": "-O3 -g"
-            }
-        }
-    },
+    "finish-args": [
+        "--device=dri",
+        "--share=ipc",
+        "--share=network",
+        "--socket=fallback-x11",
+        "--socket=pulseaudio",
+        "--socket=wayland",
+       "--socket=session-bus",
+        "--filesystem=xdg-download:ro",
+        "--filesystem=xdg-music:ro",
+        "--filesystem=xdg-run/gvfsd",
+        "--filesystem=xdg-run/pipewire-0:ro"
+    ],
+    "cleanup": [
+        "/include",
+        "/lib/pkgconfig",
+        "/man",
+        "/share/doc",
+        "/share/gtk-doc",
+        "/share/man",
+        "/share/pkgconfig",
+        "/share/vala",
+        "*.la",
+        "*.a"
+    ],
     "modules": [
         {
-            "name" : "gtksourceview",
+            "name" : "jsonrpc-glib",
             "config-opts" : [
-                "--disable-Werror"
+                "--buildtype=debugoptimized",
+                "-Denable_tests=false"
             ],
+            "buildsystem" : "meson",
+            "builddir" : true,
             "sources" : [
                 {
                     "type" : "git",
-                    "branch" : "gnome-3-24",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtksourceview.git"
+                    "url" : "https://gitlab.gnome.org/GNOME/jsonrpc-glib.git",
+                    "branch" : "main"
                 }
             ]
         },
         {
-            "name" : "vala",
+            "name": "gnome-common",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/GNOME/gnome-common.git"
+                }
+            ]
+        },
+        {
+            "name": "intltool",
+            "cleanup": [ "*" ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz",
+                    "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
+                }
+            ]
+        },
+        
+           {
+            "name" : "gtksourceview",
+            "buildsystem" : "meson",
             "config-opts" : [
-                "--disable-Werror"
+                "--buildtype=debugoptimized",
+                "-Dsysprof=false"
             ],
             "sources" : [
                 {
                     "type" : "git",
-                    "branch" : "0.36",
-                    "url" : "https://gitlab.gnome.org/GNOME/vala.git"
+                    "url" : "https://gitlab.gnome.org/GNOME/gtksourceview.git",
+                    "branch" : "master"
                 }
             ]
+        },
+        {
+            "name": "roobuilder",
+            "builddir": true,
+            "buildsystem": "meson",
+            "sources": [
+                {
+                    "type": "git",
+                    "tag": "master",
+                    "url": "https://github.com/roojs/roobuilder.git"
+               },
+               {
+               "type": "patch",
+               "path": "gda_vapi.patch"
+               }
+            ]
         }
     ]
-}
+}
\ No newline at end of file

diff --git a/src/Project/Project.vala b/src/Project/Project.vala
index 0b7d5d1..c16f226 100644 (file)
--- a/src/Project/Project.vala
+++ b/src/Project/Project.vala
@@ -692,10 +692,12 @@ namespace Project {
                        if (subdir == "build") { // cmake!
                                return;
                        }
-                       
                        if (subdir == "autom4te.cache") { // automake?
                                return;
                        }
+                       if (subdir == "obj-x86_64-linux-gnu") { // meson?
+                               return;
+                       }
                        //if (subdir == "debian") { // debian!?
                        //      return;
                        //}
@@ -733,13 +735,18 @@ namespace Project {
                                        }
                                        
                                        if (FileUtils.test(dir  + "/" + fn, GLib.FileTest.IS_DIR)) {
+                                               if (subdir == "debian") { // dont bother with subdirs  of debian.
+                                       continue;
+                               }
+
+                                               
                                                subs.add(dir  + "/" + fn);
                                                continue;
                                        }
                                        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|obj-x86_64-linux-gnu)$", fn)) { // object..
+                                       if (Regex.match_simple("^(config1.builder|a.out|stamp-h1|depcomp|config.log|config.status)$", fn)) { // object..
                                                continue;
                                        }