From 8b8f7563ad33dafeadf6238e377748cdec17d67a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Tue, 10 Sep 2019 19:41:49 +0200 Subject: [PATCH] Switch to workspace layout --- Cargo.toml | 35 +++----------------- core/Cargo.toml | 25 ++++++++++++++ {src => core/src}/element.rs | 0 {src => core/src}/event.rs | 0 {src => core/src}/hasher.rs | 0 {src => core/src}/input.rs | 0 {src => core/src}/input/button_state.rs | 0 {src => core/src}/input/keyboard.rs | 0 {src => core/src}/input/keyboard/event.rs | 0 {src => core/src}/input/keyboard/key_code.rs | 0 {src => core/src}/input/mouse.rs | 0 {src => core/src}/input/mouse/button.rs | 0 {src => core/src}/input/mouse/event.rs | 0 {src => core/src}/layout.rs | 0 {src => core/src}/lib.rs | 0 {src => core/src}/mouse_cursor.rs | 0 {src => core/src}/node.rs | 0 {src => core/src}/point.rs | 0 {src => core/src}/rectangle.rs | 0 {src => core/src}/renderer.rs | 0 {src => core/src}/style.rs | 0 {src => core/src}/user_interface.rs | 0 {src => core/src}/vector.rs | 0 {src => core/src}/widget.rs | 0 {src => core/src}/widget/button.rs | 0 {src => core/src}/widget/checkbox.rs | 0 {src => core/src}/widget/column.rs | 0 {src => core/src}/widget/image.rs | 0 {src => core/src}/widget/panel.rs | 0 {src => core/src}/widget/progress_bar.rs | 0 {src => core/src}/widget/radio.rs | 0 {src => core/src}/widget/row.rs | 0 {src => core/src}/widget/slider.rs | 0 {src => core/src}/widget/text.rs | 0 examples/Cargo.toml | 17 ++++++++++ examples/tour/main.rs | 2 +- 36 files changed, 48 insertions(+), 31 deletions(-) create mode 100644 core/Cargo.toml rename {src => core/src}/element.rs (100%) rename {src => core/src}/event.rs (100%) rename {src => core/src}/hasher.rs (100%) rename {src => core/src}/input.rs (100%) rename {src => core/src}/input/button_state.rs (100%) rename {src => core/src}/input/keyboard.rs (100%) rename {src => core/src}/input/keyboard/event.rs (100%) rename {src => core/src}/input/keyboard/key_code.rs (100%) rename {src => core/src}/input/mouse.rs (100%) rename {src => core/src}/input/mouse/button.rs (100%) rename {src => core/src}/input/mouse/event.rs (100%) rename {src => core/src}/layout.rs (100%) rename {src => core/src}/lib.rs (100%) rename {src => core/src}/mouse_cursor.rs (100%) rename {src => core/src}/node.rs (100%) rename {src => core/src}/point.rs (100%) rename {src => core/src}/rectangle.rs (100%) rename {src => core/src}/renderer.rs (100%) rename {src => core/src}/style.rs (100%) rename {src => core/src}/user_interface.rs (100%) rename {src => core/src}/vector.rs (100%) rename {src => core/src}/widget.rs (100%) rename {src => core/src}/widget/button.rs (100%) rename {src => core/src}/widget/checkbox.rs (100%) rename {src => core/src}/widget/column.rs (100%) rename {src => core/src}/widget/image.rs (100%) rename {src => core/src}/widget/panel.rs (100%) rename {src => core/src}/widget/progress_bar.rs (100%) rename {src => core/src}/widget/radio.rs (100%) rename {src => core/src}/widget/row.rs (100%) rename {src => core/src}/widget/slider.rs (100%) rename {src => core/src}/widget/text.rs (100%) create mode 100644 examples/Cargo.toml diff --git a/Cargo.toml b/Cargo.toml index 1e806b22..43556cbe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,30 +1,5 @@ -[package] -name = "iced" -version = "0.1.0-alpha" -authors = ["Héctor Ramón Jiménez "] -edition = "2018" -description = "A GUI runtime, heavily inspired by Elm." -license = "MIT" -repository = "https://github.com/hecrj/iced" -documentation = "https://docs.rs/iced" -readme = "README.md" -keywords = ["gui", "ui", "graphics", "interface", "widgets"] -categories = ["gui"] - -[badges] -maintenance = { status = "actively-developed" } - -[package.metadata.docs.rs] -features = ["winit"] - -[dependencies] -stretch = "0.2" -twox-hash = "1.5" - -# Enable to obtain conversion traits -winit = { version = "0.20.0-alpha3", optional = true } - -[dev-dependencies] -# A personal `ggez` fork that introduces a `FontCache` type to measure text -# efficiently and fixes HiDPI issues. -ggez = { version = "0.5", git = "https://github.com/hecrj/ggez.git" } +[workspace] +members = [ + "core", + "examples", +] diff --git a/core/Cargo.toml b/core/Cargo.toml new file mode 100644 index 00000000..cd84d03e --- /dev/null +++ b/core/Cargo.toml @@ -0,0 +1,25 @@ +[package] +name = "iced" +version = "0.1.0-alpha" +authors = ["Héctor Ramón Jiménez "] +edition = "2018" +description = "A GUI runtime, heavily inspired by Elm." +license = "MIT" +repository = "https://github.com/hecrj/iced" +documentation = "https://docs.rs/iced" +readme = "README.md" +keywords = ["gui", "ui", "graphics", "interface", "widgets"] +categories = ["gui"] + +[badges] +maintenance = { status = "actively-developed" } + +[package.metadata.docs.rs] +features = ["winit"] + +[dependencies] +stretch = "0.2" +twox-hash = "1.5" + +# Enable to obtain conversion traits +winit = { version = "0.20.0-alpha3", optional = true } diff --git a/src/element.rs b/core/src/element.rs similarity index 100% rename from src/element.rs rename to core/src/element.rs diff --git a/src/event.rs b/core/src/event.rs similarity index 100% rename from src/event.rs rename to core/src/event.rs diff --git a/src/hasher.rs b/core/src/hasher.rs similarity index 100% rename from src/hasher.rs rename to core/src/hasher.rs diff --git a/src/input.rs b/core/src/input.rs similarity index 100% rename from src/input.rs rename to core/src/input.rs diff --git a/src/input/button_state.rs b/core/src/input/button_state.rs similarity index 100% rename from src/input/button_state.rs rename to core/src/input/button_state.rs diff --git a/src/input/keyboard.rs b/core/src/input/keyboard.rs similarity index 100% rename from src/input/keyboard.rs rename to core/src/input/keyboard.rs diff --git a/src/input/keyboard/event.rs b/core/src/input/keyboard/event.rs similarity index 100% rename from src/input/keyboard/event.rs rename to core/src/input/keyboard/event.rs diff --git a/src/input/keyboard/key_code.rs b/core/src/input/keyboard/key_code.rs similarity index 100% rename from src/input/keyboard/key_code.rs rename to core/src/input/keyboard/key_code.rs diff --git a/src/input/mouse.rs b/core/src/input/mouse.rs similarity index 100% rename from src/input/mouse.rs rename to core/src/input/mouse.rs diff --git a/src/input/mouse/button.rs b/core/src/input/mouse/button.rs similarity index 100% rename from src/input/mouse/button.rs rename to core/src/input/mouse/button.rs diff --git a/src/input/mouse/event.rs b/core/src/input/mouse/event.rs similarity index 100% rename from src/input/mouse/event.rs rename to core/src/input/mouse/event.rs diff --git a/src/layout.rs b/core/src/layout.rs similarity index 100% rename from src/layout.rs rename to core/src/layout.rs diff --git a/src/lib.rs b/core/src/lib.rs similarity index 100% rename from src/lib.rs rename to core/src/lib.rs diff --git a/src/mouse_cursor.rs b/core/src/mouse_cursor.rs similarity index 100% rename from src/mouse_cursor.rs rename to core/src/mouse_cursor.rs diff --git a/src/node.rs b/core/src/node.rs similarity index 100% rename from src/node.rs rename to core/src/node.rs diff --git a/src/point.rs b/core/src/point.rs similarity index 100% rename from src/point.rs rename to core/src/point.rs diff --git a/src/rectangle.rs b/core/src/rectangle.rs similarity index 100% rename from src/rectangle.rs rename to core/src/rectangle.rs diff --git a/src/renderer.rs b/core/src/renderer.rs similarity index 100% rename from src/renderer.rs rename to core/src/renderer.rs diff --git a/src/style.rs b/core/src/style.rs similarity index 100% rename from src/style.rs rename to core/src/style.rs diff --git a/src/user_interface.rs b/core/src/user_interface.rs similarity index 100% rename from src/user_interface.rs rename to core/src/user_interface.rs diff --git a/src/vector.rs b/core/src/vector.rs similarity index 100% rename from src/vector.rs rename to core/src/vector.rs diff --git a/src/widget.rs b/core/src/widget.rs similarity index 100% rename from src/widget.rs rename to core/src/widget.rs diff --git a/src/widget/button.rs b/core/src/widget/button.rs similarity index 100% rename from src/widget/button.rs rename to core/src/widget/button.rs diff --git a/src/widget/checkbox.rs b/core/src/widget/checkbox.rs similarity index 100% rename from src/widget/checkbox.rs rename to core/src/widget/checkbox.rs diff --git a/src/widget/column.rs b/core/src/widget/column.rs similarity index 100% rename from src/widget/column.rs rename to core/src/widget/column.rs diff --git a/src/widget/image.rs b/core/src/widget/image.rs similarity index 100% rename from src/widget/image.rs rename to core/src/widget/image.rs diff --git a/src/widget/panel.rs b/core/src/widget/panel.rs similarity index 100% rename from src/widget/panel.rs rename to core/src/widget/panel.rs diff --git a/src/widget/progress_bar.rs b/core/src/widget/progress_bar.rs similarity index 100% rename from src/widget/progress_bar.rs rename to core/src/widget/progress_bar.rs diff --git a/src/widget/radio.rs b/core/src/widget/radio.rs similarity index 100% rename from src/widget/radio.rs rename to core/src/widget/radio.rs diff --git a/src/widget/row.rs b/core/src/widget/row.rs similarity index 100% rename from src/widget/row.rs rename to core/src/widget/row.rs diff --git a/src/widget/slider.rs b/core/src/widget/slider.rs similarity index 100% rename from src/widget/slider.rs rename to core/src/widget/slider.rs diff --git a/src/widget/text.rs b/core/src/widget/text.rs similarity index 100% rename from src/widget/text.rs rename to core/src/widget/text.rs diff --git a/examples/Cargo.toml b/examples/Cargo.toml new file mode 100644 index 00000000..fdf854cd --- /dev/null +++ b/examples/Cargo.toml @@ -0,0 +1,17 @@ +[package] +name = "iced_examples" +version = "0.0.0" +authors = ["Héctor Ramón Jiménez "] +publish = false +edition = "2018" + +[[bin]] +name = "tour" +path = "tour/main.rs" + +[dependencies] +iced = { version = "0.1.0-alpha", path = "../core" } + +# A personal `ggez` fork that introduces a `FontCache` type to measure text +# efficiently and fixes HiDPI issues. +ggez = { version = "0.5", git = "https://github.com/hecrj/ggez.git" } diff --git a/examples/tour/main.rs b/examples/tour/main.rs index 571bc2e2..ce477fd9 100644 --- a/examples/tour/main.rs +++ b/examples/tour/main.rs @@ -27,7 +27,7 @@ pub fn main() -> ggez::GameResult { filesystem::mount( context, std::path::Path::new(&format!( - "{}/examples/resources", + "{}/resources", env!("CARGO_MANIFEST_DIR") )), true,