Merge pull request #5 from p2panda/workspace

Restructure project into workspace for better codebase separation

.github/workflows/build.yml

@@ -169,7 +169,7 @@ jobs:
       - name: Compile GResource
         run: |
           mkdir -p target/${{ matrix.target }}/release/
-          glib-compile-resources --sourcedir src --target target/${{ matrix.target }}/release/aardvark.gresource src/aardvark.gresource.xml
+          glib-compile-resources --sourcedir aardvark-app/src --target target/${{ matrix.target }}/release/aardvark.gresource aardvark-app/src/aardvark.gresource.xml
 
       - name: Create App Bundle
         run: |

Cargo.toml

@@ -1,27 +1,3 @@
-[package]
-name = "aardvark"
-version = "0.1.0"
-edition = "2021"
-
-[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"]
+[workspace]
+resolver = "2"
+members = ["aardvark-app", "aardvark-node"]

aardvark-app/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "aardvark"
+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"
+tokio = { version = "1.42.0", features = ["full"] }
+
+[dependencies.adw]
+package = "libadwaita"
+version = "0.7"
+features = ["v1_6"]

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 {

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";

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;
 

src/meson.build → aardvark-app/src/meson.build

@@ -23,14 +23,14 @@ 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
 )
 
 cargo_bin  = find_program('cargo')
 cargo_opt  = [ '--manifest-path', meson.project_source_root() / 'Cargo.toml' ]
-cargo_opt += [ '--target-dir', meson.project_build_root()  / 'src' ]
+cargo_opt += [ '--target-dir', meson.project_build_root()  / 'aardvark-app/src' ]
 cargo_env  = [ 'CARGO_HOME=' + meson.project_build_root()  / 'cargo-home' ]
 
 if get_option('buildtype') == 'release'
@@ -51,6 +51,6 @@ cargo_build = custom_target(
   command: [
     'env', cargo_env,
     cargo_bin, 'build',
-    cargo_opt, '&&', 'cp', 'src' / rust_target / meson.project_name(), '@OUTPUT@',
+    cargo_opt, '&&', 'cp', 'aardvark-app/src' / rust_target / meson.project_name(), '@OUTPUT@',
   ]
 )