From 77aea599c76278d7efd92efbdae8392d7e93a832 Mon Sep 17 00:00:00 2001 From: Vladimir Vukicevic Date: Mon, 5 Oct 2015 12:08:11 -0400 Subject: win32: look for python.exe and variants on win32 in style/build.rs --- components/style/build.rs | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'components/style/build.rs') diff --git a/components/style/build.rs b/components/style/build.rs index 40bdc32b062..919c9959b67 100644 --- a/components/style/build.rs +++ b/components/style/build.rs @@ -8,12 +8,32 @@ use std::io::Write; use std::path::Path; use std::process::{Command, Stdio, exit}; +#[cfg(windows)] +fn find_python() -> String { + if Command::new("python27.exe").arg("--version").output().is_ok() { + return "python27.exe".to_owned(); + } -fn main() { - let python = if Command::new("python2.7").arg("--version").output().unwrap().status.success() { + if Command::new("python.exe").arg("--version").output().is_ok() { + return "python.exe".to_owned(); + } + + panic!("Can't find python (tried python27.exe and python.exe)! Try fixing PATH or setting the PYTHON env var"); +} + +#[cfg(not(windows))] +fn find_python() -> String { + if Command::new("python2.7").arg("--version").output().unwrap().status.success() { "python2.7" } else { "python" + }.to_owned() +} + +fn main() { + let python = match env::var("PYTHON") { + Ok(python_path) => python_path, + Err(_) => find_python(), }; let style = Path::new(file!()).parent().unwrap(); let mako = style.join("Mako-0.9.1.zip"); -- cgit v1.2.3