Re-structure project as cargo workspace

p2panda · Dec 12, 2024 · a0d2694 · a0d2694
1 parent 059e876
commit a0d2694
Show file tree

Hide file tree

Showing 32 changed files with 91 additions and 77 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,27 +1,5 @@
-[package]
-name = "aardvark"
-version = "0.1.0"
-edition = "2021"
+[workspace]
 
-[dependencies]
-anyhow = "1.0.94"
-async-trait = "0.1.83"
-automerge = "0.5.12"
-ciborium = "0.2.2"
-gettext-rs = { version = "0.7", features = ["gettext-system"] }
-gtk = { version = "0.9", package = "gtk4", features = ["gnome_47"] }
-p2panda-core = "0.1.0"
-p2panda-discovery = { version = "0.1.0", features = ["mdns"] }
-p2panda-net = "0.1.0"
-p2panda-store = "0.1.0"
-p2panda-stream = "0.1.0"
-p2panda-sync = { version = "0.1.0", features = ["log-sync"] }
-serde = { version = "1.0.215", features = ["derive"] }
-serde_json = "1.0.128"
-tokio = { version = "1.42.0", features = ["full"] }
-tokio-stream = "0.1.17"
-
-[dependencies.adw]
-package = "libadwaita"
-version = "0.7"
-features = ["v1_6"]
+members = [
+    "aardvark-app", "aardvark-node",
+]
diff --git a/aardvark-app/Cargo.toml b/aardvark-app/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "aardvark"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+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" }
+
+[dependencies.adw]
+package = "libadwaita"
+version = "0.7"
+features = ["v1_6"]
diff --git a/...or/scalable/apps/org.p2panda.aardvark.svg → ...or/scalable/apps/org.p2panda.aardvark.svg b/...or/scalable/apps/org.p2panda.aardvark.svg → ...or/scalable/apps/org.p2panda.aardvark.svg
diff --git a/...ic/apps/org.p2panda.aardvark-symbolic.svg → ...ic/apps/org.p2panda.aardvark-symbolic.svg b/...ic/apps/org.p2panda.aardvark-symbolic.svg → ...ic/apps/org.p2panda.aardvark-symbolic.svg
diff --git a/data/icons/meson.build → aardvark-app/data/icons/meson.build b/data/icons/meson.build → aardvark-app/data/icons/meson.build
diff --git a/data/meson.build → aardvark-app/data/meson.build b/data/meson.build → aardvark-app/data/meson.build
diff --git a/data/org.p2panda.aardvark.desktop.in → ...-app/data/org.p2panda.aardvark.desktop.in b/data/org.p2panda.aardvark.desktop.in → ...-app/data/org.p2panda.aardvark.desktop.in
diff --git a/data/org.p2panda.aardvark.gschema.xml → ...app/data/org.p2panda.aardvark.gschema.xml b/data/org.p2panda.aardvark.gschema.xml → ...app/data/org.p2panda.aardvark.gschema.xml
diff --git a/data/org.p2panda.aardvark.metainfo.xml.in → ...data/org.p2panda.aardvark.metainfo.xml.in b/data/org.p2panda.aardvark.metainfo.xml.in → ...data/org.p2panda.aardvark.metainfo.xml.in
diff --git a/data/org.p2panda.aardvark.service.in → ...-app/data/org.p2panda.aardvark.service.in b/data/org.p2panda.aardvark.service.in → ...-app/data/org.p2panda.aardvark.service.in
diff --git a/meson.build → aardvark-app/meson.build b/meson.build → aardvark-app/meson.build
diff --git a/org.p2panda.aardvark.json → aardvark-app/org.p2panda.aardvark.json b/org.p2panda.aardvark.json → aardvark-app/org.p2panda.aardvark.json
diff --git a/po/LINGUAS → aardvark-app/po/LINGUAS b/po/LINGUAS → aardvark-app/po/LINGUAS
diff --git a/po/POTFILES.in → aardvark-app/po/POTFILES.in b/po/POTFILES.in → aardvark-app/po/POTFILES.in
diff --git a/po/meson.build → aardvark-app/po/meson.build b/po/meson.build → aardvark-app/po/meson.build
diff --git a/src/aardvark.gresource.xml → aardvark-app/src/aardvark.gresource.xml b/src/aardvark.gresource.xml → aardvark-app/src/aardvark.gresource.xml
diff --git a/src/application.rs → aardvark-app/src/application.rs b/src/application.rs → aardvark-app/src/application.rs
@@ -20,6 +20,7 @@
 
 use std::cell::{OnceCell, RefCell};
 
