[GR-4433] Removed mx igv, replaced with info message

chrischiedo · Nov 19, 2018 · 5a3ee83 · 5a3ee83
1 parent 0bb14a7
commit 5a3ee83
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/compiler/mx.compiler/mx_graal_tools.py b/compiler/mx.compiler/mx_graal_tools.py
@@ -34,7 +34,7 @@
 
 _suite = mx.suite('compiler')
 
-def _run_netbeans_app(app_name, env=None, args=None):
+def run_netbeans_app(app_name, env=None, args=None):
     args = [] if args is None else args
     dist = app_name.upper() + '_DIST'
     name = app_name.lower()
@@ -69,27 +69,29 @@ def _run_netbeans_app(app_name, env=None, args=None):
         launch.append('-J-Dnetbeans.logger.console=false')
     mx.run(launch+args, env=env)
 
-def _igvJdk():
+def netbeans_jdk(appName):
     v8u20 = mx.VersionSpec("1.8.0_20")
     v8u40 = mx.VersionSpec("1.8.0_40")
     v11 = mx.VersionSpec("11") # IGV requires java.xml.bind which has been removed in 11 (JEP320)
     def _igvJdkVersionCheck(version):
         return (version < v8u20 or version >= v8u40) and version < v11
-    return mx.get_jdk(_igvJdkVersionCheck, versionDescription='(< 1.8.0u20 or >= 1.8.0u40) and < 11', purpose="running IGV").home
+    return mx.get_jdk(_igvJdkVersionCheck, versionDescription='(< 1.8.0u20 or >= 1.8.0u40) and < 11', purpose="running " + appName).home
 
 def igv(args):
-    """run the Ideal Graph Visualizer"""
-    env = dict(os.environ)
-    # make the jar for Batik 1.7 available.
-    env['IGV_BATIK_JAR'] = mx.library('BATIK').get_path(True)
-    env['jdkhome'] = _igvJdk()
-    _run_netbeans_app('IdealGraphVisualizer', env, args)
+    """(obsolete) informs about IGV"""
+    mx.warn(
+        """IGV (idealgraphvisualizer) is distributed as part of GraalVM EE, available from
+    https://www.oracle.com/technetwork/oracle-labs/program-languages/downloads/index.html
+Please download the distribution and run
+    bin/idealgraphvisualizer
+from the GraalVM EE installation.
+""")
 
 def c1visualizer(args):
     """run the C1 Compiler Visualizer"""
     env = dict(os.environ)
-    env['jdkhome'] = _igvJdk()
-    _run_netbeans_app('C1Visualizer', env, args)
+    env['jdkhome'] = netbeans_jdk("C1 Visualizer")
+    run_netbeans_app('C1Visualizer', env, args)
 
 def hsdis(args, copyToDir=None):
     """download the hsdis library

diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
@@ -111,11 +111,6 @@
       "sha1" : "305a772ccbdc0e42dfa233b0ce6762d0dd1de6de",
     },
 
-    "IDEALGRAPHVISUALIZER_DIST" : {
-      "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/idealgraphvisualizer/idealgraphvisualizer-619.zip"],
-      "sha1" : "7fa6906c7898e736396f7143a173c53ca4e2a831",
-    },
-
     "JOL_CLI" : {
       "sha1" : "45dd0cf195b16e70710a8d6d763cda614cf6f31e",
       "maven" : {