Mercurial > hg > truffle
diff mx/mx_graal.py @ 21607:71b338926f2e
moved JVMCI classes into their own distributions (JBS:GRAAL-53)
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Fri, 29 May 2015 22:27:38 +0200 |
| parents | 93f282187d90 |
| children | 60154926b513 |
line wrap: on
line diff
--- a/mx/mx_graal.py Fri May 29 13:19:05 2015 -0700 +++ b/mx/mx_graal.py Fri May 29 22:27:38 2015 +0200 @@ -95,7 +95,9 @@ _jdkDeployedDists = [ JDKDeployedDist('TRUFFLE'), - JDKDeployedDist('JVMCI_LOADER'), + JDKDeployedDist('JVMCI_SERVICE'), + JDKDeployedDist('JVMCI_API', usesJVMCIClassLoader=True), + JDKDeployedDist('JVMCI_HOTSPOT', usesJVMCIClassLoader=True), JDKDeployedDist('GRAAL', usesJVMCIClassLoader=True), JDKDeployedDist('GRAAL_TRUFFLE', usesJVMCIClassLoader=True) ] @@ -667,10 +669,10 @@ def _updateJVMCIFiles(jdkDir): jreJVMCIDir = join(jdkDir, 'jre', 'lib', 'jvmci') - graalJars = [join(jreJVMCIDir, e) for e in os.listdir(jreJVMCIDir) if e.startswith('graal') and e.endswith('.jar')] + jvmciJars = [join(jreJVMCIDir, e) for e in os.listdir(jreJVMCIDir) if e.endswith('.jar')] jreGraalServicesDir = join(jreJVMCIDir, 'services') jreGraalOptionsDir = join(jreJVMCIDir, 'options') - _extractJVMCIFiles(graalJars, jreGraalServicesDir, jreGraalOptionsDir) + _extractJVMCIFiles(jvmciJars, jreGraalServicesDir, jreGraalOptionsDir) def _patchGraalVersionConstant(dist): """