Mercurial > hg > truffle
comparison mxtool/mx.py @ 6533:250babea75d5
modified canonicalizeprojects to ensure all package prefixes match the enclosing project
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 08 Oct 2012 17:38:24 +0200 |
| parents | 3c5b19e8f2a3 |
| children | f938212e56ab |
comparison
equal
deleted
inserted
replaced
| 6532:0c6030872cd0 | 6533:250babea75d5 |
|---|---|
| 1495 m = pattern.match(line) | 1495 m = pattern.match(line) |
| 1496 if m is None: | 1496 if m is None: |
| 1497 out.write(line + '\n') | 1497 out.write(line + '\n') |
| 1498 else: | 1498 else: |
| 1499 p = project(m.group(1)) | 1499 p = project(m.group(1)) |
| 1500 | |
| 1501 for pkg in p.defined_java_packages(): | |
| 1502 if not pkg.startswith(p.name): | |
| 1503 abort('package in {0} does not have prefix matching project name: {1}'.format(p, pkg)) | |
| 1504 | |
| 1500 ignoredDeps = set([name for name in p.deps if project(name, False) is not None]) | 1505 ignoredDeps = set([name for name in p.deps if project(name, False) is not None]) |
| 1501 for pkg in p.imported_java_packages(): | 1506 for pkg in p.imported_java_packages(): |
| 1502 for name in p.deps: | 1507 for name in p.deps: |
| 1503 dep = project(name, False) | 1508 dep = project(name, False) |
| 1504 if dep is None: | 1509 if dep is None: |