From eb713ac5147454c3998b2d55a8fe3e9f12990038 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 30 Jul 2020 12:14:51 +0200 Subject: [PATCH] [build] use path dependencies in all Cargo.toml --- Cargo.lock | 55 +++++----------------------------------- demo_glium/Cargo.toml | 6 +++-- demo_web/Cargo.toml | 6 +++-- egui_glium/Cargo.toml | 3 +-- egui_web/Cargo.toml | 3 +-- example_glium/Cargo.toml | 6 +++-- 6 files changed, 20 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6d12a171..c4ebe40d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -379,8 +379,8 @@ dependencies = [ name = "demo_glium" version = "0.1.0" dependencies = [ - "egui 0.1.2 (git+https://github.com/emilk/emigui)", - "egui_glium 0.1.0 (git+https://github.com/emilk/emigui)", + "egui 0.1.2", + "egui_glium 0.1.0", "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -388,8 +388,8 @@ dependencies = [ name = "demo_web" version = "0.1.0" dependencies = [ - "egui 0.1.2 (git+https://github.com/emilk/emigui)", - "egui_web 0.1.0 (git+https://github.com/emilk/emigui)", + "egui 0.1.2", + "egui_web 0.1.0", "js-sys 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", @@ -424,18 +424,6 @@ name = "downcast-rs" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "egui" -version = "0.1.2" -source = "git+https://github.com/emilk/emigui#e3d1d6c99ce37090d496b4f210aaef700235dd9b" -dependencies = [ - "ahash 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rusttype 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "egui" version = "0.1.2" @@ -448,20 +436,6 @@ dependencies = [ "serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "egui_glium" -version = "0.1.0" -source = "git+https://github.com/emilk/emigui#e3d1d6c99ce37090d496b4f210aaef700235dd9b" -dependencies = [ - "chrono 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", - "clipboard 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "egui 0.1.2 (git+https://github.com/emilk/emigui)", - "glium 0.27.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", - "webbrowser 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "egui_glium" version = "0.1.0" @@ -475,20 +449,6 @@ dependencies = [ "webbrowser 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "egui_web" -version = "0.1.0" -source = "git+https://github.com/emilk/emigui#e3d1d6c99ce37090d496b4f210aaef700235dd9b" -dependencies = [ - "egui 0.1.2 (git+https://github.com/emilk/emigui)", - "js-sys 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "web-sys 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "egui_web" version = "0.1.0" @@ -511,8 +471,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "example_glium" version = "0.1.0" dependencies = [ - "egui 0.1.2 (git+https://github.com/emilk/emigui)", - "egui_glium 0.1.0 (git+https://github.com/emilk/emigui)", + "egui 0.1.2", + "egui_glium 0.1.0", "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1729,9 +1689,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum dispatch 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" "checksum dlib 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76" "checksum downcast-rs 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" -"checksum egui 0.1.2 (git+https://github.com/emilk/emigui)" = "" -"checksum egui_glium 0.1.0 (git+https://github.com/emilk/emigui)" = "" -"checksum egui_web 0.1.0 (git+https://github.com/emilk/emigui)" = "" "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" "checksum fnv 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" diff --git a/demo_glium/Cargo.toml b/demo_glium/Cargo.toml index 31aafecc..83db19e9 100644 --- a/demo_glium/Cargo.toml +++ b/demo_glium/Cargo.toml @@ -6,6 +6,8 @@ license = "MIT OR Apache-2.0" edition = "2018" [dependencies] -egui = { git = "https://github.com/emilk/emigui", features = ["with_serde"] } -egui_glium = { git = "https://github.com/emilk/emigui" } +#egui = { git = "https://github.com/emilk/emigui" } +egui = { path = "../egui", features = ["with_serde"] } +#egui_glium = { git = "https://github.com/emilk/emigui" } +egui_glium = { path = "../egui_glium" } serde = { version = "1", features = ["derive"] } diff --git a/demo_web/Cargo.toml b/demo_web/Cargo.toml index bb2c739d..abdfbd72 100644 --- a/demo_web/Cargo.toml +++ b/demo_web/Cargo.toml @@ -9,8 +9,10 @@ edition = "2018" crate-type = ["cdylib", "rlib"] [dependencies] -egui = { git = "https://github.com/emilk/emigui", features = ["with_serde"] } -egui_web = { git = "https://github.com/emilk/emigui" } +# egui = { git = "https://github.com/emilk/emigui", features = ["with_serde"] } +egui = { path = "../egui", features = ["with_serde"] } +# egui_web = { git = "https://github.com/emilk/emigui" } +egui_web = { path = "../egui_web" } js-sys = "0.3" serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/egui_glium/Cargo.toml b/egui_glium/Cargo.toml index 7b3e9acd..d769a347 100644 --- a/egui_glium/Cargo.toml +++ b/egui_glium/Cargo.toml @@ -6,10 +6,9 @@ license = "MIT OR Apache-2.0" edition = "2018" [dependencies] -egui = { path = "../egui", features = ["with_serde"] } - chrono = { version = "0.4" } clipboard = "0.5" +egui = { path = "../egui", features = ["with_serde"] } glium = "0.27" serde = "1" serde_json = "1" diff --git a/egui_web/Cargo.toml b/egui_web/Cargo.toml index afbb9eee..cef79ae9 100644 --- a/egui_web/Cargo.toml +++ b/egui_web/Cargo.toml @@ -9,14 +9,13 @@ edition = "2018" crate-type = ["cdylib", "rlib"] [dependencies] +egui = { path = "../egui", features = ["with_serde"] } js-sys = "0.3" parking_lot = "0.11" serde = "1" serde_json = "1" wasm-bindgen = "0.2" -egui = { path = "../egui", features = ["with_serde"] } - [dependencies.web-sys] version = "0.3" features = [ diff --git a/example_glium/Cargo.toml b/example_glium/Cargo.toml index 9530f0e8..aecf4d13 100644 --- a/example_glium/Cargo.toml +++ b/example_glium/Cargo.toml @@ -6,6 +6,8 @@ license = "MIT OR Apache-2.0" edition = "2018" [dependencies] -egui = { git = "https://github.com/emilk/emigui" } -egui_glium = { git = "https://github.com/emilk/emigui" } +#egui = { git = "https://github.com/emilk/emigui" } +egui = { path = "../egui" } +#egui_glium = { git = "https://github.com/emilk/emigui" } +egui_glium = { path = "../egui_glium" } serde = { version = "1", features = ["derive"] }