refactor: split rnote UI and engine into separate crates

Cargo.toml

@@ -1,51 +1,8 @@
-[package]
-name = "rnote"
-version = "0.3.5"
-edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [workspace]
 members = [
-    "notetakingfileformats",
-]
-
-[dependencies]
-notetakingfileformats = {path = "./notetakingfileformats", version="0.1"}
-
-num-derive = "0.3.3"
-num-traits = "0.2.14"
-flate2 = "1.0"
-rand = "0.8.4"
-rand_pcg = "0.3.1"
-rand_distr = "0.4.3"
-log = "0.4.14"
-pretty_env_logger = "0.4.0"
-anyhow = "1.0"
-serde = {version = "1.0", features = ["derive", "rc"]}
-serde_json = { version="1.0" }
-chrono = {version ="0.4.19", features = ["serde"] }
-regex = "1.5"
-futures = "0.3.21"
-rayon = "1.5"
-once_cell = "1.8"
-base64 = "0.13.0"
-tuple-conv = "1.0"
-image = "0.23.14"
-slotmap = { version = "1.0", features = ["serde"] }
-nalgebra = { version = "0.30.1", features = ["serde-serialize"] }
-parry2d-f64 = { version = "0.8.0", features = ["serde-serialize"] }
-geo = "0.18.0"
-gtk4 = {version = "0.4.6", features = ["v4_4"]}
-gstreamer = "0.18.3"
-adw = {version = "0.1.0", package="libadwaita"}
-cairo-rs = {version = "0.15.1", features = ["png", "svg", "pdf"]}
-librsvg = { git="https://gitlab.gnome.org/GNOME/librsvg" }
-svg = "0.10.0"
-resvg = "0.20"
-usvg = "0.20"
-tiny-skia = "0.6.3"
-xmlwriter = "0.1.0"
-roxmltree = "0.14.1"
-poppler-rs = "0.19.0"
-gettext-rs = { version = "0.7.0", features = ["gettext-system"] }
+    "rnote-engine",
+    "rnote-ui",
+    "rnote-fileformats",
+]

build-aux/com.github.flxzt.rnote.Devel.json

@@ -23,7 +23,7 @@
         "--filesystem=xdg-run/gvfs",
         "--filesystem=xdg-run/gvfsd",
         "--env=RUST_BACKTRACE=full",
-        "--env=RUST_LOG=rnote=trace",
+        "--env=RUST_LOG=rnote=debug",
         "--env=G_MESSAGES_DEBUG=all",
         "--env=GTK_PATH=/app/lib/gtk-4.0",
         "--env=GST_DEBUG=3"

meson.build

@@ -58,21 +58,43 @@ desktop_file_validate = find_program('desktop-file-validate', required: false)
 appstream_util = find_program('appstream-util', required: false)
 update_mime_database = find_program('update-mime-database', required: false)
 
-cargo_sources= files(
-  meson.project_source_root() + '/' + 'Cargo.toml',
-)
-
 meson.add_dist_script(
   'build-aux/dist-vendor.sh',
   meson.project_build_root() / 'meson-dist' / app_name + '-' + version,
   meson.project_source_root()
 )
 
 # local crates
-subdir('notetakingfileformats')
+cargo_sources= files(
+  meson.project_source_root() + '/' + 'Cargo.toml',
+  meson.project_source_root() + '/' + 'rnote-engine' + '/' + 'Cargo.toml',
+  meson.project_source_root() + '/' + 'rnote-ui' + '/' + 'Cargo.toml',
+  meson.project_source_root() + '/' + 'rnote-fileformats' + '/' + 'Cargo.toml',
+)
+
+subdir('rnote-engine')
+subdir('rnote-ui')
+subdir('rnote-fileformats')
 
-subdir('resources')
-subdir('src')
-subdir('po')
+sources = [rnote_fileformats_sources, rnote_ui_sources, cargo_sources]
+
+custom_target(
+  'cargo-build',
+  build_by_default: true,
+  input: sources,
+  output: app_name,
+  console: true,
+  install: true,
+  install_dir: bindir,
+  depends: resources,
+  command: [
+    cargo_script,
+    meson.project_build_root(),
+    meson.project_source_root(),
+    '@OUTPUT@',
+    profile,
+    app_name,
+  ]
+)
 
 meson.add_install_script('build-aux/meson_post_install.py')

rnote-engine/Cargo.toml

@@ -0,0 +1,42 @@
+[package]
+name = "rnote-engine"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rnote-fileformats = {path = "../rnote-fileformats", version="0.1"}
+
+log = "0.4.14"
+pretty_env_logger = "0.4.0"
+anyhow = "1.0"
+serde = {version = "1.0", features = ["derive"]}
+serde_json = { version="1.0" }
+rand = "0.8.4"
+rand_pcg = "0.3.1"
+rand_distr = "0.4.3"
+regex = "1.5"
+rayon = "1.5"
+futures = "0.3.21"
+chrono = {version ="0.4.19", features = ["serde"] }
+slotmap = { version = "1.0", features = ["serde"] }
+nalgebra = { version = "0.30.1", features = ["serde-serialize"] }
+parry2d-f64 = { version = "0.8.0", features = ["serde-serialize"] }
+gtk4 = {version = "0.4.6", features = ["v4_4"]}
+cairo-rs = {version = "0.15.1", features = ["png", "svg", "pdf"]}
+librsvg = { git="https://gitlab.gnome.org/GNOME/librsvg" }
+gstreamer = "0.18.3"
+base64 = "0.13.0"
+flate2 = "1.0"
+image = "0.23.14"
+svg = "0.10.0"
+geo = "0.18.0"
+xmlwriter = "0.1.0"
+resvg = "0.20"
+usvg = "0.20"
+tiny-skia = "0.6.3"
+poppler-rs = "0.19.0"
+
+[dev-dependencies]
+rayon = "1.5"

rnote-engine/data/meson.build

@@ -0,0 +1,11 @@
+
+# images
+#images_files = files(
+#  'images/brush-up-cursor.svg',
+#  'images/brush-down-cursor.svg',
+#)
+
+#install_data(
+#  images_files,
+#  install_dir: pkgdatadir / 'images'
+#)

rnote-engine/meson.build

@@ -0,0 +1,2 @@
+subdir('src')
+subdir('data')

src/compose/color.rs → rnote-engine/src/compose/color.rs

@@ -1,4 +1,4 @@
-use notetakingfileformats::xoppformat;
+use rnote_fileformats::xoppformat;
 
 use gtk4::gdk;
 use serde::{Deserialize, Serialize};