From 9c5e1d01371f41f3ed2f5d3a9fe973bdb6235ca5 Mon Sep 17 00:00:00 2001 From: Malik Olivier Boussejra Date: Sat, 11 Aug 2018 09:27:48 +0900 Subject: [PATCH] [Cargo.toml] Prepare to publish fork While preparing for publication, I realized I cannot publish crates with cyclic dev-dependencies. That's an interesting issue, and a work-around is currently used: https://github.com/rust-lang/cargo/issues/4242 Another issue: it seems "imgui-glium-renderer" requires the "glutin" feature of "glium". However it was not enabled. So I enabled it. --- Cargo.toml | 20 +++---- imgui-examples/Cargo.toml | 6 +- imgui-examples/examples/color_button.rs | 4 +- imgui-examples/examples/custom_textures.rs | 4 +- imgui-examples/examples/hello_gfx.rs | 4 +- imgui-examples/examples/hello_world.rs | 4 +- .../examples/test_drawing_channels_split.rs | 4 +- imgui-examples/examples/test_window.rs | 4 +- imgui-examples/examples/test_window_impl.rs | 4 +- imgui-gfx-renderer/Cargo.toml | 4 +- imgui-gfx-renderer/src/lib.rs | 2 +- imgui-glium-renderer/Cargo.toml | 17 +++--- imgui-glium-renderer/src/lib.rs | 2 +- imgui-sys/Cargo.toml | 11 ++-- src/lib.rs | 60 +++++++++---------- src/window_draw_list.rs | 2 +- 16 files changed, 73 insertions(+), 79 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 45c92374a..18e70a4ac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,23 +1,23 @@ [package] -name = "imgui" -version = "0.0.19-pre" -authors = ["Joonas Javanainen ", "imgui-rs contributors"] +name = "aflak_imgui" +version = "0.18.1" +authors = ["Joonas Javanainen ", + "Malik Olivier Boussejra ", + "imgui-rs contributors"] description = "High-level Rust bindings to dear imgui" -homepage = "https://github.com/Gekkio/imgui-rs" -repository = "https://github.com/Gekkio/imgui-rs" +homepage = "https://github.com/malikolivier/imgui-rs" +repository = "https://github.com/malikolivier/imgui-rs" license = "MIT/Apache-2.0" categories = ["gui", "api-bindings"] readme = "README.markdown" -[badges] -travis-ci = { repository = "Gekkio/imgui-rs" } - [dependencies] -imgui-sys = { version = "0.0.19-pre", path = "imgui-sys" } +aflak_imgui-sys = { version = "0.18.1", path = "imgui-sys" } +# Comment this section when publishing new releases to crates.io! [dev-dependencies] glium = { version = "0.22", default-features = true } -imgui-glium-renderer = { path = "imgui-glium-renderer" } +aflak_imgui-glium-renderer = { path = "imgui-glium-renderer", version = "0.18.1" } [workspace] members = ["imgui-examples", "imgui-sys", "imgui-gfx-renderer", "imgui-glium-renderer"] diff --git a/imgui-examples/Cargo.toml b/imgui-examples/Cargo.toml index 668117255..8e25bf404 100644 --- a/imgui-examples/Cargo.toml +++ b/imgui-examples/Cargo.toml @@ -13,7 +13,7 @@ gfx = "0.17" gfx_window_glutin = "0.25" glium = { version = "0.22", default-features = true } glutin = "0.17" -imgui = { version = "0.0.19-pre", path = "../" } +aflak_imgui = { version = "0.18.1", path = "../" } imgui-gfx-renderer = { version = "0.0.19-pre", path = "../imgui-gfx-renderer" } -imgui-glium-renderer = { version = "0.0.19-pre", path = "../imgui-glium-renderer" } -imgui-sys = { version = "0.0.19-pre", path = "../imgui-sys", features = ["gfx", "glium"] } +aflak_imgui-glium-renderer = { version = "0.18.1", path = "../imgui-glium-renderer" } +aflak_imgui-sys = { version = "0.18.1", path = "../imgui-sys", features = ["gfx", "glium"] } diff --git a/imgui-examples/examples/color_button.rs b/imgui-examples/examples/color_button.rs index 5febfe3e0..089cfd2e6 100644 --- a/imgui-examples/examples/color_button.rs +++ b/imgui-examples/examples/color_button.rs @@ -1,7 +1,7 @@ extern crate glium; #[macro_use] -extern crate imgui; -extern crate imgui_glium_renderer; +extern crate aflak_imgui as imgui; +extern crate aflak_imgui_glium_renderer as imgui_glium_renderer; use imgui::*; diff --git a/imgui-examples/examples/custom_textures.rs b/imgui-examples/examples/custom_textures.rs index de3bb7c1e..b67199d85 100644 --- a/imgui-examples/examples/custom_textures.rs +++ b/imgui-examples/examples/custom_textures.rs @@ -1,7 +1,7 @@ extern crate glium; #[macro_use] -extern crate imgui; -extern crate imgui_glium_renderer; +extern crate aflak_imgui as imgui; +extern crate aflak_imgui_glium_renderer as imgui_glium_renderer; mod support_custom_textures; diff --git a/imgui-examples/examples/hello_gfx.rs b/imgui-examples/examples/hello_gfx.rs index f406fc37a..e3d09639a 100644 --- a/imgui-examples/examples/hello_gfx.rs +++ b/imgui-examples/examples/hello_gfx.rs @@ -2,9 +2,9 @@ extern crate gfx; extern crate gfx_window_glutin; extern crate glutin; #[macro_use] -extern crate imgui; +extern crate aflak_imgui as imgui; extern crate imgui_gfx_renderer; -extern crate imgui_sys; +extern crate aflak_imgui_sys as imgui_sys; use imgui::*; diff --git a/imgui-examples/examples/hello_world.rs b/imgui-examples/examples/hello_world.rs index f35d58c93..296770036 100644 --- a/imgui-examples/examples/hello_world.rs +++ b/imgui-examples/examples/hello_world.rs @@ -1,7 +1,7 @@ extern crate glium; #[macro_use] -extern crate imgui; -extern crate imgui_glium_renderer; +extern crate aflak_imgui as imgui; +extern crate aflak_imgui_glium_renderer as imgui_glium_renderer; use imgui::*; diff --git a/imgui-examples/examples/test_drawing_channels_split.rs b/imgui-examples/examples/test_drawing_channels_split.rs index d38d8b85b..043cc769d 100644 --- a/imgui-examples/examples/test_drawing_channels_split.rs +++ b/imgui-examples/examples/test_drawing_channels_split.rs @@ -1,6 +1,6 @@ extern crate glium; -extern crate imgui; -extern crate imgui_glium_renderer; +extern crate aflak_imgui as imgui; +extern crate aflak_imgui_glium_renderer as imgui_glium_renderer; mod support; diff --git a/imgui-examples/examples/test_window.rs b/imgui-examples/examples/test_window.rs index d1114164e..30b64e747 100644 --- a/imgui-examples/examples/test_window.rs +++ b/imgui-examples/examples/test_window.rs @@ -1,6 +1,6 @@ extern crate glium; -extern crate imgui; -extern crate imgui_glium_renderer; +extern crate aflak_imgui as imgui; +extern crate aflak_imgui_glium_renderer as imgui_glium_renderer; mod support; diff --git a/imgui-examples/examples/test_window_impl.rs b/imgui-examples/examples/test_window_impl.rs index f710407fb..2246a012d 100644 --- a/imgui-examples/examples/test_window_impl.rs +++ b/imgui-examples/examples/test_window_impl.rs @@ -1,7 +1,7 @@ extern crate glium; #[macro_use] -extern crate imgui; -extern crate imgui_glium_renderer; +extern crate aflak_imgui as imgui; +extern crate aflak_imgui_glium_renderer as imgui_glium_renderer; use imgui::*; diff --git a/imgui-gfx-renderer/Cargo.toml b/imgui-gfx-renderer/Cargo.toml index 214a112b3..509b80ca3 100644 --- a/imgui-gfx-renderer/Cargo.toml +++ b/imgui-gfx-renderer/Cargo.toml @@ -13,5 +13,5 @@ travis-ci = { repository = "Gekkio/imgui-rs" } [dependencies] gfx = "0.17" -imgui = { version = "0.0.19-pre", path = "../" } -imgui-sys = { version = "0.0.19-pre", path = "../imgui-sys", features = ["gfx"] } +aflak_imgui = { version = "0.18.1", path = "../" } +aflak_imgui-sys = { version = "0.18.1", path = "../imgui-sys", features = ["gfx"] } diff --git a/imgui-gfx-renderer/src/lib.rs b/imgui-gfx-renderer/src/lib.rs index 0b2e0a951..10209312e 100644 --- a/imgui-gfx-renderer/src/lib.rs +++ b/imgui-gfx-renderer/src/lib.rs @@ -1,6 +1,6 @@ #[macro_use] extern crate gfx; -extern crate imgui; +extern crate aflak_imgui as imgui; mod im_texture; pub use im_texture::Texture; diff --git a/imgui-glium-renderer/Cargo.toml b/imgui-glium-renderer/Cargo.toml index 269b01811..11d044250 100644 --- a/imgui-glium-renderer/Cargo.toml +++ b/imgui-glium-renderer/Cargo.toml @@ -1,17 +1,14 @@ [package] -name = "imgui-glium-renderer" -version = "0.0.19-pre" +name = "aflak_imgui-glium-renderer" +version = "0.18.1" authors = ["Joonas Javanainen ", "imgui-rs contributors"] description = "Glium renderer for the imgui crate" -homepage = "https://github.com/Gekkio/imgui-rs" -repository = "https://github.com/Gekkio/imgui-rs" +homepage = "https://github.com/malikolivier/imgui-rs" +repository = "https://github.com/malikolivier/imgui-rs" license = "MIT/Apache-2.0" categories = ["gui", "rendering"] -[badges] -travis-ci = { repository = "Gekkio/imgui-rs" } - [dependencies] -glium = { version = "0.22", default-features = false } -imgui = { version = "0.0.19-pre", path = "../" } -imgui-sys = { version = "0.0.19-pre", path = "../imgui-sys", features = ["glium"] } +glium = { version = "0.22", features = ["glutin"] } +aflak_imgui = { version = "0.18.1", path = "../" } +aflak_imgui-sys = { version = "0.18.1", path = "../imgui-sys", features = ["glium"] } diff --git a/imgui-glium-renderer/src/lib.rs b/imgui-glium-renderer/src/lib.rs index 4ed598c18..39569b169 100644 --- a/imgui-glium-renderer/src/lib.rs +++ b/imgui-glium-renderer/src/lib.rs @@ -1,6 +1,6 @@ #[macro_use] extern crate glium; -extern crate imgui; +extern crate aflak_imgui as imgui; mod context; mod im_texture; diff --git a/imgui-sys/Cargo.toml b/imgui-sys/Cargo.toml index 4279a2cd3..a01bd54ad 100644 --- a/imgui-sys/Cargo.toml +++ b/imgui-sys/Cargo.toml @@ -1,17 +1,14 @@ [package] -name = "imgui-sys" -version = "0.0.19-pre" +name = "aflak_imgui-sys" +version = "0.18.1" authors = ["Joonas Javanainen ", "imgui-rs contributors"] description = "Raw FFI bindings to dear imgui" -homepage = "https://github.com/Gekkio/imgui-rs" -repository = "https://github.com/Gekkio/imgui-rs" +homepage = "https://github.com/malikolivier/imgui-rs" +repository = "https://github.com/malikolivier/imgui-rs" license = "MIT/Apache-2.0" categories = ["gui", "external-ffi-bindings"] build = "build.rs" -[badges] -travis-ci = { repository = "Gekkio/imgui-rs" } - [dependencies] libc = "0.2" bitflags = "1.0" diff --git a/src/lib.rs b/src/lib.rs index 4c7943329..bf9127de3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -pub extern crate imgui_sys as sys; +pub extern crate aflak_imgui_sys as sys; use std::ffi::CStr; use std::mem; @@ -360,7 +360,7 @@ impl ImGui { /// # Example /// /// ```rust - /// use imgui::{ImGuiKey, Ui}; + /// use aflak_imgui::{ImGuiKey, Ui}; /// /// fn test(ui: &Ui) { /// let delete_key_index = ui.imgui().get_key_index(ImGuiKey::Delete); @@ -1061,8 +1061,8 @@ impl<'ui> Ui<'ui> { /// # Examples /// /// ``` - /// # #[macro_use] extern crate imgui; - /// # use imgui::*; + /// # #[macro_use] extern crate aflak_imgui; + /// # use aflak_imgui::*; /// fn user_interface(ui: &Ui) { /// ui.text("Hover over me"); /// if ui.is_item_hovered() { @@ -1086,8 +1086,8 @@ impl<'ui> Ui<'ui> { /// # Examples /// /// ``` - /// # #[macro_use] extern crate imgui; - /// # use imgui::*; + /// # #[macro_use] extern crate aflak_imgui; + /// # use aflak_imgui::*; /// fn user_interface(ui: &Ui) { /// ui.text("Hover over me"); /// if ui.is_item_hovered() { @@ -1197,7 +1197,7 @@ impl<'ui> Ui<'ui> { /// /// # Example /// ```rust,no_run - /// # use imgui::*; + /// # use aflak_imgui::*; /// # let mut imgui = ImGui::init(); /// # let ui = imgui.frame((0, 0), (0, 0), 0.1); /// # let mut selected_radio_value = 2; @@ -1214,7 +1214,7 @@ impl<'ui> Ui<'ui> { /// /// # Example /// ```rust,no_run - /// # use imgui::*; + /// # use aflak_imgui::*; /// # let mut imgui = ImGui::init(); /// # let ui = imgui.frame((0, 0), (0, 0), 0.1); /// # let mut radio_button_test = "cats".to_string(); @@ -1291,7 +1291,7 @@ impl<'ui> Ui<'ui> { /// /// # Example /// ```rust,no_run - /// # use imgui::*; + /// # use aflak_imgui::*; /// # let mut imgui = ImGui::init(); /// # let ui = imgui.frame((0, 0), (0, 0), 0.1); /// ui.progress_bar(0.6) @@ -1309,7 +1309,7 @@ impl<'ui> Ui<'ui> { /// /// # Example /// ```rust,no_run - /// # use imgui::*; + /// # use aflak_imgui::*; /// # let mut imgui = ImGui::init(); /// # let ui = imgui.frame((0, 0), (0, 0), 0.1); /// ui.window(im_str!("ChatWindow")) @@ -1345,12 +1345,12 @@ impl<'ui> Ui<'ui> { /// ## Example using glium as back-end /// /// ```rust,no_run - /// #[macro_use] extern crate imgui; + /// #[macro_use] extern crate aflak_imgui; /// extern crate glium; - /// extern crate imgui_glium_renderer; + /// extern crate aflak_imgui_glium_renderer; /// - /// use imgui::*; - /// use imgui_glium_renderer::Texture; + /// use aflak_imgui::*; + /// use aflak_imgui_glium_renderer::Texture; /// use glium::backend::Facade; /// /// fn make_a_texture(ui: &Ui, facade: &F, data: Vec>) { @@ -1377,7 +1377,7 @@ impl<'ui> Ui<'ui> { /// /// # Example /// ```rust,no_run - /// # use imgui::*; + /// # use aflak_imgui::*; /// # let mut imgui = ImGui::init(); /// # let ui = imgui.frame((0, 0), (0, 0), 0.1); /// ui.with_style_var(StyleVar::Alpha(0.2), || { @@ -1395,7 +1395,7 @@ impl<'ui> Ui<'ui> { /// /// # Example /// ```rust,no_run - /// # use imgui::*; + /// # use aflak_imgui::*; /// # let mut imgui = ImGui::init(); /// # let ui = imgui.frame((0, 0), (0, 0), 0.1); /// # let styles = [StyleVar::Alpha(0.2), StyleVar::WindowPadding(ImVec2::new(1.0, 1.0))]; @@ -1455,7 +1455,7 @@ impl<'ui> Ui<'ui> { /// /// # Example /// ```rust,no_run - /// # use imgui::*; + /// # use aflak_imgui::*; /// # let mut imgui = ImGui::init(); /// # let ui = imgui.frame((0, 0), (0, 0), 0.1); /// ui.with_color_var(ImGuiCol::Text, (1.0, 0.0, 0.0, 1.0), || { @@ -1481,7 +1481,7 @@ impl<'ui> Ui<'ui> { /// /// # Example /// ```rust,no_run - /// # use imgui::*; + /// # use aflak_imgui::*; /// # let mut imgui = ImGui::init(); /// # let ui = imgui.frame((0, 0), (0, 0), 0.1); /// let red = (1.0, 0.0, 0.0, 1.0); @@ -1531,8 +1531,8 @@ impl<'ui> Ui<'ui> { /// # Examples /// /// ``` - /// # #[macro_use] extern crate imgui; - /// # use imgui::*; + /// # #[macro_use] extern crate aflak_imgui; + /// # use aflak_imgui::*; /// fn user_interface(ui: &Ui) { /// ui.text("Hover over me"); /// let is_hover_over_me_text_hovered = ui.is_item_hovered(); @@ -1573,7 +1573,7 @@ impl<'ui> Ui<'ui> { /// # Examples /// /// ```rust,no_run - /// # use imgui::*; + /// # use aflak_imgui::*; /// fn custom_draw(ui: &Ui) { /// let draw_list = ui.get_window_draw_list(); /// // Draw a line @@ -1588,7 +1588,7 @@ impl<'ui> Ui<'ui> { /// dropped. /// /// ```rust - /// # use imgui::*; + /// # use aflak_imgui::*; /// fn custom_draw(ui: &Ui) { /// let draw_list = ui.get_window_draw_list(); /// // Draw something... @@ -1615,12 +1615,12 @@ impl<'ui> Ui<'ui> { /// ## Example using glium as back-end /// /// ```rust,no_run - /// #[macro_use] extern crate imgui; + /// #[macro_use] extern crate aflak_imgui; /// extern crate glium; - /// extern crate imgui_glium_renderer; + /// extern crate aflak_imgui_glium_renderer; /// - /// use imgui::*; - /// use imgui_glium_renderer::Texture; + /// use aflak_imgui::*; + /// use aflak_imgui_glium_renderer::Texture; /// use glium::backend::Facade; /// use glium::Texture2d; /// @@ -1658,12 +1658,12 @@ impl<'ui> Ui<'ui> { /// ## Example using glium as back-end /// /// ```rust,no_run - /// #[macro_use] extern crate imgui; + /// #[macro_use] extern crate aflak_imgui; /// extern crate glium; - /// extern crate imgui_glium_renderer; + /// extern crate aflak_imgui_glium_renderer; /// - /// use imgui::*; - /// use imgui_glium_renderer::Texture; + /// use aflak_imgui::*; + /// use aflak_imgui_glium_renderer::Texture; /// use glium::backend::Facade; /// /// fn make_a_texture(ui: &Ui, facade: &F, data: Vec>) { diff --git a/src/window_draw_list.rs b/src/window_draw_list.rs index e995bd3df..1f4b9fa49 100644 --- a/src/window_draw_list.rs +++ b/src/window_draw_list.rs @@ -85,7 +85,7 @@ impl<'ui> WindowDrawList<'ui> { /// # Example /// /// ```rust,no_run - /// # use imgui::*; + /// # use aflak_imgui::*; /// fn custom_drawing(ui: &Ui) { /// let draw_list = ui.get_window_draw_list(); /// draw_list.channels_split(2, |channels| {