graal-jvmci-8: mxtool/mx.py comparison

comparison mxtool/mx.py @ 9854:394f38496856

made projects inherit annotation processors from dependencies

author	Doug Simon <doug.simon@oracle.com>
date	Tue, 04 Jun 2013 00:33:42 +0200
parents	931f9ced42ad
children	719a290b8a23

comparison

equal deleted inserted replaced

-:e45c7720b46b
+:394f38496856
 """
 Add the transitive set of dependencies for this project, including
 libraries if 'includeLibs' is true, to the 'deps' list.
 """
 childDeps = list(self.deps)
-if includeAnnotationProcessors and hasattr(self, 'annotationProcessors') and len(self.annotationProcessors) > 0:
+if includeAnnotationProcessors and len(self.annotation_processors()) > 0:
-childDeps = self.annotationProcessors + childDeps
+childDeps = self.annotation_processors() + childDeps
 if self in deps:
 return deps
 for name in childDeps:
 assert name != self.name
 dep = _libs.get(name, None)
 """Get the immutable set of Java packages defined by other Java projects that are
 imported by the Java sources of this project."""
 self._init_packages_and_imports()
 return self._imported_java_packages
+def annotation_processors(self):
+if not hasattr(self, '_transitiveAnnotationProcessors'):
+ap = set()
+if hasattr(self, '_annotationProcessors'):
+ap = set(self._annotationProcessors)
+for name in self.deps:
+dep = _projects.get(name, None)
+if dep is not None:
+ap.update(dep.annotation_processors())
+self._transitiveAnnotationProcessors = list(ap)
+return self._transitiveAnnotationProcessors
 class Library(Dependency):
 def __init__(self, suite, name, path, mustExist, urls, sourcePath, sourceUrls):
 Dependency.__init__(self, suite, name)
 self.path = path.replace('/', os.sep)
 p.checkstyleProj = attrs.pop('checkstyle', name)
 p.native = attrs.pop('native', '') == 'true'
 if not p.native and p.javaCompliance is None:
 abort('javaCompliance property required for non-native project ' + name)
 if len(ap) > 0:
-p.annotationProcessors = ap
+p._annotationProcessors = ap
 p.__dict__.update(attrs)
 self.projects.append(p)
 for name, attrs in libsMap.iteritems():
 path = attrs.pop('path')
 javacArgs = []
 if java().debug_port is not None:
 javacArgs += ['-J-Xdebug', '-J-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(java().debug_port)]
-if hasattr(p, 'annotationProcessors') and len(p.annotationProcessors) > 0:
+ap = p.annotation_processors()
-processorPath = classpath(p.annotationProcessors, resolve=True)
+if len(ap) > 0:
+processorPath = classpath(ap, resolve=True)
 genDir = p.source_gen_dir();
 if exists(genDir):
 shutil.rmtree(genDir)
 os.mkdir(genDir)
 javacArgs += ['-processorpath', join(processorPath), '-s', genDir]
 srcDir = join(p.dir, src)
 if not exists(srcDir):
 os.mkdir(srcDir)
 out.element('classpathentry', {'kind' : 'src', 'path' : src})
-if hasattr(p, 'annotationProcessors') and len(p.annotationProcessors) > 0:
+if len(p.annotation_processors()) > 0:
 genDir = p.source_gen_dir();
 if not exists(genDir):
 os.mkdir(genDir)
 out.element('classpathentry', {'kind' : 'src', 'path' : 'src_gen'})
 os.mkdir(settingsDir)
 eclipseSettingsDir = join(suite.dir, 'mx', 'eclipse-settings')
 if exists(eclipseSettingsDir):
 for name in os.listdir(eclipseSettingsDir):
-if name == "org.eclipse.jdt.apt.core.prefs" and not (hasattr(p, 'annotationProcessors') and len(p.annotationProcessors) > 0):
+if name == "org.eclipse.jdt.apt.core.prefs" and not len(p.annotation_processors()) > 0:
 continue
 path = join(eclipseSettingsDir, name)
 if isfile(path):
 with open(join(eclipseSettingsDir, name)) as f:
 content = f.read()
 content = content.replace('${javaCompliance}', str(p.javaCompliance))
-if hasattr(p, 'annotationProcessors') and len(p.annotationProcessors) > 0:
+if len(p.annotation_processors()) > 0:
 content = content.replace('org.eclipse.jdt.core.compiler.processAnnotations=disabled', 'org.eclipse.jdt.core.compiler.processAnnotations=enabled')
 update_file(join(settingsDir, name), content)
-if hasattr(p, 'annotationProcessors') and len(p.annotationProcessors) > 0:
+if len(p.annotation_processors()) > 0:
 out = XMLDoc()
 out.open('factorypath')
 out.element('factorypathentry', {'kind' : 'PLUGIN', 'id' : 'org.eclipse.jst.ws.annotations.core', 'enabled' : 'true', 'runInBatchMode' : 'false'})
-for ap in p.annotationProcessors:
+for ap in p.annotation_processors():
 apProject = project(ap)
 for dep in apProject.all_deps([], True):
 if dep.isLibrary():
 if not hasattr(dep, 'eclipse.container') and not hasattr(dep, 'eclipse.project'):
 if dep.mustExist:
 Determines if a given project is part of an annotation processor.
 """
 processors = set()
 for otherProject in projects():
-if hasattr(otherProject, 'annotationProcessors') and len(otherProject.annotationProcessors) > 0:
+if len(p.annotation_processors()) > 0:
-for processorName in otherProject.annotationProcessors:
+for processorName in otherProject.annotation_processors():
 processors.add(project(processorName, fatalIfMissing=True))
 if p in processors:
 return True
 out.open('data', {'xmlns' : 'http://www.netbeans.org/ns/j2se-project/3'})
 out.element('name', data=p.name)
 out.element('explicit-platform', {'explicit-source-supported' : 'true'})
 out.open('source-roots')
 out.element('root', {'id' : 'src.dir'})
-if hasattr(p, 'annotationProcessors') and len(p.annotationProcessors) > 0:
+if len(p.annotation_processors()) > 0:
 out.element('root', {'id' : 'src.ap-source-output.dir'})
 out.close('source-roots')
 out.open('test-roots')
 out.close('test-roots')
 out.close('data')
 jdkPlatform = 'JDK_' + str(java().version)
 annotationProcessorEnabled = "false"
 annotationProcessorReferences = ""
 annotationProcessorSrcFolder = ""
-if hasattr(p, 'annotationProcessors') and len(p.annotationProcessors) > 0:
+if len(p.annotation_processors()) > 0:
 annotationProcessorEnabled = "true"
 annotationProcessorSrcFolder = "src.ap-source-output.dir=${build.generated.sources.dir}/ap-source-output"
 content = """
 annotation.processing.enabled=""" + annotationProcessorEnabled + """
 javacClasspath = []
 deps = p.all_deps([], True)
 annotationProcessorOnlyDeps = []
-if hasattr(p, 'annotationProcessors') and len(p.annotationProcessors) > 0:
+if len(p.annotation_processors()) > 0:
-for ap in p.annotationProcessors:
+for ap in p.annotation_processors():
 apProject = project(ap)
 if not apProject in deps:
 deps.append(apProject)
 annotationProcessorOnlyDeps.append(apProject)

Mercurial > hg > graal-jvmci-8

comparison mxtool/mx.py @ 9854:394f38496856