Skip to content

Commit 86e5a30

Browse files
malikoliviermalikolivier
committed
[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: rust-lang/cargo#4242 Another issue: it seems "imgui-glium-renderer" requires the "glutin" feature of "glium". However it was not enabled. So I enabled it.
1 parent 28fe08c commit 86e5a30

16 files changed

+74
-80
lines changed

‎Cargo.toml

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
[package]
2-
name = "imgui"
3-
version = "0.0.19-pre"
4-
authors = ["Joonas Javanainen <[email protected]>", "imgui-rs contributors"]
2+
name = "aflak_imgui"
3+
version = "0.18.1"
4+
authors = ["Joonas Javanainen <[email protected]>",
5+
"Malik Olivier Boussejra <[email protected]>",
6+
"imgui-rs contributors"]
57
description = "High-level Rust bindings to dear imgui"
6-
homepage = "https://github.com/Gekkio/imgui-rs"
7-
repository = "https://github.com/Gekkio/imgui-rs"
8+
homepage = "https://github.com/malikolivier/imgui-rs"
9+
repository = "https://github.com/malikolivier/imgui-rs"
810
license = "MIT/Apache-2.0"
911
categories = ["gui", "api-bindings"]
1012
readme = "README.markdown"
1113

12-
[badges]
13-
travis-ci = { repository = "Gekkio/imgui-rs" }
14-
1514
[dependencies]
16-
imgui-sys = { version = "0.0.19-pre", path = "imgui-sys" }
15+
aflak_imgui-sys = { version = "0.18.1", path = "imgui-sys" }
1716

17+
# Comment this section when publishing new releases to crates.io!
1818
[dev-dependencies]
19-
glium = { version = "0.20", default-features = true }
20-
imgui-glium-renderer = { path = "imgui-glium-renderer" }
19+
# glium = { version = "0.20", default-features = true }
20+
# aflak_imgui-glium-renderer = { path = "imgui-glium-renderer", version = "0.18.1" }
2121

2222
[workspace]
2323
members = ["imgui-examples", "imgui-sys", "imgui-gfx-renderer", "imgui-glium-renderer"]

‎imgui-examples/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ gfx = "0.17"
1313
gfx_window_glutin = "0.22"
1414
glium = { version = "0.20", default-features = true }
1515
glutin = "0.14"
16-
imgui = { version = "0.0.19-pre", path = "../" }
16+
aflak_imgui = { version = "0.18.1", path = "../" }
1717
imgui-gfx-renderer = { version = "0.0.19-pre", path = "../imgui-gfx-renderer" }
18-
imgui-glium-renderer = { version = "0.0.19-pre", path = "../imgui-glium-renderer" }
19-
imgui-sys = { version = "0.0.19-pre", path = "../imgui-sys", features = ["gfx", "glium"] }
18+
aflak_imgui-glium-renderer = { version = "0.18.1", path = "../imgui-glium-renderer" }
19+
aflak_imgui-sys = { version = "0.18.1", path = "../imgui-sys", features = ["gfx", "glium"] }

‎imgui-examples/examples/color_button.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extern crate glium;
22
#[macro_use]
3-
extern crate imgui;
4-
extern crate imgui_glium_renderer;
3+
extern crate aflak_imgui as imgui;
4+
extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
55

66
use imgui::*;
77

‎imgui-examples/examples/custom_textures.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extern crate glium;
22
#[macro_use]
3-
extern crate imgui;
4-
extern crate imgui_glium_renderer;
3+
extern crate aflak_imgui as imgui;
4+
extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
55

66
mod support_custom_textures;
77

‎imgui-examples/examples/hello_gfx.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ extern crate gfx;
22
extern crate gfx_window_glutin;
33
extern crate glutin;
44
#[macro_use]
5-
extern crate imgui;
5+
extern crate aflak_imgui as imgui;
66
extern crate imgui_gfx_renderer;
7-
extern crate imgui_sys;
7+
extern crate aflak_imgui_sys as imgui_sys;
88

99
use imgui::*;
1010

‎imgui-examples/examples/hello_world.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extern crate glium;
22
#[macro_use]
3-
extern crate imgui;
4-
extern crate imgui_glium_renderer;
3+
extern crate aflak_imgui as imgui;
4+
extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
55

66
use imgui::*;
77

‎imgui-examples/examples/test_drawing_channels_split.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extern crate glium;
2-
extern crate imgui;
3-
extern crate imgui_glium_renderer;
2+
extern crate aflak_imgui as imgui;
3+
extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
44

55
mod support;
66

‎imgui-examples/examples/test_window.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extern crate glium;
2-
extern crate imgui;
3-
extern crate imgui_glium_renderer;
2+
extern crate aflak_imgui as imgui;
3+
extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
44

55
mod support;
66

‎imgui-examples/examples/test_window_impl.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extern crate glium;
22
#[macro_use]
3-
extern crate imgui;
4-
extern crate imgui_glium_renderer;
3+
extern crate aflak_imgui as imgui;
4+
extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
55

66
use imgui::*;
77

‎imgui-gfx-renderer/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ travis-ci = { repository = "Gekkio/imgui-rs" }
1313

1414
[dependencies]
1515
gfx = "0.17"
16-
imgui = { version = "0.0.19-pre", path = "../" }
17-
imgui-sys = { version = "0.0.19-pre", path = "../imgui-sys", features = ["gfx"] }
16+
aflak_imgui = { version = "0.18.1", path = "../" }
17+
aflak_imgui-sys = { version = "0.18.1", path = "../imgui-sys", features = ["gfx"] }

‎imgui-gfx-renderer/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#[macro_use]
22
extern crate gfx;
3-
extern crate imgui;
3+
extern crate aflak_imgui as imgui;
44

55
mod im_texture;
66
pub use im_texture::Texture;

‎imgui-glium-renderer/Cargo.toml

+7-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
[package]
2-
name = "imgui-glium-renderer"
3-
version = "0.0.19-pre"
2+
name = "aflak_imgui-glium-renderer"
3+
version = "0.18.1"
44
authors = ["Joonas Javanainen <[email protected]>", "imgui-rs contributors"]
55
description = "Glium renderer for the imgui crate"
6-
homepage = "https://github.com/Gekkio/imgui-rs"
7-
repository = "https://github.com/Gekkio/imgui-rs"
6+
homepage = "https://github.com/malikolivier/imgui-rs"
7+
repository = "https://github.com/malikolivier/imgui-rs"
88
license = "MIT/Apache-2.0"
99
categories = ["gui", "rendering"]
1010

11-
[badges]
12-
travis-ci = { repository = "Gekkio/imgui-rs" }
13-
1411
[dependencies]
15-
glium = { version = "0.20", default-features = false }
16-
imgui = { version = "0.0.19-pre", path = "../" }
17-
imgui-sys = { version = "0.0.19-pre", path = "../imgui-sys", features = ["glium"] }
12+
glium = { version = "0.20", features = ["glutin"] }
13+
aflak_imgui = { version = "0.18.1", path = "../" }
14+
aflak_imgui-sys = { version = "0.18.1", path = "../imgui-sys", features = ["glium"] }

‎imgui-glium-renderer/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#[macro_use]
22
extern crate glium;
3-
extern crate imgui;
3+
extern crate aflak_imgui as imgui;
44

55
mod context;
66
mod im_texture;

‎imgui-sys/Cargo.toml

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
[package]
2-
name = "imgui-sys"
3-
version = "0.0.19-pre"
2+
name = "aflak_imgui-sys"
3+
version = "0.18.1"
44
authors = ["Joonas Javanainen <[email protected]>", "imgui-rs contributors"]
55
description = "Raw FFI bindings to dear imgui"
6-
homepage = "https://github.com/Gekkio/imgui-rs"
7-
repository = "https://github.com/Gekkio/imgui-rs"
6+
homepage = "https://github.com/malikolivier/imgui-rs"
7+
repository = "https://github.com/malikolivier/imgui-rs"
88
license = "MIT/Apache-2.0"
99
categories = ["gui", "external-ffi-bindings"]
1010
build = "build.rs"
1111

12-
[badges]
13-
travis-ci = { repository = "Gekkio/imgui-rs" }
14-
1512
[dependencies]
1613
libc = "0.2"
1714
bitflags = "1.0"

‎src/lib.rs

+30-30
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub extern crate imgui_sys as sys;
1+
pub extern crate aflak_imgui_sys as sys;
22

33
use std::ffi::CStr;
44
use std::mem;
@@ -360,7 +360,7 @@ impl ImGui {
360360
/// # Example
361361
///
362362
/// ```rust
363-
/// use imgui::{ImGuiKey, Ui};
363+
/// use aflak_imgui::{ImGuiKey, Ui};
364364
///
365365
/// fn test(ui: &Ui) {
366366
/// let delete_key_index = ui.imgui().get_key_index(ImGuiKey::Delete);
@@ -960,8 +960,8 @@ impl<'ui> Ui<'ui> {
960960
/// # Examples
961961
///
962962
/// ```
963-
/// # #[macro_use] extern crate imgui;
964-
/// # use imgui::*;
963+
/// # #[macro_use] extern crate aflak_imgui;
964+
/// # use aflak_imgui::*;
965965
/// fn user_interface(ui: &Ui) {
966966
/// ui.text("Hover over me");
967967
/// if ui.is_item_hovered() {
@@ -985,8 +985,8 @@ impl<'ui> Ui<'ui> {
985985
/// # Examples
986986
///
987987
/// ```
988-
/// # #[macro_use] extern crate imgui;
989-
/// # use imgui::*;
988+
/// # #[macro_use] extern crate aflak_imgui;
989+
/// # use aflak_imgui::*;
990990
/// fn user_interface(ui: &Ui) {
991991
/// ui.text("Hover over me");
992992
/// if ui.is_item_hovered() {
@@ -1096,7 +1096,7 @@ impl<'ui> Ui<'ui> {
10961096
///
10971097
/// # Example
10981098
/// ```rust,no_run
1099-
/// # use imgui::*;
1099+
/// # use aflak_imgui::*;
11001100
/// # let mut imgui = ImGui::init();
11011101
/// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
11021102
/// # let mut selected_radio_value = 2;
@@ -1113,7 +1113,7 @@ impl<'ui> Ui<'ui> {
11131113
///
11141114
/// # Example
11151115
/// ```rust,no_run
1116-
/// # use imgui::*;
1116+
/// # use aflak_imgui::*;
11171117
/// # let mut imgui = ImGui::init();
11181118
/// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
11191119
/// # let mut radio_button_test = "cats".to_string();
@@ -1190,7 +1190,7 @@ impl<'ui> Ui<'ui> {
11901190
///
11911191
/// # Example
11921192
/// ```rust,no_run
1193-
/// # use imgui::*;
1193+
/// # use aflak_imgui::*;
11941194
/// # let mut imgui = ImGui::init();
11951195
/// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
11961196
/// ui.progress_bar(0.6)
@@ -1208,7 +1208,7 @@ impl<'ui> Ui<'ui> {
12081208
///
12091209
/// # Example
12101210
/// ```rust,no_run
1211-
/// # use imgui::*;
1211+
/// # use aflak_imgui::*;
12121212
/// # let mut imgui = ImGui::init();
12131213
/// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
12141214
/// ui.window(im_str!("ChatWindow"))
@@ -1244,12 +1244,12 @@ impl<'ui> Ui<'ui> {
12441244
/// ## Example using glium as back-end
12451245
///
12461246
/// ```rust,no_run
1247-
/// #[macro_use] extern crate imgui;
1247+
/// #[macro_use] extern crate aflak_imgui;
12481248
/// extern crate glium;
1249-
/// extern crate imgui_glium_renderer;
1249+
/// extern crate aflak_imgui_glium_renderer;
12501250
///
1251-
/// use imgui::*;
1252-
/// use imgui_glium_renderer::Texture;
1251+
/// use aflak_imgui::*;
1252+
/// use aflak_imgui_glium_renderer::Texture;
12531253
/// use glium::backend::Facade;
12541254
///
12551255
/// fn make_a_texture<F: Facade>(ui: &Ui, facade: &F, data: Vec<Vec<(u8, u8, u8, u8)>>) {
@@ -1276,7 +1276,7 @@ impl<'ui> Ui<'ui> {
12761276
///
12771277
/// # Example
12781278
/// ```rust,no_run
1279-
/// # use imgui::*;
1279+
/// # use aflak_imgui::*;
12801280
/// # let mut imgui = ImGui::init();
12811281
/// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
12821282
/// ui.with_style_var(StyleVar::Alpha(0.2), || {
@@ -1294,7 +1294,7 @@ impl<'ui> Ui<'ui> {
12941294
///
12951295
/// # Example
12961296
/// ```rust,no_run
1297-
/// # use imgui::*;
1297+
/// # use aflak_imgui::*;
12981298
/// # let mut imgui = ImGui::init();
12991299
/// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
13001300
/// # let styles = [StyleVar::Alpha(0.2), StyleVar::WindowPadding(ImVec2::new(1.0, 1.0))];
@@ -1354,7 +1354,7 @@ impl<'ui> Ui<'ui> {
13541354
///
13551355
/// # Example
13561356
/// ```rust,no_run
1357-
/// # use imgui::*;
1357+
/// # use aflak_imgui::*;
13581358
/// # let mut imgui = ImGui::init();
13591359
/// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
13601360
/// ui.with_color_var(ImGuiCol::Text, (1.0, 0.0, 0.0, 1.0), || {
@@ -1380,7 +1380,7 @@ impl<'ui> Ui<'ui> {
13801380
///
13811381
/// # Example
13821382
/// ```rust,no_run
1383-
/// # use imgui::*;
1383+
/// # use aflak_imgui::*;
13841384
/// # let mut imgui = ImGui::init();
13851385
/// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
13861386
/// let red = (1.0, 0.0, 0.0, 1.0);
@@ -1430,8 +1430,8 @@ impl<'ui> Ui<'ui> {
14301430
/// # Examples
14311431
///
14321432
/// ```
1433-
/// # #[macro_use] extern crate imgui;
1434-
/// # use imgui::*;
1433+
/// # #[macro_use] extern crate aflak_imgui;
1434+
/// # use aflak_imgui::*;
14351435
/// fn user_interface(ui: &Ui) {
14361436
/// ui.text("Hover over me");
14371437
/// let is_hover_over_me_text_hovered = ui.is_item_hovered();
@@ -1472,7 +1472,7 @@ impl<'ui> Ui<'ui> {
14721472
/// # Examples
14731473
///
14741474
/// ```rust,no_run
1475-
/// # use imgui::*;
1475+
/// # use aflak_imgui::*;
14761476
/// fn custom_draw(ui: &Ui) {
14771477
/// let draw_list = ui.get_window_draw_list();
14781478
/// // Draw a line
@@ -1487,7 +1487,7 @@ impl<'ui> Ui<'ui> {
14871487
/// dropped.
14881488
///
14891489
/// ```rust
1490-
/// # use imgui::*;
1490+
/// # use aflak_imgui::*;
14911491
/// fn custom_draw(ui: &Ui) {
14921492
/// let draw_list = ui.get_window_draw_list();
14931493
/// // Draw something...
@@ -1514,12 +1514,12 @@ impl<'ui> Ui<'ui> {
15141514
/// ## Example using glium as back-end
15151515
///
15161516
/// ```rust,no_run
1517-
/// #[macro_use] extern crate imgui;
1517+
/// #[macro_use] extern crate aflak_imgui;
15181518
/// extern crate glium;
1519-
/// extern crate imgui_glium_renderer;
1519+
/// extern crate aflak_imgui_glium_renderer;
15201520
///
1521-
/// use imgui::*;
1522-
/// use imgui_glium_renderer::Texture;
1521+
/// use aflak_imgui::*;
1522+
/// use aflak_imgui_glium_renderer::Texture;
15231523
/// use glium::backend::Facade;
15241524
/// use glium::Texture2d;
15251525
///
@@ -1557,12 +1557,12 @@ impl<'ui> Ui<'ui> {
15571557
/// ## Example using glium as back-end
15581558
///
15591559
/// ```rust,no_run
1560-
/// #[macro_use] extern crate imgui;
1560+
/// #[macro_use] extern crate aflak_imgui;
15611561
/// extern crate glium;
1562-
/// extern crate imgui_glium_renderer;
1562+
/// extern crate aflak_imgui_glium_renderer;
15631563
///
1564-
/// use imgui::*;
1565-
/// use imgui_glium_renderer::Texture;
1564+
/// use aflak_imgui::*;
1565+
/// use aflak_imgui_glium_renderer::Texture;
15661566
/// use glium::backend::Facade;
15671567
///
15681568
/// fn make_a_texture<F: Facade>(ui: &Ui, facade: &F, data: Vec<Vec<(u8, u8, u8, u8)>>) {

‎src/window_draw_list.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ impl<'ui> WindowDrawList<'ui> {
8585
/// # Example
8686
///
8787
/// ```rust,no_run
88-
/// # use imgui::*;
88+
/// # use aflak_imgui::*;
8989
/// fn custom_drawing(ui: &Ui) {
9090
/// let draw_list = ui.get_window_draw_list();
9191
/// draw_list.channels_split(2, |channels| {

0 commit comments

Comments
 (0)