Mercurial > hg > graal-compiler
changeset 22753:f74225bf6671
changes for compatibility with jvmci-9
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Sat, 03 Oct 2015 00:05:38 +0200 |
parents | ea681009437d |
children | a48f9b3e01f5 |
files | mx.graal/mx_graal.py |
diffstat | 1 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mx.graal/mx_graal.py Fri Oct 02 10:15:51 2015 -0700 +++ b/mx.graal/mx_graal.py Sat Oct 03 00:05:38 2015 +0200 @@ -33,8 +33,14 @@ import re import mx -import mx_jvmci -from mx_jvmci import JvmciJDKDeployedDist, run_vm, VM, Task, get_vm, isJVMCIEnabled, get_jvmci_jdk, get_jvmci_jdk_dir, buildvms +from mx_jvmci import JvmciJDKDeployedDist, add_bootclasspath_prepend +from mx_jvmci import jdkDeployedDists #pylint: disable=unused-import + +try: + from mx_jvmci import run_vm, VM, Task, get_vm, \ + isJVMCIEnabled, relativeVmLibDirInJdk, get_jvmci_jdk, get_jvmci_jdk_dir, buildvms +except ImportError: + pass from mx_unittest import unittest import mx_gate @@ -69,7 +75,7 @@ with open(graalProperties, 'w') as fp: fp.write(os.linesep.join(content)) -mx_jvmci.jdkDeployedDists += [ +jdkDeployedDists += [ JvmciJDKDeployedDist('GRAAL_NODEINFO'), JvmciJDKDeployedDist('GRAAL_API'), JvmciJDKDeployedDist('GRAAL_COMPILER'), @@ -468,7 +474,7 @@ def jdkartifactstats(args): """show stats about JDK deployed Graal artifacts""" - jdkDir = mx_jvmci.get_jvmci_jdk_dir() + jdkDir = get_jvmci_jdk_dir() artifacts = {} for root, _, filenames in os.walk(join(jdkDir, 'jre', 'lib')): for f in filenames: @@ -508,7 +514,7 @@ t1, t2, t3 = totals print '{:10,} {:10,} {:10,} {}'.format(t1, t2, t3, category) - jvmLib = join(jdkDir, mx_jvmci.relativeVmLibDirInJdk(), get_vm(), mx.add_lib_suffix(mx.add_lib_prefix('jvm'))) + jvmLib = join(jdkDir, relativeVmLibDirInJdk(), get_vm(), mx.add_lib_suffix(mx.add_lib_prefix('jvm'))) print if exists(jvmLib): print '{:10,} {}'.format(os.path.getsize(jvmLib), jvmLib) @@ -531,4 +537,4 @@ def mx_post_parse_cmd_line(opts): - mx_jvmci.add_bootclasspath_prepend(mx.distribution('truffle:TRUFFLE_API')) + add_bootclasspath_prepend(mx.distribution('truffle:TRUFFLE_API'))