Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-10-01 09:09:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #10857 - servo:toml, r=nox

Browse source 
Simplify TOML syntax

* Sections like `[dependencies.foo]` can be entries in a `[dependencies]` section with the `{key = value}` syntax.
* Per-target dependencies can be expressed with more general `cfg(…)` conditions instead of exact target triples: https://github.com/rust-lang/cargo/pull/2328

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10857)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-26 15:46:37 -07:00
commit 2729864af7
36 changed files with 285 additions and 898 deletions
Download patch file Download diff file Expand all files Collapse all files

79
ports/cef/Cargo.toml
View file

@ -20,63 +20,25 @@ euclid = {version = "0.6.4", features = ["plugins"]}
gleam = "0.2.8"
libc = "0.2"
url = {version = "1.0.0", features = ["heap_size"]}
servo = {path = "../../components/servo"}
glutin_app = {path = "../glutin"}
plugins = {path = "../../components/plugins"}
compositing = {path = "../../components/compositing"}
gfx = {path = "../../components/gfx"}
log = {version = "0.3.5", features = ["release_max_level_info"]}
script = {path = "../../components/script"}
script_traits = {path = "../../components/script_traits"}
net_traits = {path = "../../components/net_traits"}
msg = {path = "../../components/msg"}
util = {path = "../../components/util", features = ["non-geckolib"]}
style = {path = "../../components/style"}
style_traits = {path = "../../components/style_traits"}
devtools = {path = "../../components/devtools"}
azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
js = {git = "https://github.com/servo/rust-mozjs"}
layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
[dependencies.servo]
path = "../../components/servo"
[dependencies.glutin_app]
path = "../glutin"
[dependencies.plugins]
path = "../../components/plugins"
[dependencies.compositing]
path = "../../components/compositing"
[dependencies.gfx]
path = "../../components/gfx"
[dependencies.log]
version = "0.3.5"
features = ["release_max_level_info"]
[dependencies.script]
path = "../../components/script"
[dependencies.script_traits]
path = "../../components/script_traits"
[dependencies.net_traits]
path = "../../components/net_traits"
[dependencies.msg]
path = "../../components/msg"
[dependencies.util]
path = "../../components/util"
features = ["non-geckolib"]
[dependencies.style]
path = "../../components/style"
[dependencies.style_traits]
path = "../../components/style_traits"
[dependencies.devtools]
path = "../../components/devtools"
[dependencies.azure]
git = "https://github.com/servo/rust-azure"
features = ["plugins"]
[dependencies.js]
git = "https://github.com/servo/rust-mozjs"
[dependencies.layers]
git = "https://github.com/servo/rust-layers"
features = ["plugins"]
[target.x86_64-apple-darwin.dependencies]
[target.'cfg(target_os="macos")'.dependencies]
objc = "0.2"
cocoa = "0.3"
core-foundation = "0.2"
@ -84,8 +46,5 @@ core-graphics = "0.3"
core-text = "1.1"
cgl = "0.1"
[target.i686-unknown-linux-gnu.dependencies]
x11 = "2.3"
[target.x86_64-unknown-linux-gnu.dependencies]
[target.'cfg(target_os="linux")'.dependencies]
x11 = "2.3"

18
ports/geckolib/Cargo.toml
View file

@ -24,17 +24,7 @@ selectors = {version = "0.5", features = ["heap_size", "unstable"]}
smallvec = "0.1"
string_cache = {version = "0.2.12", features = ["heap_size", "unstable"]}
url = {version = "1.0.0", features = ["heap_size", "query_encoding", "serde"]}
[dependencies.log]
version = "0.3.5"
features = ["release_max_level_info"]
[dependencies.plugins]
path = "../../components/plugins"
[dependencies.util]
path = "../../components/util"
[dependencies.style]
path = "../../components/style"
features = ["gecko"]
log = {version = "0.3.5", features = ["release_max_level_info"]}
plugins = {path = "../../components/plugins"}
util = {path = "../../components/util"}
style = {path = "../../components/style", features = ["gecko"]}

42
ports/glutin/Cargo.toml
View file

@ -13,40 +13,16 @@ url = {version = "1.0.0", features = ["heap_size"]}
gleam = "0.2.8"
euclid = {version = "0.6.4", features = ["plugins"]}
servo-glutin = "0.4"
compositing = {path = "../../components/compositing"}
script_traits = {path = "../../components/script_traits"}
layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
msg = {path = "../../components/msg"}
net_traits = {path = "../../components/net_traits"}
style_traits = {path = "../../components/style_traits"}
util = {path = "../../components/util"}
[dependencies.compositing]
path = "../../components/compositing"
[dependencies.script_traits]
path = "../../components/script_traits"
[dependencies.layers]
git = "https://github.com/servo/rust-layers"
features = ["plugins"]
[dependencies.msg]
path = "../../components/msg"
[dependencies.net_traits]
path = "../../components/net_traits"
[dependencies.style_traits]
path = "../../components/style_traits"
[dependencies.util]
path = "../../components/util"
[target.i686-unknown-linux-gnu.dependencies]
[target.'cfg(target_os = "linux")'.dependencies]
x11 = "2.0.0"
[target.x86_64-unknown-linux-gnu.dependencies]
x11 = "2.0.0"
[target.arm-unknown-linux-gnueabihf.dependencies]
x11 = "2.0.0"
[target.aarch64-unknown-linux-gnu.dependencies]
x11 = "2.0.0"
[target.arm-linux-androideabi.dependencies]
[target.'cfg(target_os = "android")'.dependencies]
servo-egl = "0.2"

55
ports/gonk/Cargo.toml
View file

@ -5,49 +5,20 @@ authors = ["The Servo Project Developers"]
build = "build.rs"
[dependencies.compositing]
path = "../../components/compositing"
[dependencies.layers]
git = "https://github.com/servo/rust-layers"
features = ["plugins"]
[dependencies.msg]
path = "../../components/msg"
[dependencies.script]
path = "../../components/script"
[dependencies.script_traits]
path = "../../components/script_traits"
[dependencies.style_traits]
path = "../../components/style_traits"
[dependencies.net_traits]
path = "../../components/net_traits"
[dependencies.gfx]
path = "../../components/gfx"
[dependencies.layout]
path = "../../components/layout"
[dependencies.devtools]
path = "../../components/devtools"
[dependencies.servo]
path = "../../components/servo"
default-features = false
[dependencies.profile]
path = "../../components/profile"
[dependencies.util]
path = "../../components/util"
features = ["non-geckolib"]
[dependencies]
compositing = {path = "../../components/compositing"}
layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
msg = {path = "../../components/msg"}
script = {path = "../../components/script"}
script_traits = {path = "../../components/script_traits"}
style_traits = {path = "../../components/style_traits"}
net_traits = {path = "../../components/net_traits"}
gfx = {path = "../../components/gfx"}
layout = {path = "../../components/layout"}
devtools = {path = "../../components/devtools"}
servo = {path = "../../components/servo", default-features = false}
profile = {path = "../../components/profile"}
util = {path = "../../components/util", features = ["non-geckolib"]}
env_logger = "0.3"
url = {version = "1.0.0", features = ["heap_size"]}
time = "0.1.17"