Mercurial > hg > graal-compiler
changeset 22285:3bf1bdd3c0c3
Use new jdk deployed dists model
| author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
|---|---|
| date | Wed, 22 Jul 2015 16:43:21 +0200 |
| parents | 67d70574511e |
| children | 4c8f0b7c3ae6 |
| files | mx.graal/mx_graal.py |
| diffstat | 1 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mx.graal/mx_graal.py Wed Jul 22 16:42:59 2015 +0200 +++ b/mx.graal/mx_graal.py Wed Jul 22 16:43:21 2015 +0200 @@ -32,17 +32,18 @@ import mx import mx_jvmci -from mx_jvmci import JDKDeployedDist, buildvms, vm, VM, Task, parseVmArgs, get_vm, ctw, isVMSupported +from mx_jvmci import JvmciJDKDeployedDist, buildvms, vm, VM, Task, parseVmArgs, get_vm, ctw, isVMSupported import mx_unittest from mx_unittest import unittest _suite = mx.suite('graal') -class GraalJDKDeployedDist(JDKDeployedDist): +class GraalJDKDeployedDist(JvmciJDKDeployedDist): def __init__(self): - JDKDeployedDist.__init__(self, 'GRAAL', usesJVMCIClassLoader=True) + JvmciJDKDeployedDist.__init__(self, 'GRAAL') - def onPostJdkInstall(self, jdkDir, targetDir): + def deploy(self, jdkDir): + JvmciJDKDeployedDist.deploy(self, jdkDir) self._updateGraalPropertiesFile(join(jdkDir, 'jre', 'lib')) def _updateGraalPropertiesFile(self, jreLibDir): @@ -68,7 +69,7 @@ mx_jvmci.jdkDeployedDists += [ GraalJDKDeployedDist(), - JDKDeployedDist('GRAAL_TRUFFLE', usesJVMCIClassLoader=True) + JvmciJDKDeployedDist('GRAAL_TRUFFLE'), ] mx_jvmci.jacocoIncludes += ['com.oracle.graal.*']