Update meson build files

p2panda · Dec 13, 2024 · 2f1ca40 · 2f1ca40
1 parent a0d2694
commit 2f1ca40
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 target
-.flatpak-builder
+.flatpak-builder
+.vscode
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,3 @@
 [workspace]
 
-members = [
-    "aardvark-app", "aardvark-node",
-]
+members = ["aardvark-app", "aardvark-node"]
diff --git a/aardvark-app/Cargo.toml b/aardvark-app/Cargo.toml
@@ -4,13 +4,14 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+aardvark-node = { path = "../aardvark-node" }
 anyhow = "1.0.94"
 automerge = "0.5.12"
 gettext-rs = { version = "0.7", features = ["gettext-system"] }
 gtk = { version = "0.9", package = "gtk4", features = ["gnome_47"] }
 serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0.128"
-aardvark-node = { path = "../aardvark-node" }
+tokio = { version = "1.42.0", features = ["full"] }
 
 [dependencies.adw]
 package = "libadwaita"

diff --git a/aardvark-app/src/meson.build b/aardvark-app/src/meson.build
@@ -23,8 +23,8 @@ configure_file(
 # Copy the config.rs output to the source directory.
 run_command(
   'cp',
-  meson.project_build_root() / 'src' / 'config.rs',
-  meson.project_source_root() / 'src' / 'config.rs',
+  meson.project_build_root() / 'aardvark-app/src' / 'config.rs',
+  meson.project_source_root() / 'aardvark-app/src' / 'config.rs',
   check: true
 )
 

diff --git a/aardvark-app/meson.build → meson.build b/aardvark-app/meson.build → meson.build
@@ -7,12 +7,9 @@ project('aardvark', 'rust',
 i18n = import('i18n')
 gnome = import('gnome')
 
-
-
-
-subdir('data')
-subdir('src')
-subdir('po')
+subdir('aardvark-app/data')
+subdir('aardvark-app/src')
+subdir('aardvark-app/po')
 
 gnome.post_install(
      glib_compile_schemas: true,

diff --git a/aardvark-app/org.p2panda.aardvark.json → org.p2panda.aardvark.json b/aardvark-app/org.p2panda.aardvark.json → org.p2panda.aardvark.json