Mercurial > hg > graal-compiler
changeset 22887:a9b332b34123
mx: added BootClasspathDist
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Sun, 25 Oct 2015 11:55:50 +0100 |
parents | 86dacea931a2 |
children | 9021de742f55 |
files | mx.graal/mx_graal_9.py |
diffstat | 1 files changed, 26 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/mx.graal/mx_graal_9.py Sun Oct 25 10:50:06 2015 +0100 +++ b/mx.graal/mx_graal_9.py Sun Oct 25 11:55:50 2015 +0100 @@ -82,22 +82,35 @@ _vm = JVMCIMode(jvmciMode='hosted') +class BootClasspathDist(object): + """ + Extra info for a Distribution that must be put onto the boot class path. + """ + def __init__(self, name): + self._name = name + + def dist(self): + return mx.distribution(self._name) + + def get_classpath_repr(self): + return self.dist().classpath_repr() + _compilers = ['graal-economy', 'graal'] -_graalDists = [ - 'GRAAL_NODEINFO', - 'GRAAL_API', - 'GRAAL_COMPILER', - 'GRAAL', - 'GRAAL_HOTSPOT', - 'GRAAL_TRUFFLE', - 'GRAAL_TRUFFLE_HOTSPOT', +_bootClasspathDists = [ + BootClasspathDist('GRAAL_NODEINFO'), + BootClasspathDist('GRAAL_API'), + BootClasspathDist('GRAAL_COMPILER'), + BootClasspathDist('GRAAL'), + BootClasspathDist('GRAAL_HOTSPOT'), + BootClasspathDist('GRAAL_TRUFFLE'), + BootClasspathDist('GRAAL_TRUFFLE_HOTSPOT'), ] def add_compiler(compilerName): _compilers.append(compilerName) -def add_graal_dist(distName): - _graalDists.append(distName) +def add_boot_classpath_dist(dist): + _bootClasspathDists.append(dist) mx_gate.add_jacoco_includes(['com.oracle.graal.*']) mx_gate.add_jacoco_excluded_annotations(['@Snippet', '@ClassSubstitution']) @@ -511,9 +524,8 @@ bcp = [mx.distribution('truffle:TRUFFLE_API').classpath_repr()] if _jvmciModes[_vm.jvmciMode]: - bcpDeps = [mx.distribution(d) for d in _graalDists] - if bcpDeps: - bcp.extend([d.classpath_repr() for d in bcpDeps]) + bcp.extend([d.get_classpath_repr() for d in _bootClasspathDists]) + args = ['-Xbootclasspath/p:' + os.pathsep.join(bcp)] + args # Set the default JVMCI compiler @@ -587,5 +599,5 @@ def mx_post_parse_cmd_line(opts): if opts.jvmci_mode is not None: _vm.update(opts.jvmci_mode) - for dist in [mx.distribution(d) for d in _graalDists]: + for dist in [d.dist() for d in _bootClasspathDists]: dist.set_archiveparticipant(GraalArchiveParticipant(dist))