+use aardvark_node::network;
 use adw::prelude::*;
 use adw::subclass::prelude::*;
 use gettextrs::gettext;
@@ -29,7 +30,6 @@ use tokio::sync::{mpsc, oneshot};
 use crate::config::VERSION;
 use crate::document::Document;
 use crate::glib::closure_local;
-use crate::network;
 use crate::{AardvarkTextBuffer, AardvarkWindow};
 
 mod imp {

diff --git a/src/config.rs → aardvark-app/src/config.rs b/src/config.rs → aardvark-app/src/config.rs
@@ -1,3 +1,4 @@
 pub static VERSION: &str = "0.1.0";
 pub static GETTEXT_PACKAGE: &str = "aardvark";
 pub static LOCALEDIR: &str = "/app/share/locale";
+pub static PKGDATADIR: &str = "/app/share/aardvark";
diff --git a/src/config.rs.in → aardvark-app/src/config.rs.in b/src/config.rs.in → aardvark-app/src/config.rs.in
diff --git a/src/document.rs → aardvark-app/src/document.rs b/src/document.rs → aardvark-app/src/document.rs
diff --git a/src/gtk/help-overlay.ui → aardvark-app/src/gtk/help-overlay.ui b/src/gtk/help-overlay.ui → aardvark-app/src/gtk/help-overlay.ui
diff --git a/src/main.rs → aardvark-app/src/main.rs b/src/main.rs → aardvark-app/src/main.rs
@@ -21,8 +21,6 @@
 mod application;
 mod config;
 mod document;
-mod network;
-mod operation;
 mod textbuffer;
 mod window;
 

diff --git a/src/meson.build → aardvark-app/src/meson.build b/src/meson.build → aardvark-app/src/meson.build
diff --git a/src/style.css → aardvark-app/src/style.css b/src/style.css → aardvark-app/src/style.css
diff --git a/src/textbuffer.rs → aardvark-app/src/textbuffer.rs b/src/textbuffer.rs → aardvark-app/src/textbuffer.rs
diff --git a/src/window.rs → aardvark-app/src/window.rs b/src/window.rs → aardvark-app/src/window.rs
diff --git a/src/window.ui → aardvark-app/src/window.ui b/src/window.ui → aardvark-app/src/window.ui
diff --git a/aardvark-node/Cargo.toml b/aardvark-node/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "aardvark-node"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.94"
+async-trait = "0.1.83"
+ciborium = "0.2.2"
+p2panda-core = "0.1.0"
+p2panda-discovery = { version = "0.1.0", features = ["mdns"] }
+p2panda-net = "0.1.0"
+p2panda-store = "0.1.0"
+p2panda-stream = "0.1.0"
+p2panda-sync = { version = "0.1.0", features = ["log-sync"] }
+serde = { version = "1.0.215", features = ["derive"] }
+tokio = { version = "1.42.0", features = ["full"] }
+tokio-stream = "0.1.17"
diff --git a/aardvark-node/src/lib.rs b/aardvark-node/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod network;
+pub mod operation;
diff --git a/src/network.rs → aardvark-node/src/network.rs b/src/network.rs → aardvark-node/src/network.rs
diff --git a/src/operation.rs → aardvark-node/src/operation.rs b/src/operation.rs → aardvark-node/src/operation.rs