Auto merge of #13097 - crypto-universe:mako_task, r=SimonSapin

Mako task

<!-- Please describe your changes on the following line: -->
Remove mako zip

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [X] These changes fix #12958 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

r? @SimonSapin

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13097)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-09-01 16:47:10 -05:00 committed by GitHub
commit e4362356d2
4 changed files with 5 additions and 1 deletions

View file

@ -7,7 +7,6 @@ import os.path
import sys import sys
BASE = os.path.dirname(__file__.replace('\\', '/')) BASE = os.path.dirname(__file__.replace('\\', '/'))
sys.path.insert(0, os.path.join(BASE, "Mako-0.9.1.zip"))
sys.path.insert(0, BASE) # For importing `data.py` sys.path.insert(0, BASE) # For importing `data.py`
from mako import exceptions from mako import exceptions

View file

@ -10,6 +10,7 @@ toml == 0.9.1
flake8 == 2.4.1 flake8 == 2.4.1
pep8 == 1.5.7 pep8 == 1.5.7
pyflakes == 0.8.1 pyflakes == 0.8.1
mako == 0.9.1
# For test-webidl # For test-webidl
ply == 3.8 ply == 3.8

View file

@ -32,6 +32,10 @@ fn properties_list_json() {
#[cfg(windows)] #[cfg(windows)]
fn find_python() -> String { fn find_python() -> String {
if Command::new("python2.7.exe").arg("--version").output().is_ok() {
return "python2.7.exe".to_owned();
}
if Command::new("python27.exe").arg("--version").output().is_ok() { if Command::new("python27.exe").arg("--version").output().is_ok() {
return "python27.exe".to_owned(); return "python27.exe".to_owned();
} }