Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move python path into a lazy static.

Browse source
This commit is contained in:
Xidorn Quan 2017-05-08 11:53:16 +10:00
parent 5b57c5513c
commit d44b904f08
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/style/build.rs
View file

@ -2,7 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#[cfg(feature = "gecko")]
#[macro_use] #[macro_use]
extern crate lazy_static; extern crate lazy_static;
#[cfg(feature = "bindgen")] #[cfg(feature = "bindgen")]
@ -53,6 +52,10 @@ fn find_python() -> String {
}.to_owned() }.to_owned()
} }
lazy_static! {
pub static ref PYTHON: String = env::var("PYTHON").ok().unwrap_or_else(find_python);
}
fn generate_properties() { fn generate_properties() {
for entry in WalkDir::new("properties") { for entry in WalkDir::new("properties") {
let entry = entry.unwrap(); let entry = entry.unwrap();
@ -64,10 +67,9 @@ fn generate_properties() {
} }
} }
let python = env::var("PYTHON").ok().unwrap_or_else(find_python);
let script = Path::new(file!()).parent().unwrap().join("properties").join("build.py"); let script = Path::new(file!()).parent().unwrap().join("properties").join("build.py");
let product = if cfg!(feature = "gecko") { "gecko" } else { "servo" }; let product = if cfg!(feature = "gecko") { "gecko" } else { "servo" };
let status = Command::new(python) let status = Command::new(&*PYTHON)
.arg(&script) .arg(&script)
.arg(product) .arg(product)
.arg("style-crate") .arg("style-crate")