diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index c5fa8e2c29b..40615055534 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -30,7 +30,7 @@ path = "../../tests/contenttest.rs" harness = false [features] -default = ["window"] +default = ["glutin_app", "window"] window = ["glutin_app/window"] headless = ["glutin_app/headless"] @@ -60,6 +60,7 @@ path = "../devtools" [dependencies.glutin_app] path = "../../ports/glutin" +optional = true [dependencies.android_glue] path = "../../support/android-rs-glue/glue" diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 64d595018ed..6340e1c3448 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -12,14 +12,6 @@ dependencies = [ "util 0.0.1", ] -[[package]] -name = "android_glue" -version = "0.0.1" -source = "git+https://github.com/tomaka/android-rs-glue#ebea1a239b15fb83caf9c9749d3421650522dc99" -dependencies = [ - "compile_msg 0.1.3 (git+https://github.com/huonw/compile_msg)", -] - [[package]] name = "azure" version = "0.1.0" @@ -35,11 +27,6 @@ dependencies = [ "xlib 0.1.0 (git+https://github.com/servo/rust-xlib)", ] -[[package]] -name = "bitflags" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "canvas" version = "0.0.1" @@ -58,19 +45,6 @@ dependencies = [ "gleam 0.0.1 (git+https://github.com/servo/gleam)", ] -[[package]] -name = "cocoa" -version = "0.1.1" -source = "git+https://github.com/servo/rust-cocoa#7f976d95666fec0fd1382e305d534a5e73586a3d" -dependencies = [ - "bitflags 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "compile_msg" -version = "0.1.3" -source = "git+https://github.com/huonw/compile_msg#b19da50cacf5b11bbc065da6b449f6b4fe7c019a" - [[package]] name = "compositing" version = "0.0.1" @@ -258,14 +232,6 @@ name = "gcc" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "gdi32-sys" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "geom" version = "0.1.0" @@ -302,19 +268,6 @@ name = "gl_common" version = "0.0.3" source = "git+https://github.com/bjz/gl-rs.git#230e6c9ed611cddfcb6682dee9686471d54863d0" -[[package]] -name = "gl_common" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "gl_common" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "gl_generator" version = "0.0.12" @@ -326,17 +279,6 @@ dependencies = [ "xml-rs 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "gl_generator" -version = "0.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "gl_common 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xml-rs 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "gleam" version = "0.0.1" @@ -346,40 +288,6 @@ dependencies = [ "gl_generator 0.0.12 (git+https://github.com/bjz/gl-rs.git)", ] -[[package]] -name = "glutin" -version = "0.0.4-pre" -source = "git+https://github.com/servo/glutin?branch=servo#7d602af694bdb400944990846f91d1043e2a2bc8" -dependencies = [ - "android_glue 0.0.1 (git+https://github.com/tomaka/android-rs-glue)", - "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)", - "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", - "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)", - "gdi32-sys 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.0.15 (registry+https://github.com/rust-lang/crates.io-index)", - "kernel32-sys 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "user32-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "glutin_app" -version = "0.0.1" -dependencies = [ - "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)", - "compositing 0.0.1", - "egl 0.1.0 (git+https://github.com/servo/rust-egl)", - "geom 0.1.0 (git+https://github.com/servo/rust-geom)", - "gleam 0.0.1 (git+https://github.com/servo/gleam)", - "glutin 0.0.4-pre (git+https://github.com/servo/glutin?branch=servo)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers)", - "msg 0.0.1", - "time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "util 0.0.1", -] - [[package]] name = "glx" version = "0.0.1" @@ -448,24 +356,11 @@ dependencies = [ "mozjs-sys 0.0.0 (git+https://github.com/servo/mozjs)", ] -[[package]] -name = "kernel32-sys" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "khronos_api" version = "0.0.5" source = "git+https://github.com/bjz/gl-rs.git#230e6c9ed611cddfcb6682dee9686471d54863d0" -[[package]] -name = "khronos_api" -version = "0.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "layers" version = "0.1.0" @@ -520,11 +415,6 @@ name = "lazy_static" version = "0.1.6" source = "git+https://github.com/Kimundi/lazy-static.rs#31a7aa0176ecd70b4aab274a40d1e2cd78c1fbf8" -[[package]] -name = "libc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "libressl-pnacl-sys" version = "2.1.0" @@ -720,7 +610,6 @@ dependencies = [ "compositing 0.0.1", "devtools 0.0.1", "gfx 0.0.1", - "glutin_app 0.0.1", "layout 0.0.1", "msg 0.0.1", "net 0.0.1", @@ -819,14 +708,6 @@ dependencies = [ "rustc-serialize 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "user32-sys" -version = "0.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "util" version = "0.0.1" @@ -851,11 +732,6 @@ dependencies = [ "rustc-serialize 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "winapi" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "xlib" version = "0.1.0"