Skip to content

Commit 966da11

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
1 parent 6ccfbf0 commit 966da11

File tree

17 files changed

+61
-52
lines changed

17 files changed

+61
-52
lines changed

‎Cargo.toml

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
[package]
2-
name = "imgui"
3-
version = "0.0.21-pre"
4-
authors = ["Joonas Javanainen <[email protected]>", "imgui-rs contributors"]
2+
name = "aflak_imgui"
3+
version = "0.20.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.21-pre", path = "imgui-sys" }
15+
aflak_imgui-sys = { version = "0.20.1", path = "imgui-sys" }
16+
17+
[dev-dependencies]
18+
glium = { version = "0.22", default-features = true }
19+
aflak_imgui-glium-renderer = { path = "imgui-glium-renderer", version = "0.20.1" }
1720

1821
[workspace]
1922
members = ["imgui-examples", "imgui-sys", "imgui-gfx-renderer", "imgui-glium-renderer", "imgui-glutin-support"]

‎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.21-pre", path = "../" }
16+
aflak_imgui = { version = "0.20.1", path = "../" }
1717
imgui-gfx-renderer = { version = "0.0.21-pre", path = "../imgui-gfx-renderer" }
18-
imgui-glium-renderer = { version = "0.0.21-pre", path = "../imgui-glium-renderer" }
18+
aflak_imgui-glium-renderer = { version = "0.20.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/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.21-pre", path = "../" }
17-
imgui-sys = { version = "0.0.21-pre", path = "../imgui-sys", features = ["gfx"] }
16+
aflak_imgui = { version = "0.20.1", path = "../" }
17+
aflak_imgui-sys = { version = "0.20.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
use gfx::handle::{Buffer, RenderTargetView};
66
use gfx::memory::Bind;

‎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.21-pre"
2+
name = "aflak_imgui-glium-renderer"
3+
version = "0.20.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.21-pre", path = "../" }
17-
imgui-sys = { version = "0.0.21-pre", path = "../imgui-sys", features = ["glium"] }
13+
aflak_imgui = { version = "0.20.1", path = "../" }
14+
aflak_imgui-sys = { version = "0.20.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
use glium::backend::{Context, Facade};
66
use glium::index::{self, PrimitiveType};

‎imgui-glutin-support/Cargo.toml

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

1414
[dependencies]
1515
glutin = ">= 0.17, <= 0.18"
16-
imgui = { version = "0.0.21-pre", path = "../" }
16+
aflak_imgui = { version = "0.20.1", path = "../" }

‎imgui-glutin-support/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//! In your initialization code call `configure_keys`:
66
//!
77
//! ```rust,no_run
8-
//! # extern crate imgui;
8+
//! # extern crate aflak_imgui as imgui;
99
//! # extern crate imgui_glutin_support;
1010
//! use imgui::ImGui;
1111
//!
@@ -20,7 +20,7 @@
2020
//!
2121
//! ```rust,no_run
2222
//! # extern crate glutin;
23-
//! # extern crate imgui;
23+
//! # extern crate aflak_imgui as imgui;
2424
//! # extern crate imgui_glutin_support;
2525
//! # use glutin::EventsLoop;
2626
//! # use imgui::ImGui;
@@ -44,7 +44,7 @@
4444
//!
4545
//! ```rust,no_run
4646
//! # extern crate glutin;
47-
//! # extern crate imgui;
47+
//! # extern crate aflak_imgui as imgui;
4848
//! # extern crate imgui_glutin_support;
4949
//! # use glutin::{EventsLoop, Event, WindowEvent, MouseScrollDelta, TouchPhase};
5050
//! # use imgui::ImGui;
@@ -75,8 +75,8 @@
7575
//! # }
7676
//! ```
7777
78+
extern crate aflak_imgui as imgui;
7879
extern crate glutin;
79-
extern crate imgui;
8080

8181
use glutin::{
8282
ElementState, Event, KeyboardInput, ModifiersState, MouseButton, MouseCursor, MouseScrollDelta,

‎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.21-pre"
2+
name = "aflak_imgui-sys"
3+
version = "0.20.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

+16-4
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,6 +360,7 @@ impl ImGui {
360360
/// # Example
361361
///
362362
/// ```rust
363+
/// # #[macro_use] extern crate aflak_imgui as imgui;
363364
/// use imgui::{ImGuiKey, Ui};
364365
///
365366
/// fn test(ui: &Ui) {
@@ -1126,7 +1127,7 @@ impl<'ui> Ui<'ui> {
11261127
/// # Examples
11271128
///
11281129
/// ```
1129-
/// # #[macro_use] extern crate imgui;
1130+
/// # #[macro_use] extern crate aflak_imgui as imgui;
11301131
/// # use imgui::*;
11311132
/// fn user_interface(ui: &Ui) {
11321133
/// ui.text("Hover over me");
@@ -1151,7 +1152,7 @@ impl<'ui> Ui<'ui> {
11511152
/// # Examples
11521153
///
11531154
/// ```
1154-
/// # #[macro_use] extern crate imgui;
1155+
/// # #[macro_use] extern crate aflak_imgui as imgui;
11551156
/// # use imgui::*;
11561157
/// fn user_interface(ui: &Ui) {
11571158
/// ui.text("Hover over me");
@@ -1216,6 +1217,7 @@ impl<'ui> Ui<'ui> {
12161217
///
12171218
/// # Example
12181219
/// ```rust,no_run
1220+
/// # #[macro_use] extern crate aflak_imgui as imgui;
12191221
/// # use imgui::*;
12201222
/// # let mut imgui = ImGui::init();
12211223
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1290,6 +1292,7 @@ impl<'ui> Ui<'ui> {
12901292
///
12911293
/// # Example
12921294
/// ```rust,no_run
1295+
/// # #[macro_use] extern crate aflak_imgui as imgui;
12931296
/// # use imgui::*;
12941297
/// # let mut imgui = ImGui::init();
12951298
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1307,6 +1310,7 @@ impl<'ui> Ui<'ui> {
13071310
///
13081311
/// # Example
13091312
/// ```rust,no_run
1313+
/// # #[macro_use] extern crate aflak_imgui as imgui;
13101314
/// # use imgui::*;
13111315
/// # let mut imgui = ImGui::init();
13121316
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1396,6 +1400,7 @@ impl<'ui> Ui<'ui> {
13961400
///
13971401
/// # Example
13981402
/// ```rust,no_run
1403+
/// # #[macro_use] extern crate aflak_imgui as imgui;
13991404
/// # use imgui::*;
14001405
/// # let mut imgui = ImGui::init();
14011406
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1414,6 +1419,7 @@ impl<'ui> Ui<'ui> {
14141419
///
14151420
/// # Example
14161421
/// ```rust,no_run
1422+
/// # #[macro_use] extern crate aflak_imgui as imgui;
14171423
/// # use imgui::*;
14181424
/// # let mut imgui = ImGui::init();
14191425
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1444,6 +1450,7 @@ impl<'ui> Ui<'ui> {
14441450
///
14451451
/// # Example
14461452
/// ```rust,no_run
1453+
/// # #[macro_use] extern crate aflak_imgui as imgui;
14471454
/// # use imgui::*;
14481455
/// # let mut imgui = ImGui::init();
14491456
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1462,6 +1469,7 @@ impl<'ui> Ui<'ui> {
14621469
///
14631470
/// # Example
14641471
/// ```rust,no_run
1472+
/// # #[macro_use] extern crate aflak_imgui as imgui;
14651473
/// # use imgui::*;
14661474
/// # let mut imgui = ImGui::init();
14671475
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1512,6 +1520,7 @@ impl<'ui> Ui<'ui> {
15121520
///
15131521
/// # Example
15141522
/// ```rust,no_run
1523+
/// # #[macro_use] extern crate aflak_imgui as imgui;
15151524
/// # use imgui::*;
15161525
/// # let mut imgui = ImGui::init();
15171526
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1538,6 +1547,7 @@ impl<'ui> Ui<'ui> {
15381547
///
15391548
/// # Example
15401549
/// ```rust,no_run
1550+
/// # #[macro_use] extern crate aflak_imgui as imgui;
15411551
/// # use imgui::*;
15421552
/// # let mut imgui = ImGui::init();
15431553
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1588,7 +1598,7 @@ impl<'ui> Ui<'ui> {
15881598
/// # Examples
15891599
///
15901600
/// ```
1591-
/// # #[macro_use] extern crate imgui;
1601+
/// # #[macro_use] extern crate aflak_imgui as imgui;
15921602
/// # use imgui::*;
15931603
/// fn user_interface(ui: &Ui) {
15941604
/// ui.text("Hover over me");
@@ -1647,6 +1657,7 @@ impl<'ui> Ui<'ui> {
16471657
/// # Examples
16481658
///
16491659
/// ```rust,no_run
1660+
/// # #[macro_use] extern crate aflak_imgui as imgui;
16501661
/// # use imgui::*;
16511662
/// fn custom_draw(ui: &Ui) {
16521663
/// let draw_list = ui.get_window_draw_list();
@@ -1662,6 +1673,7 @@ impl<'ui> Ui<'ui> {
16621673
/// dropped.
16631674
///
16641675
/// ```rust
1676+
/// # #[macro_use] extern crate aflak_imgui as imgui;
16651677
/// # use imgui::*;
16661678
/// fn custom_draw(ui: &Ui) {
16671679
/// let draw_list = ui.get_window_draw_list();

‎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)