Skip to content

Commit

Permalink
[Cargo.toml] Prepare to publish fork
Browse files Browse the repository at this point in the history
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:
rust-lang/cargo#4242
  • Loading branch information
malikolivier committed Aug 13, 2018
1 parent fc4d0a9 commit 998bbf3
Show file tree
Hide file tree
Showing 16 changed files with 70 additions and 76 deletions.
20 changes: 10 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
[package]
name = "imgui"
version = "0.0.20-pre"
authors = ["Joonas Javanainen <joonas.javanainen@gmail.com>", "imgui-rs contributors"]
name = "aflak_imgui"
version = "0.19.1"
authors = ["Joonas Javanainen <joonas.javanainen@gmail.com>",
"Malik Olivier Boussejra <malik@boussejra.com>",
"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.20-pre", path = "imgui-sys" }
aflak_imgui-sys = { version = "0.19.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.19.1" }

[workspace]
members = ["imgui-examples", "imgui-sys", "imgui-gfx-renderer", "imgui-glium-renderer"]
4 changes: 2 additions & 2 deletions imgui-examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ gfx = "0.17"
gfx_window_glutin = "0.26"
glium = { version = "0.22", default-features = true }
glutin = "0.18"
imgui = { version = "0.0.20-pre", path = "../" }
aflak_imgui = { version = "0.19.1", path = "../" }
imgui-gfx-renderer = { version = "0.0.20-pre", path = "../imgui-gfx-renderer" }
imgui-glium-renderer = { version = "0.0.20-pre", path = "../imgui-glium-renderer" }
aflak_imgui-glium-renderer = { version = "0.19.1", path = "../imgui-glium-renderer" }
4 changes: 2 additions & 2 deletions imgui-examples/examples/color_button.rs
Original file line number Diff line number Diff line change
@@ -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::*;

Expand Down
4 changes: 2 additions & 2 deletions imgui-examples/examples/custom_textures.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion imgui-examples/examples/hello_gfx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ 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;

use imgui::*;
Expand Down
4 changes: 2 additions & 2 deletions imgui-examples/examples/hello_world.rs
Original file line number Diff line number Diff line change
@@ -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::*;

Expand Down
4 changes: 2 additions & 2 deletions imgui-examples/examples/test_drawing_channels_split.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
extern crate aflak_imgui as imgui;
extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
extern crate glium;
extern crate imgui;
extern crate imgui_glium_renderer;

mod support;

Expand Down
4 changes: 2 additions & 2 deletions imgui-examples/examples/test_window.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
extern crate aflak_imgui as imgui;
extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
extern crate glium;
extern crate imgui;
extern crate imgui_glium_renderer;

mod support;

Expand Down
4 changes: 2 additions & 2 deletions imgui-examples/examples/test_window_impl.rs
Original file line number Diff line number Diff line change
@@ -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::*;

Expand Down
4 changes: 2 additions & 2 deletions imgui-gfx-renderer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ travis-ci = { repository = "Gekkio/imgui-rs" }

[dependencies]
gfx = "0.17"
imgui = { version = "0.0.20-pre", path = "../" }
imgui-sys = { version = "0.0.20-pre", path = "../imgui-sys", features = ["gfx"] }
aflak_imgui = { version = "0.19.1", path = "../" }
aflak_imgui-sys = { version = "0.19.1", path = "../imgui-sys", features = ["gfx"] }
2 changes: 1 addition & 1 deletion imgui-gfx-renderer/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
15 changes: 6 additions & 9 deletions imgui-glium-renderer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
[package]
name = "imgui-glium-renderer"
version = "0.0.20-pre"
name = "aflak_imgui-glium-renderer"
version = "0.19.1"
authors = ["Joonas Javanainen <joonas.javanainen@gmail.com>", "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.20-pre", path = "../" }
imgui-sys = { version = "0.0.20-pre", path = "../imgui-sys", features = ["glium"] }
aflak_imgui = { version = "0.19.1", path = "../" }
aflak_imgui-sys = { version = "0.19.1", path = "../imgui-sys", features = ["glium"] }
2 changes: 1 addition & 1 deletion imgui-glium-renderer/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#[macro_use]
extern crate glium;
extern crate imgui;
extern crate aflak_imgui as imgui;

