mirror of
https://github.com/servo/servo.git
synced 2025-08-04 21:20:23 +01:00
Show Mako template errors on the console
This commit is contained in:
parent
ff0549a923
commit
1094ce202c
1 changed files with 16 additions and 7 deletions
|
@ -5,12 +5,12 @@
|
||||||
use std::env;
|
use std::env;
|
||||||
use std::fs::File;
|
use std::fs::File;
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
use std::process::{Command, Stdio};
|
use std::process::{Command, Stdio, exit};
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
|
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
let python = if Command::new("python2.7").arg("--version").status().unwrap().success() {
|
let python = if Command::new("python2.7").arg("--version").output().unwrap().status.success() {
|
||||||
"python2.7"
|
"python2.7"
|
||||||
} else {
|
} else {
|
||||||
"python"
|
"python"
|
||||||
|
@ -22,14 +22,23 @@ fn main() {
|
||||||
.env("PYTHONPATH", &mako)
|
.env("PYTHONPATH", &mako)
|
||||||
.env("TEMPLATE", &template)
|
.env("TEMPLATE", &template)
|
||||||
.arg("-c")
|
.arg("-c")
|
||||||
.arg("from os import environ; from mako.template import Template; \
|
.arg(r#"
|
||||||
from mako import exceptions; \n\
|
import os
|
||||||
try:\n print(Template(filename=environ['TEMPLATE']).render());\n\
|
import sys
|
||||||
except:\n print exceptions.html_error_template().render()")
|
from mako.template import Template
|
||||||
|
from mako import exceptions
|
||||||
|
try:
|
||||||
|
print(Template(filename=os.environ['TEMPLATE']).render())
|
||||||
|
except:
|
||||||
|
sys.stderr.write(exceptions.text_error_template().render().encode('utf8'))
|
||||||
|
sys.exit(1)
|
||||||
|
"#)
|
||||||
.stderr(Stdio::inherit())
|
.stderr(Stdio::inherit())
|
||||||
.output()
|
.output()
|
||||||
.unwrap();
|
.unwrap();
|
||||||
assert!(result.status.success());
|
if !result.status.success() {
|
||||||
|
exit(1)
|
||||||
|
}
|
||||||
let out = env::var("OUT_DIR").unwrap();
|
let out = env::var("OUT_DIR").unwrap();
|
||||||
File::create(&Path::new(&out).join("properties.rs")).unwrap().write_all(&result.stdout).unwrap();
|
File::create(&Path::new(&out).join("properties.rs")).unwrap().write_all(&result.stdout).unwrap();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue