Mercurial > hg > truffle

comparison mxtool/mx.py @ 16005:dea42a47850e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
made canonicalizeprojects handle projects depending on a missing jrelibrary
author Doug Simon <doug.simon@oracle.com>
date Tue, 03 Jun 2014 16:29:17 +0200
parents 674d4065e9fb
children a864a411fad3
comparison
equal deleted inserted replaced
16004:f5ae86b125fd 16005:dea42a47850e
2649 pattern = re.compile('project@([^@]+)@dependencies=.*') 2649 pattern = re.compile('project@([^@]+)@dependencies=.*')
2650 lineNo = 1 2650 lineNo = 1
2651 for line in f: 2651 for line in f:
2652 line = line.strip() 2652 line = line.strip()
2653 m = pattern.match(line) 2653 m = pattern.match(line)
2654 if m is None: 2654 p = project(m.group(1), fatalIfMissing=False) if m else None
2655 if m is None or p is None:
2655 out.write(line + '\n') 2656 out.write(line + '\n')
2656 else: 2657 else:
2657 p = project(m.group(1))
2658
2659 for pkg in p.defined_java_packages(): 2658 for pkg in p.defined_java_packages():
2660 if not pkg.startswith(p.name): 2659 if not pkg.startswith(p.name):
2661 abort('package in {0} does not have prefix matching project name: {1}'.format(p, pkg)) 2660 abort('package in {0} does not have prefix matching project name: {1}'.format(p, pkg))
2662 2661
2663 ignoredDeps = set([name for name in p.deps if project(name, False) is not None]) 2662 ignoredDeps = set([name for name in p.deps if project(name, False) is not None])