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 Oct 9, 2018
1 parent 6ccfbf0 commit 966da11
Show file tree
Hide file tree
Showing 17 changed files with 61 additions and 52 deletions.
21 changes: 12 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
[package]
name = "imgui"
version = "0.0.21-pre"
authors = ["Joonas Javanainen <joonas.javanainen@gmail.com>", "imgui-rs contributors"]
name = "aflak_imgui"
version = "0.20.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.21-pre", path = "imgui-sys" }
aflak_imgui-sys = { version = "0.20.1", path = "imgui-sys" }

[dev-dependencies]
glium = { version = "0.22", default-features = true }
aflak_imgui-glium-renderer = { path = "imgui-glium-renderer", version = "0.20.1" }

[workspace]
members = ["imgui-examples", "imgui-sys", "imgui-gfx-renderer", "imgui-glium-renderer", "imgui-glutin-support"]
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.21-pre", path = "../" }
aflak_imgui = { version = "0.20.1", path = "../" }
imgui-gfx-renderer = { version = "0.0.21-pre", path = "../imgui-gfx-renderer" }
imgui-glium-renderer = { version = "0.0.21-pre", path = "../imgui-glium-renderer" }
aflak_imgui-glium-renderer = { version = "0.20.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
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.21-pre", path = "../" }
imgui-sys = { version = "0.0.21-pre", path = "../imgui-sys", features = ["gfx"] }
aflak_imgui = { version = "0.20.1", path = "../" }
aflak_imgui-sys = { version = "0.20.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;

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

use glium::backend::{Context, Facade};
use glium::index::{self, PrimitiveType};
Expand Down
2 changes: 1 addition & 1 deletion imgui-glutin-support/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ travis-ci = { repository = "Gekkio/imgui-rs" }

[dependencies]
glutin = ">= 0.17, <= 0.18"
imgui = { version = "0.0.21-pre", path = "../" }
aflak_imgui = { version = "0.20.1", path = "../" }
8 changes: 4 additions & 4 deletions imgui-glutin-support/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//! In your initialization code call `configure_keys`:
//!
//! ```rust,no_run
//! # extern crate imgui;
//! # extern crate aflak_imgui as imgui;
//! # extern crate imgui_glutin_support;
//! use imgui::ImGui;
//!
Expand All @@ -20,7 +20,7 @@
//!
//! ```rust,no_run
//! # extern crate glutin;
//! # extern crate imgui;
//! # extern crate aflak_imgui as imgui;
//! # extern crate imgui_glutin_support;
//! # use glutin::EventsLoop;
//! # use imgui::ImGui;
Expand All @@ -44,7 +44,7 @@
//!
//! ```rust,no_run
//! # extern crate glutin;
//! # extern crate imgui;
//! # extern crate aflak_imgui as imgui;
//! # extern crate imgui_glutin_support;
//! # use glutin::{EventsLoop, Event, WindowEvent, MouseScrollDelta, TouchPhase};
//! # use imgui::ImGui;
Expand Down Expand Up @@ -75,8 +75,8 @@
//! # }
//! ```
extern crate aflak_imgui as imgui;
extern crate glutin;
extern crate imgui;

use glutin::{
ElementState, Event, KeyboardInput, ModifiersState, MouseButton, MouseCursor, MouseScrollDelta,
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.21-pre"
name = "aflak_imgui-sys"
version = "0.20.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
20 changes: 16 additions & 4 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 @@ -360,6 +360,7 @@ impl ImGui {
/// # Example
///
/// ```rust
/// # #[macro_use] extern crate aflak_imgui as imgui;
/// use imgui::{ImGuiKey, Ui};
///
/// fn test(ui: &Ui) {
Expand Down Expand Up @@ -1126,7 +1127,7 @@ impl<'ui> Ui<'ui> {
/// # Examples
///
/// ```
/// # #[macro_use] extern crate imgui;
/// # #[macro_use] extern crate aflak_imgui as imgui;
/// # use imgui::*;
/// fn user_interface(ui: &Ui) {
/// ui.text("Hover over me");
Expand All @@ -1151,7 +1152,7 @@ impl<'ui> Ui<'ui> {
/// # Examples
///
/// ```
/// # #[macro_use] extern crate imgui;
/// # #[macro_use] extern crate aflak_imgui as imgui;
/// # use imgui::*;
/// fn user_interface(ui: &Ui) {
/// ui.text("Hover over me");
Expand Down Expand Up @@ -1216,6 +1217,7 @@ impl<'ui> Ui<'ui> {
///
/// # Example
/// ```rust,no_run
/// # #[macro_use] extern crate aflak_imgui as imgui;
/// # use imgui::*;
/// # let mut imgui = ImGui::init();
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
Expand Down Expand Up @@ -1290,6 +1292,7 @@ impl<'ui> Ui<'ui> {
///
/// # Example
/// ```rust,no_run
/// # #[macro_use] extern crate aflak_imgui as imgui;
/// # use imgui::*;
/// # let mut imgui = ImGui::init();
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
Expand All @@ -1307,6 +1310,7 @@ impl<'ui> Ui<'ui> {
///
/// # Example
/// ```rust,no_run
/// # #[macro_use] extern crate aflak_imgui as imgui;
/// # use imgui::*;
/// # let mut imgui = ImGui::init();
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
Expand Down Expand Up @@ -1396,6 +1400,7 @@ impl<'ui> Ui<'ui> {
///
/// # Example
/// ```rust,no_run
/// # #[macro_use] extern crate aflak_imgui as imgui;
/// # use imgui::*;
/// # let mut imgui = ImGui::init();
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
Expand All @@ -1414,6 +1419,7 @@ impl<'ui> Ui<'ui> {
///
/// # Example
/// ```rust,no_run
/// # #[macro_use] extern crate aflak_imgui as imgui;
/// # use imgui::*;
/// # let mut imgui = ImGui::init();
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
Expand Down Expand Up @@ -1444,6 +1450,7 @@ impl<'ui> Ui<'ui> {
///
/// # Example
/// ```rust,no_run
/// # #[macro_use] extern crate aflak_imgui as imgui;
/// # use imgui::*;
/// # let mut imgui = ImGui::init();
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
Expand All @@ -1462,6 +1469,7 @@ impl<'ui> Ui<'ui> {
///
/// # Example
/// ```rust,no_run
/// # #[macro_use] extern crate aflak_imgui as imgui;
/// # use imgui::*;
/// # let mut imgui = ImGui::init();
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
Expand Down Expand Up @@ -1512,6 +1520,7 @@ impl<'ui> Ui<'ui> {
///
/// # Example
/// ```rust,no_run
/// # #[macro_use] extern crate aflak_imgui as imgui;
/// # use imgui::*;
/// # let mut imgui = ImGui::init();
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
Expand All @@ -1538,6 +1547,7 @@ impl<'ui> Ui<'ui> {
///
/// # Example
/// ```rust,no_run
/// # #[macro_use] extern crate aflak_imgui as imgui;
/// # use imgui::*;
/// # let mut imgui = ImGui::init();
/// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
Expand Down Expand Up @@ -1588,7 +1598,7 @@ impl<'ui> Ui<'ui> {
/// # Examples
///
/// ```
/// # #[macro_use] extern crate imgui;
/// # #[macro_use] extern crate aflak_imgui as imgui;
/// # use imgui::*;
/// fn user_interface(ui: &Ui) {
/// ui.text("Hover over me");
Expand Down Expand Up @@ -1647,6 +1657,7 @@ impl<'ui> Ui<'ui> {
/// # Examples
///
/// ```rust,no_run
/// # #[macro_use] extern crate aflak_imgui as imgui;
/// # use imgui::*;
/// fn custom_draw(ui: &Ui) {
/// let draw_list = ui.get_window_draw_list();
Expand All @@ -1662,6 +1673,7 @@ impl<'ui> Ui<'ui> {
/// dropped.
///
/// ```rust
/// # #[macro_use] extern crate aflak_imgui as imgui;
/// # use imgui::*;
/// fn custom_draw(ui: &Ui) {
/// let draw_list = ui.get_window_draw_list();
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 966da11

Please sign in to comment.