Mercurial > hg > graal-jvmci-8

changeset 22279:c232a2ea1fd2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename mx.JDKConfig.jdk to mx.JDKConfig.home
author Doug Simon <doug.simon@oracle.com>
date Wed, 22 Jul 2015 12:21:44 +0200
parents 224416477bab
children ac5551e3ff9c
files mx.jvmci/mx_jvmci.py mx.jvmci/mx_jvmci_makefile.py
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci.py	Wed Jul 22 12:02:52 2015 +0200
+++ b/mx.jvmci/mx_jvmci.py	Wed Jul 22 12:21:44 2015 +0200
@@ -397,7 +397,7 @@
         build = _vmbuild
     jdk = join(_jdksDir(), build)
     if create:
-        srcJdk = mx.get_jdk().jdk
+        srcJdk = mx.get_jdk().home
         if not exists(jdk):
             mx.log('Creating ' + jdk + ' from ' + srcJdk)
             shutil.copytree(srcJdk, jdk)
@@ -719,7 +719,7 @@
     """describe the variables that can be set by the -D option to the 'mx build' commmand"""
 
     buildVars = {
-        'ALT_BOOTDIR' : 'The location of the bootstrap JDK installation (default: ' + mx.get_jdk().jdk + ')',
+        'ALT_BOOTDIR' : 'The location of the bootstrap JDK installation (default: ' + mx.get_jdk().home + ')',
         'ALT_OUTPUTDIR' : 'Build directory',
         'HOTSPOT_BUILD_JOBS' : 'Number of CPUs used by make (default: ' + str(mx.cpu_count()) + ')',
         'INSTALL' : 'Install the built VM into the JDK? (default: y)',
@@ -888,7 +888,7 @@
 
             setMakeVar('ARCH_DATA_MODEL', '64', env=env)
             setMakeVar('HOTSPOT_BUILD_JOBS', str(cpus), env=env)
-            setMakeVar('ALT_BOOTDIR', mx.get_jdk().jdk, env=env)
+            setMakeVar('ALT_BOOTDIR', mx.get_jdk().home, env=env)
             setMakeVar("EXPORT_PATH", jdk)
 
             setMakeVar('MAKE_VERBOSE', 'y' if mx._opts.verbose else '')
@@ -1477,7 +1477,7 @@
     v8 = mx.VersionSpec("1.8")
     def _igvJdkVersionCheck(version):
         return version >= v8 and (version < v8u20 or version >= v8u40)
-    return mx.get_jdk(_igvJdkVersionCheck, versionDescription='>= 1.8 and < 1.8.0u20 or >= 1.8.0u40', purpose="building & running IGV").jdk
+    return mx.get_jdk(_igvJdkVersionCheck, versionDescription='>= 1.8 and < 1.8.0u20 or >= 1.8.0u40', purpose="building & running IGV").home
 
 def _igvBuildEnv():
         # When the http_proxy environment variable is set, convert it to the proxy settings that ant needs
--- a/mx.jvmci/mx_jvmci_makefile.py	Wed Jul 22 12:02:52 2015 +0200
+++ b/mx.jvmci/mx_jvmci_makefile.py	Wed Jul 22 12:21:44 2015 +0200
@@ -128,9 +128,9 @@
 
 
 def do_build_makefile(mf, selectedDists):
-    java = mx.get_jdk()
-    bootClassPath = java.bootclasspath()
-    bootClassPath = bootClassPath.replace(os.path.realpath(java.jdk), "$(ABS_BOOTDIR)")
+    jdk = mx.get_jdk()
+    bootClassPath = jdk.bootclasspath()
+    bootClassPath = bootClassPath.replace(os.path.realpath(jdk.home), "$(ABS_BOOTDIR)")
     jdkBootClassPathVariableName = "JDK_BOOTCLASSPATH"
 
     mf.add_definition("""# This Makefile is generated automatically, do not edit
@@ -139,7 +139,7 @@
 # Bootstrap JDK to be used (for javac and jar)
 ABS_BOOTDIR=
 
-JAVAC=$(ABS_BOOTDIR)/bin/javac -g -target """ + str(java.javaCompliance) + """
+JAVAC=$(ABS_BOOTDIR)/bin/javac -g -target """ + str(jdk.javaCompliance) + """
 JAR=$(ABS_BOOTDIR)/bin/jar
 
 HS_COMMON_SRC=.