gather crates into workspace

antoyo · May 8, 2021 · 15f712c · 15f712c
1 parent 9453af7
commit 15f712c
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 199 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -47,33 +47,20 @@ jobs:
             Xvfb :99 &
             sleep 3
             openbox &
-            cargo test --manifest-path relm-examples/Cargo.toml -- --nocapture
+            cargo test -- --nocapture
 
       - name: "relm-derive: tests"
         run: |
             cargo test --manifest-path relm-derive/Cargo.toml -- --nocapture
 
-      - name: "relm: test examples"
+      - name: "relm-examples: tests"
         run: |
             Xvfb :99 &
             sleep 3
             openbox &
             cargo test --manifest-path relm-examples/Cargo.toml --examples
 
-      - name: "relm: test buttons-attribute example"
-        run: |
-            Xvfb :99 &
-            sleep 3
-            openbox &
-            cargo test --manifest-path relm-examples/examples/buttons-attribute/Cargo.toml
-
-      - name: "relm: build http example"
-        run: cargo build --manifest-path relm-examples/examples/http/Cargo.toml
-
-      - name: "relm: build async example"
-        run: cargo build --manifest-path relm-examples/examples/async/Cargo.toml
-
-      - name: "relm: build webkit-test example"
+      - name: "relm-examples: build webkit-test example"
         run: cargo build --manifest-path relm-examples/examples/webkit-test/Cargo.toml
 
       - uses: bcomnes/[email protected]
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
-target
+/target
 Cargo.lock
 release.sh
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,5 +21,11 @@ gtk = "^0.9.0"
 libc = "^0.2.54"
 log = "^0.4.6"
 
+[dev-dependencies]
+relm-derive = { path = "relm-derive" }
+
 [features]
 hidpi = ["cairo-rs/v1_14"]
+
+[workspace]
+members = ["relm-derive", "relm-examples", "relm-examples/examples/webkit-test", "relm-test"]
diff --git a/relm-examples/Cargo.toml b/relm-examples/Cargo.toml
@@ -10,13 +10,18 @@ edition = "2018"
 [dev-dependencies]
 chrono = "0.4"
 gdk = "^0.13.0"
+gdk-pixbuf = "^0.9.0"
 glib = "^0.10.0"
 gtk = "^0.9.0"
 gtk-test = "^0.6"
+json = "^0.11.5"
 rand = "^0.5.1"
+simplelog = "^0.5.3"
+uhttp_uri = "^0.5.1"
 
 [dev-dependencies.gio]
 version = "^0.9.0"
+features = ["v2_50"]
 
 [dev-dependencies.relm]
 path = ".."

diff --git a/relm-examples/examples/async/src/main.rs → relm-examples/examples/async.rs b/relm-examples/examples/async/src/main.rs → relm-examples/examples/async.rs
diff --git a/relm-examples/examples/async/Cargo.toml b/relm-examples/examples/async/Cargo.toml
diff --git a/relm-examples/examples/buttons-attribute/Cargo.toml b/relm-examples/examples/buttons-attribute/Cargo.toml
diff --git a/relm-examples/examples/buttons-attribute/src/main.rs b/relm-examples/examples/buttons-attribute/src/main.rs
diff --git a/relm-examples/examples/http/src/main.rs → relm-examples/examples/http.rs b/relm-examples/examples/http/src/main.rs → relm-examples/examples/http.rs
diff --git a/relm-examples/examples/http/Cargo.toml b/relm-examples/examples/http/Cargo.toml
diff --git a/relm-examples/tests/include.rs b/relm-examples/tests/include.rs
@@ -64,7 +64,7 @@ impl Widget for Win {
     }
 
     // Specify a view written in another file.
-    view!("tests/buttons.relm");
+    view!("relm-examples/tests/buttons.relm");
 }
 
 fn main() {

diff --git a/src/lib.rs b/src/lib.rs
@@ -238,6 +238,10 @@ type InitTestComponents<WIDGET> = (Component<WIDGET>, <WIDGET as WidgetTest>::St
 /// # }
 /// #
 /// # impl WidgetTest for Win {
+/// #     type Streams = ();
+/// #
+/// #     fn get_streams(&self) -> Self::Streams {}
+/// #
 /// #     type Widgets = Win;
 /// #
 /// #     fn get_widgets(&self) -> Self::Widgets {