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

style: Use the mozbuild crate in servo

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D136562
This commit is contained in:
Mike Hommey 2023-06-06 23:48:37 +02:00 • committed by Oriol Brufau
parent d32c5ed85f
commit d3aeba6bd3
2 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/style/Cargo.toml
View file

@ -17,7 +17,7 @@ path = "lib.rs"
doctest = false doctest = false
[features] [features]
gecko = ["style_traits/gecko", "bindgen", "regex", "toml", "num_cpus"] gecko = ["style_traits/gecko", "bindgen", "regex", "toml", "num_cpus", "mozbuild"]
servo = ["serde", "style_traits/servo", "servo_atoms", "servo_config", "html5ever", servo = ["serde", "style_traits/servo", "servo_atoms", "servo_config", "html5ever",
"cssparser/serde", "encoding_rs", "malloc_size_of/servo", "servo_url", "cssparser/serde", "encoding_rs", "malloc_size_of/servo", "servo_url",
"string_cache", "to_shmem/servo", "string_cache", "to_shmem/servo",
@ -79,6 +79,7 @@ void = "1.0.2"
bindgen = { version = "0.62", optional = true, default-features = false } bindgen = { version = "0.62", optional = true, default-features = false }
lazy_static = "1" lazy_static = "1"
log = "0.4" log = "0.4"
mozbuild = {version = "0.1", optional = true}
regex = { version = "1.1", optional = true } regex = { version = "1.1", optional = true }
toml = { version = "0.5", optional = true, default-features = false } toml = { version = "0.5", optional = true, default-features = false }
walkdir = "2.1.4" walkdir = "2.1.4"

14
components/style/build_gecko.rs
View file

@ -42,14 +42,12 @@ fn read_config(path: &PathBuf) -> Table {
lazy_static! { lazy_static! {
static ref CONFIG: Table = { static ref CONFIG: Table = {
// Load Gecko's binding generator config from the source tree. // Load Gecko's binding generator config from the source tree.
let path = PathBuf::from(env::var_os("MOZ_SRC").unwrap()) let path = mozbuild::TOPSRCDIR.join("layout/style/ServoBindings.toml");
.join("layout/style/ServoBindings.toml");
read_config(&path) read_config(&path)
}; };
static ref BINDGEN_FLAGS: Vec<String> = { static ref BINDGEN_FLAGS: Vec<String> = {
// Load build-specific config overrides. // Load build-specific config overrides.
let path = PathBuf::from(env::var_os("MOZ_TOPOBJDIR").unwrap()) let path = mozbuild::TOPOBJDIR.join("layout/style/extra-bindgen-flags");
.join("layout/style/extra-bindgen-flags");
println!("cargo:rerun-if-changed={}", path.to_str().unwrap()); println!("cargo:rerun-if-changed={}", path.to_str().unwrap());
fs::read_to_string(path).expect("Failed to read extra-bindgen-flags file") fs::read_to_string(path).expect("Failed to read extra-bindgen-flags file")
.split_whitespace() .split_whitespace()
@ -57,13 +55,7 @@ lazy_static! {
.collect() .collect()
}; };
static ref INCLUDE_RE: Regex = Regex::new(r#"#include\s*"(.+?)""#).unwrap(); static ref INCLUDE_RE: Regex = Regex::new(r#"#include\s*"(.+?)""#).unwrap();
static ref DISTDIR_PATH: PathBuf = { static ref DISTDIR_PATH: PathBuf = mozbuild::TOPOBJDIR.join("dist");
let path = PathBuf::from(env::var_os("MOZ_TOPOBJDIR").unwrap());
if !path.is_absolute() || !path.is_dir() {
panic!("MOZ_TOPOBJDIR must be an absolute directory, was: {}", path.display());
}
path.join("dist")
};
static ref SEARCH_PATHS: Vec<PathBuf> = vec![ static ref SEARCH_PATHS: Vec<PathBuf> = vec![
DISTDIR_PATH.join("include"), DISTDIR_PATH.join("include"),
DISTDIR_PATH.join("include/nspr"), DISTDIR_PATH.join("include/nspr"),