Refactor repo into a non-virtual cargo workspace with a root package.

The old way of using a virtual workspace is incorrect for an application like this.
It also prevents existing bundle tools (cargo-bundle) from working with Moxin because they all expect a root package to be defined.

Technically we don't even need a workspace at all for this repo, but I left it in just for the sake of posterity.

Cargo.lock

@@ -1185,6 +1185,24 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "moxin"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "lipsum",
+ "makepad-widgets",
+ "moxin-backend",
+ "moxin-fake-backend",
+ "moxin-protocol",
+ "rand",
+ "robius-open",
+ "serde",
+ "serde_json",
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "moxin-backend"
 version = "0.1.0"
@@ -1212,24 +1230,6 @@ dependencies = [
  "moxin-protocol",
 ]
 
-[[package]]
-name = "moxin-frontend"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "chrono",
- "lipsum",
- "makepad-widgets",
- "moxin-backend",
- "moxin-fake-backend",
- "moxin-protocol",
- "rand",
- "robius-open",
- "serde",
- "serde_json",
- "unicode-segmentation",
-]
-
 [[package]]
 name = "moxin-protocol"
 version = "0.1.0"

Cargo.toml

@@ -1,10 +1,30 @@
 [workspace]
-
-members = [
-    "moxin-backend",
-    "moxin-frontend",
-    "moxin-protocol"
-]
-
 resolver = "2"
 
+members = [
+    "moxin-protocol",
+    "moxin-backend",
+    "moxin-fake-backend",
+]
+
+[package]
+name = "moxin"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+moxin-protocol = { path = "moxin-protocol" }
+moxin-backend = { path = "moxin-backend" }
+moxin-fake-backend = { path = "moxin-fake-backend" }
+
+makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "rik" }
+
+robius-open = { git = "https://github.com/project-robius/robius-open", rev = "b901523667d4a8bbb0bba3cd1ebcc0b94d33534e" }
+
+chrono = "0.4"
+unicode-segmentation = "1.10.1"
+anyhow = "1.0"
+serde_json = "1.0"
+serde = { version = "1.0.197", features = ["derive"] }
+lipsum = "0.9"
+rand = "0.8.5"

README.md

@@ -22,12 +22,17 @@ curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/insta
 source $HOME/.wasmedge/env
 ```
 
+Obtain the source code from this repository:
+```sh
+git clone https://github.com/moxin-org/moxin.git
+```
+
 ### macOS
 
 Then, on a standard desktop platform (macOS), simply run:
 
 ```sh
-cd ~/moxin
+cd moxin
 cargo run
 ```
 
@@ -50,6 +55,6 @@ sudo apt-get install libxcursor-dev libx11-dev libasound2-dev libpulse-dev
 Then, run:
 
 ```sh
-cd ~/moxin
+cd moxin
 cargo run
 ```

moxin-fake-backend/Cargo.toml

@@ -6,5 +6,5 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-moxin-protocol = { path = "../../moxin-protocol" }
+moxin-protocol = { path = "../moxin-protocol" }
 chrono = "0.4"

moxin-frontend/Cargo.toml

@@ -1,24 +0,0 @@
-[package]
-name = "moxin-frontend"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-moxin-protocol = { path = "../moxin-protocol" }
-
-moxin-backend = { path = "../moxin-backend" }
-moxin-fake-backend = { path = "./moxin-fake-backend", package="moxin-fake-backend" }
-
-makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "rik" }
-
-robius-open = { git = "https://github.com/project-robius/robius-open", rev = "b901523667d4a8bbb0bba3cd1ebcc0b94d33534e" }
-
-chrono = "0.4"
-unicode-segmentation = "1.10.1"
-anyhow = "1.0"
-serde_json = "1.0"
-serde = { version = "1.0.197", features = ["derive"] }
-lipsum = "0.9"
-rand = "0.8.5"

moxin-frontend/src/main.rs

@@ -1,3 +0,0 @@
-fn main() {
-    moxin_frontend::app::app_main()
-}

src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    moxin::app::app_main()
+}