# HG changeset patch # User Doug Simon # Date 1349710704 -7200 # Node ID 250babea75d5f673455144d1ae800f6347233b02 # Parent 0c6030872cd0028a7a2486c2b0e5d75d40da7ba5 modified canonicalizeprojects to ensure all package prefixes match the enclosing project diff -r 0c6030872cd0 -r 250babea75d5 mxtool/mx.py --- a/mxtool/mx.py Mon Oct 08 17:36:51 2012 +0200 +++ b/mxtool/mx.py Mon Oct 08 17:38:24 2012 +0200 @@ -1497,6 +1497,11 @@ out.write(line + '\n') else: p = project(m.group(1)) + + for pkg in p.defined_java_packages(): + if not pkg.startswith(p.name): + abort('package in {0} does not have prefix matching project name: {1}'.format(p, pkg)) + ignoredDeps = set([name for name in p.deps if project(name, False) is not None]) for pkg in p.imported_java_packages(): for name in p.deps: