Skip to content

Commit 2dfd1ef

Browse files
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
1 parent 649b1bb commit 2dfd1ef

16 files changed

+70
-76
lines changed

Cargo.toml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
[package]
2-
name = "imgui"
3-
version = "0.0.20-pre"
4-
authors = ["Joonas Javanainen <[email protected]>", "imgui-rs contributors"]
2+
name = "aflak_imgui"
3+
version = "0.19.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.20-pre", path = "imgui-sys" }
15+
aflak_imgui-sys = { version = "0.19.1", path = "imgui-sys" }
1716

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

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

imgui-examples/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ gfx = "0.17"
1313
gfx_window_glutin = "0.26"
1414
glium = { version = "0.22", default-features = true }
1515
glutin = "0.18"
16-
imgui = { version = "0.0.20-pre", path = "../" }
16+
aflak_imgui = { version = "0.19.1", path = "../" }
1717
imgui-gfx-renderer = { version = "0.0.20-pre", path = "../imgui-gfx-renderer" }
18-
imgui-glium-renderer = { version = "0.0.20-pre", path = "../imgui-glium-renderer" }
18+
aflak_imgui-glium-renderer = { version = "0.19.1", path = "../imgui-glium-renderer" }

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ 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;
77

88
use imgui::*;

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 @@
1+
extern crate aflak_imgui as imgui;
2+
extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
13
extern crate glium;
2-
extern crate imgui;
3-
extern crate 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 @@
1+
extern crate aflak_imgui as imgui;
2+
extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
13
extern crate glium;
2-
extern crate imgui;
3-
extern crate 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.20-pre", path = "../" }
17-
imgui-sys = { version = "0.0.20-pre", path = "../imgui-sys", features = ["gfx"] }
16+
aflak_imgui = { version = "0.19.1", path = "../" }
17+
aflak_imgui-sys = { version = "0.19.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

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
[package]
2-
name = "imgui-glium-renderer"
3-
version = "0.0.20-pre"
2+
name = "aflak_imgui-glium-renderer"
3+
version = "0.19.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]
1512
glium = { version = "0.22", default-features = false }
16-
imgui = { version = "0.0.20-pre", path = "../" }
17-
imgui-sys = { version = "0.0.20-pre", path = "../imgui-sys", features = ["glium"] }
13+
aflak_imgui = { version = "0.19.1", path = "../" }
14+
aflak_imgui-sys = { version = "0.19.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 im_texture;
66
pub use im_texture::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.20-pre"
2+
name = "aflak_imgui-sys"
3+
version = "0.19.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;
@@ -383,7 +383,7 @@ impl ImGui {
383383
/// # Example
384384
///
385385
/// ```rust
386-
/// use imgui::{ImGuiKey, Ui};
386+
/// use aflak_imgui::{ImGuiKey, Ui};
387387
///
388388
/// fn test(ui: &Ui) {
389389
/// let delete_key_index = ui.imgui().get_key_index(ImGuiKey::Delete);
@@ -1128,8 +1128,8 @@ impl<'ui> Ui<'ui> {
11281128
/// # Examples
11291129
///
11301130
/// ```
1131-
/// # #[macro_use] extern crate imgui;
1132-
/// # use imgui::*;
1131+
/// # #[macro_use] extern crate aflak_imgui;
1132+
/// # use aflak_imgui::*;
11331133
/// fn user_interface(ui: &Ui) {
11341134
/// ui.text("Hover over me");
11351135
/// if ui.is_item_hovered() {
@@ -1153,8 +1153,8 @@ impl<'ui> Ui<'ui> {
11531153
/// # Examples
11541154
///
11551155
/// ```
1156-
/// # #[macro_use] extern crate imgui;
1157-
/// # use imgui::*;
1156+
/// # #[macro_use] extern crate aflak_imgui;
1157+
/// # use aflak_imgui::*;
11581158
/// fn user_interface(ui: &Ui) {
11591159
/// ui.text("Hover over me");
11601160
/// if ui.is_item_hovered() {
@@ -1270,7 +1270,7 @@ impl<'ui> Ui<'ui> {
12701270
///
12711271
/// # Example
12721272
/// ```rust,no_run
1273-
/// # use imgui::*;
1273+
/// # use aflak_imgui::*;
12741274
/// # let mut imgui = ImGui::init();
12751275
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
12761276
/// # let mut selected_radio_value = 2;
@@ -1287,7 +1287,7 @@ impl<'ui> Ui<'ui> {
12871287
///
12881288
/// # Example
12891289
/// ```rust,no_run
1290-
/// # use imgui::*;
1290+
/// # use aflak_imgui::*;
12911291
/// # let mut imgui = ImGui::init();
12921292
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
12931293
/// # let mut radio_button_test = "cats".to_string();
@@ -1366,7 +1366,7 @@ impl<'ui> Ui<'ui> {
13661366
///
13671367
/// # Example
13681368
/// ```rust,no_run
1369-
/// # use imgui::*;
1369+
/// # use aflak_imgui::*;
13701370
/// # let mut imgui = ImGui::init();
13711371
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
13721372
/// ui.progress_bar(0.6)
@@ -1384,7 +1384,7 @@ impl<'ui> Ui<'ui> {
13841384
///
13851385
/// # Example
13861386
/// ```rust,no_run
1387-
/// # use imgui::*;
1387+
/// # use aflak_imgui::*;
13881388
/// # let mut imgui = ImGui::init();
13891389
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
13901390
/// ui.window(im_str!("ChatWindow"))
@@ -1420,12 +1420,12 @@ impl<'ui> Ui<'ui> {
14201420
/// ## Example using glium as back-end
14211421
///
14221422
/// ```rust,no_run
1423-
/// #[macro_use] extern crate imgui;
1423+
/// #[macro_use] extern crate aflak_imgui;
14241424
/// extern crate glium;
1425-
/// extern crate imgui_glium_renderer;
1425+
/// extern crate aflak_imgui_glium_renderer;
14261426
///
1427-
/// use imgui::*;
1428-
/// use imgui_glium_renderer::Texture;
1427+
/// use aflak_imgui::*;
1428+
/// use aflak_imgui_glium_renderer::Texture;
14291429
/// use glium::backend::Facade;
14301430
///
14311431
/// fn make_a_texture<F: Facade>(ui: &Ui, facade: &F, data: Vec<Vec<(u8, u8, u8, u8)>>) {
@@ -1452,7 +1452,7 @@ impl<'ui> Ui<'ui> {
14521452
///
14531453
/// # Example
14541454
/// ```rust,no_run
1455-
/// # use imgui::*;
1455+
/// # use aflak_imgui::*;
14561456
/// # let mut imgui = ImGui::init();
14571457
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
14581458
/// ui.with_style_var(StyleVar::Alpha(0.2), || {
@@ -1470,7 +1470,7 @@ impl<'ui> Ui<'ui> {
14701470
///
14711471
/// # Example
14721472
/// ```rust,no_run
1473-
/// # use imgui::*;
1473+
/// # use aflak_imgui::*;
14741474
/// # let mut imgui = ImGui::init();
14751475
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
14761476
/// # let styles = [StyleVar::Alpha(0.2), StyleVar::WindowPadding(ImVec2::new(1.0, 1.0))];
@@ -1520,7 +1520,7 @@ impl<'ui> Ui<'ui> {
15201520
///
15211521
/// # Example
15221522
/// ```rust,no_run
1523-
/// # use imgui::*;
1523+
/// # use aflak_imgui::*;
15241524
/// # let mut imgui = ImGui::init();
15251525
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
15261526
/// ui.with_color_var(ImGuiCol::Text, (1.0, 0.0, 0.0, 1.0), || {
@@ -1546,7 +1546,7 @@ impl<'ui> Ui<'ui> {
15461546
///
15471547
/// # Example
15481548
/// ```rust,no_run
1549-
/// # use imgui::*;
1549+
/// # use aflak_imgui::*;
15501550
/// # let mut imgui = ImGui::init();
15511551
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
15521552
/// let red = (1.0, 0.0, 0.0, 1.0);
@@ -1596,8 +1596,8 @@ impl<'ui> Ui<'ui> {
15961596
/// # Examples
15971597
///
15981598
/// ```
1599-
/// # #[macro_use] extern crate imgui;
1600-
/// # use imgui::*;
1599+
/// # #[macro_use] extern crate aflak_imgui;
1600+
/// # use aflak_imgui::*;
16011601
/// fn user_interface(ui: &Ui) {
16021602
/// ui.text("Hover over me");
16031603
/// let is_hover_over_me_text_hovered = ui.is_item_hovered();
@@ -1640,7 +1640,7 @@ impl<'ui> Ui<'ui> {
16401640
/// # Examples
16411641
///
16421642
/// ```rust,no_run
1643-
/// # use imgui::*;
1643+
/// # use aflak_imgui::*;
16441644
/// fn custom_draw(ui: &Ui) {
16451645
/// let draw_list = ui.get_window_draw_list();
16461646
/// // Draw a line
@@ -1655,7 +1655,7 @@ impl<'ui> Ui<'ui> {
16551655
/// dropped.
16561656
///
16571657
/// ```rust
1658-
/// # use imgui::*;
1658+
/// # use aflak_imgui::*;
16591659
/// fn custom_draw(ui: &Ui) {
16601660
/// let draw_list = ui.get_window_draw_list();
16611661
/// // Draw something...
@@ -1682,12 +1682,12 @@ impl<'ui> Ui<'ui> {
16821682
/// ## Example using glium as back-end
16831683
///
16841684
/// ```rust,no_run
1685-
/// #[macro_use] extern crate imgui;
1685+
/// #[macro_use] extern crate aflak_imgui;
16861686
/// extern crate glium;
1687-
/// extern crate imgui_glium_renderer;
1687+
/// extern crate aflak_imgui_glium_renderer;
16881688
///
1689-
/// use imgui::*;
1690-
/// use imgui_glium_renderer::Texture;
1689+
/// use aflak_imgui::*;
1690+
/// use aflak_imgui_glium_renderer::Texture;
16911691
/// use glium::backend::Facade;
16921692
/// use glium::Texture2d;
16931693
///
@@ -1725,12 +1725,12 @@ impl<'ui> Ui<'ui> {
17251725
/// ## Example using glium as back-end
17261726
///
17271727
/// ```rust,no_run
1728-
/// #[macro_use] extern crate imgui;
1728+
/// #[macro_use] extern crate aflak_imgui;
17291729
/// extern crate glium;
1730-
/// extern crate imgui_glium_renderer;
1730+
/// extern crate aflak_imgui_glium_renderer;
17311731
///
1732-
/// use imgui::*;
1733-
/// use imgui_glium_renderer::Texture;
1732+
/// use aflak_imgui::*;
1733+
/// use aflak_imgui_glium_renderer::Texture;
17341734
/// use glium::backend::Facade;
17351735
///
17361736
/// 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
@@ -99,7 +99,7 @@ impl<'ui> WindowDrawList<'ui> {
9999
/// # Example
100100
///
101101
/// ```rust,no_run
102-
/// # use imgui::*;
102+
/// # use aflak_imgui::*;
103103
/// fn custom_drawing(ui: &Ui) {
104104
/// let draw_list = ui.get_window_draw_list();
105105
/// draw_list.channels_split(2, |channels| {

0 commit comments

Comments
 (0)