changeset 22327:2c352e8d76ec

Fix 'mx igv' command.
author Roland Schatz <roland.schatz@oracle.com>
date Mon, 27 Jul 2015 12:11:19 +0200
parents f150f5e00ccd
children 3a95164b033c
files mx.jvmci/mx_jvmci.py mx.jvmci/suite.py
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci.py	Fri Jul 24 15:54:06 2015 +0200
+++ b/mx.jvmci/mx_jvmci.py	Mon Jul 27 12:11:19 2015 +0200
@@ -1222,7 +1222,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/suite.py	Fri Jul 24 15:54:06 2015 +0200
+++ b/mx.jvmci/suite.py	Mon Jul 27 12:11:19 2015 +0200
@@ -25,6 +25,12 @@
       "urls" : ["http://lafo.ssw.uni-linz.ac.at/truffle/jol/jol-internals.jar"],
       "sha1" : "508bcd26a4d7c4c44048990c6ea789a3b11a62dc",
     },
+
+    "BATIK" : {
+      "path" : "lib/batik-all-1.7.jar",
+      "sha1" : "122b87ca88e41a415cf8b523fd3d03b4325134a3",
+      "urls" : ["http://lafo.ssw.uni-linz.ac.at/graal-external-deps/batik-all-1.7.jar"],
+    },
   },
 
   "jrelibraries" : {