mod im_texture;
pub use im_texture::Texture;
Expand Down
11 changes: 4 additions & 7 deletions imgui-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
[package]
name = "imgui-sys"
version = "0.0.20-pre"
name = "aflak_imgui-sys"
version = "0.19.1"
authors = ["Joonas Javanainen <joonas.javanainen@gmail.com>", "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"
Expand Down
60 changes: 30 additions & 30 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -383,7 +383,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);
Expand Down Expand Up @@ -1128,8 +1128,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() {
Expand All @@ -1153,8 +1153,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() {
Expand Down Expand Up @@ -1270,7 +1270,7 @@ impl<'ui> Ui<'ui> {
///
/// # Example
/// ```rust,no_run
/// # use imgui::*;
/// # use aflak_imgui::*;
/// # let mut imgui = ImGui::init();
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
/// # let mut selected_radio_value = 2;
Expand All @@ -1287,7 +1287,7 @@ impl<'ui> Ui<'ui> {
///
/// # Example
/// ```rust,no_run
/// # use imgui::*;
/// # use aflak_imgui::*;
/// # let mut imgui = ImGui::init();
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
/// # let mut radio_button_test = "cats".to_string();
Expand Down Expand Up @@ -1366,7 +1366,7 @@ impl<'ui> Ui<'ui> {
///
/// # Example
/// ```rust,no_run
/// # use imgui::*;
/// # use aflak_imgui::*;
/// # let mut imgui = ImGui::init();
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
/// ui.progress_bar(0.6)
Expand All @@ -1384,7 +1384,7 @@ impl<'ui> Ui<'ui> {
///
/// # Example
/// ```rust,no_run
/// # use imgui::*;
/// # use aflak_imgui::*;
/// # let mut imgui = ImGui::init();
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
/// ui.window(im_str!("ChatWindow"))
Expand Down Expand Up @@ -1420,12 +1420,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<F: Facade>(ui: &Ui, facade: &F, data: Vec<Vec<(u8, u8, u8, u8)>>) {
Expand All @@ -1452,7 +1452,7 @@ impl<'ui> Ui<'ui> {
///
/// # Example
/// ```rust,no_run
/// # use imgui::*;
/// # use aflak_imgui::*;
/// # let mut imgui = ImGui::init();
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
/// ui.with_style_var(StyleVar::Alpha(0.2), || {
Expand All @@ -1470,7 +1470,7 @@ impl<'ui> Ui<'ui> {
///
/// # Example
/// ```rust,no_run
/// # use imgui::*;
/// # use aflak_imgui::*;
/// # let mut imgui = ImGui::init();
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
/// # let styles = [StyleVar::Alpha(0.2), StyleVar::WindowPadding(ImVec2::new(1.0, 1.0))];
Expand Down Expand Up @@ -1520,7 +1520,7 @@ impl<'ui> Ui<'ui> {
///
/// # Example
/// ```rust,no_run
/// # use imgui::*;
/// # use aflak_imgui::*;
/// # let mut imgui = ImGui::init();
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
/// ui.with_color_var(ImGuiCol::Text, (1.0, 0.0, 0.0, 1.0), || {
Expand All @@ -1546,7 +1546,7 @@ impl<'ui> Ui<'ui> {
///
/// # Example
/// ```rust,no_run
/// # use imgui::*;
/// # use aflak_imgui::*;
/// # let mut imgui = ImGui::init();
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
/// let red = (1.0, 0.0, 0.0, 1.0);
Expand Down Expand Up @@ -1596,8 +1596,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();
Expand Down Expand Up @@ -1640,7 +1640,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
Expand All @@ -1655,7 +1655,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...
Expand All @@ -1682,12 +1682,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;
///
Expand Down Expand Up @@ -1725,12 +1725,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<F: Facade>(ui: &Ui, facade: &F, data: Vec<Vec<(u8, u8, u8, u8)>>) {
Expand Down
2 changes: 1 addition & 1 deletion src/window_draw_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,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| {
Expand Down

0 comments on commit 998bbf3

Please sign in to comment.