Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make geckolib build dependencies with the same features as Servo by default #11381

Merged
merged 1 commit into from May 25, 2016
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -20,7 +20,7 @@ bench = false

[features]
default = ["glutin_app", "webdriver", "max_log_level"]
max_log_level = ["env_logger/log/release_max_level_info"]
max_log_level = ["log/release_max_level_info"]
webdriver = ["webdriver_server"]
energy-profiling = ["profile_traits/energy-profiling"]

@@ -68,6 +68,7 @@ glutin_app = {path = "../../ports/glutin", optional = true}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
gleam = "0.2"
browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "gh-pages"}
log = "0.3"
env_logger = "0.3"
euclid = "0.6.4"
libc = "0.2"

Some generated files are not rendered by default. Learn more.

@@ -10,6 +10,19 @@ name = "geckoservo"
path = "lib.rs"
crate-type = ["staticlib"]

[features]
default = ["servo_features"]

# Features that aren't actually required for geckolib, but match the ones used
# in the full Servo build. Enabling this reduces the number of things
# recompiled when building both Servo and geckolib in the same source tree.
servo_features = [
"time",
"url/query_encoding",
"url/rustc-serialize",
"uuid",
]

[dependencies]
app_units = "0.2.3"
cssparser = "0.5.4"
@@ -20,13 +33,15 @@ heapsize_plugin = "0.1.2"
lazy_static = "0.2"
libc = "0.2"
num_cpus = "0.2.2"
selectors = "0.6"
selectors = {version = "0.6", features = ["unstable"]}
smallvec = "0.1"
string_cache = "0.2.17"
string_cache = {version = "0.2.17", features = ["unstable"]}
url = "1.0.0"
log = {version = "0.3.5", features = ["release_max_level_info"]}
plugins = {path = "../../components/plugins"}
time = {version = "0.1", optional = true, features = ["rustc-serialize"]}
util = {path = "../../components/util"}
uuid = {version = "0.2", optional = true, features = ["v4", "serde"]}
style = {path = "../../components/style", features = ["gecko"]}
env_logger = "0.3"

Some generated files are not rendered by default. Learn more.

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.