Auto merge of #12447 - asajeffrey:license-mpl-2.0, r=frewsxcv

All our Cargo.toml files should contain an MPL-2.0 license field.

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

Added a `license = "MPL-2.0"` field to all our `Cargo.toml` files, and added a check to `test-tidy` that the license is present.

---
<!-- 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 #12434
- [X] There are tests for these changes

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

<!-- 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/12447)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-07-14 09:33:18 -07:00 committed by GitHub
commit 650d1d1185
43 changed files with 53 additions and 1 deletions

View file

@ -82,3 +82,9 @@ licenses = [
// except according to those terms.
""",
] # noqa: Indicate to flake8 that we do not want to check indentation here
# The valid licenses, in the form we'd expect to see them in a Cargo.toml file.
licenses_toml = [
'license = "MPL-2.0"',
'license = "MIT/Apache-2.0"',
]

View file

@ -17,7 +17,7 @@ import site
import StringIO
import subprocess
import sys
from licenseck import licenses
from licenseck import licenses, licenses_toml
# License and header checks
EMACS_HEADER = "/* -*- Mode:"
@ -295,9 +295,14 @@ duplicate versions for package "{package}"
def check_toml(file_name, lines):
if not file_name.endswith(".toml"):
raise StopIteration
ok_licensed = False
for idx, line in enumerate(lines):
if line.find("*") != -1:
yield (idx + 1, "found asterisk instead of minimum version number")
for license in licenses_toml:
ok_licensed |= (license in line)
if not ok_licensed:
yield (0, ".toml file should contain a valid license.")
def check_rust(file_name, lines):