Mercurial > hg > graal-jvmci-8
changeset 22277:a48774f9b97a
renamed mx_jvmci.get_jdk() to mx_jvmci.get_jvmci_jdk()
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 22 Jul 2015 11:54:12 +0200 |
parents | e1a5017645ba |
children | 224416477bab |
files | mx.jvmci/mx_jvmci.py |
diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci.py Wed Jul 22 00:06:15 2015 +0200 +++ b/mx.jvmci/mx_jvmci.py Wed Jul 22 11:54:12 2015 +0200 @@ -389,9 +389,9 @@ return mx.abort('You need to run "mx --vm ' + vm + ' --vmbuild ' + bld + ' build" to build the selected VM') -def get_jdk(build=None, vmToCheck=None, create=False, installJars=True): +def get_jvmci_jdk(build=None, vmToCheck=None, create=False, installJars=True): """ - Get the JDK into which JVMCI is installed, creating it first if necessary. + Gets the JDK into which JVMCI is installed, creating it first if necessary. """ if not build: build = _vmbuild @@ -709,7 +709,7 @@ def jdkhome(vm=None): """return the JDK directory selected for the 'vm' command""" - return get_jdk(installJars=False) + return get_jvmci_jdk(installJars=False) def print_jdkhome(args, vm=None): """print the JDK directory selected for the 'vm' command""" @@ -801,7 +801,7 @@ isWindows = platform.system() == 'Windows' or "CYGWIN" in platform.system() for build in builds: installJars = vm != 'original' and (isWindows or not opts2.java) - jdk = get_jdk(build, create=True, installJars=installJars) + jdk = get_jvmci_jdk(build, create=True, installJars=installJars) if vm == 'original': if build != 'product': @@ -1009,7 +1009,7 @@ mx.abort("conflicting working directories: do not set --vmcwd for this command") build = vmbuild if vmbuild else _vmbuild - jdk = get_jdk(build, vmToCheck=vm, installJars=False) + jdk = get_jvmci_jdk(build, vmToCheck=vm, installJars=False) _updateInstalledJVMCIOptionsFile(jdk) mx.expand_project_in_args(args) if _make_eclipse_launch: @@ -1220,7 +1220,7 @@ if args.jar: jar = os.path.abspath(args.jar) else: - jar = join(get_jdk(installJars=False), 'jre', 'lib', 'rt.jar') + jar = join(get_jvmci_jdk(installJars=False), 'jre', 'lib', 'rt.jar') vmargs.append('-G:CompileTheWorldExcludeMethodFilter=sun.awt.X11.*.*') vmargs += ['-XX:+CompileTheWorld'] @@ -1606,7 +1606,7 @@ d = mx.Distribution(_suite, name=artifactId, subDir=_suite.dir, path=path, sourcesPath=path, deps=allDeps, mainClass=None, excludedLibs=[], distDependencies=[], javaCompliance=None) d.make_archive() env = os.environ.copy() - env['JAVA_HOME'] = get_jdk(vmToCheck='server') + env['JAVA_HOME'] = get_jvmci_jdk(vmToCheck='server') env['MAVEN_OPTS'] = '-server -XX:-UseJVMCIClassLoader' cmd = ['mvn', 'install:install-file', '-DgroupId=' + groupId, '-DartifactId=' + artifactId, '-Dversion=1.0-SNAPSHOT', '-Dpackaging=jar', '-Dfile=' + d.path] @@ -1663,7 +1663,7 @@ else: buildOutput.append(x) env = os.environ.copy() - env['JAVA_HOME'] = get_jdk(vmToCheck='server') + env['JAVA_HOME'] = get_jvmci_jdk(vmToCheck='server') env['MAVEN_OPTS'] = '-server -XX:-UseJVMCIClassLoader' mx.log("Building benchmarks...") cmd = ['mvn']