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

Auto merge of #8757 - servo:skia, r=mbrubeck

Browse source 
Use skia and deps from crates.io.

This makes the initial download for skia go from a 300 MB git repository to a 5 MB tarball. This should help with issues like #6132 and #7687.

Fix https://github.com/servo/skia/issues/70

This builds, but the at the moment causes a number of tidy errors for duplicated crates.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8757)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-12-03 12:58:29 +05:30
commit 8b95d7b8d8
26 changed files with 805 additions and 752 deletions
Download patch file Download diff file Expand all files Collapse all files

15
python/tidy.py
View file

@ -48,6 +48,8 @@ ignored_files = [
def should_check(file_name):
if os.path.basename(file_name) == "Cargo.lock":
return True
if ".#" in file_name:
return False
if os.path.splitext(file_name)[1] not in filetypes_to_check:
@ -181,12 +183,12 @@ def check_lock(file_name, contents):
packages[name] = (version, idx + 1, base_name)
elif all([packages[name][0] != version, name not in exceptions, base_name not in exceptions]):
line = idx + 1
version_1 = tuple(map(int, packages[name][0].split('.')))
version_2 = tuple(map(int, version.split('.')))
version_1 = tuple(map(maybe_int, packages[name][0].split('.')))
version_2 = tuple(map(maybe_int, version.split('.')))
if version_1 < version_2: # get the line & base package containing the older version
packages[name], (version, line, base_name) = (version, line, base_name), packages[name]
message = 'conflicting versions for package "%s"' % name
message = 'duplicate versions for package "%s"' % name
error = '\n\t\033[93mexpected maximum version "{}"\033[0m'.format(packages[name][0]) + \
'\n\t\033[91mbut, "{}" demands "{}"\033[0m' \
.format(base_name, version)
@ -198,6 +200,13 @@ def check_lock(file_name, contents):
idx += 1
def maybe_int(value):
try:
return int(value)
except ValueError:
return value
def check_toml(file_name, contents):
if not file_name.endswith(".toml"):
raise StopIteration