Skip to content

Commit 5cb3049

Browse files
tkrodrigueztkrodriguez
committed
[GR-66090] [GR-65831] Update IGV to support JDK24
PullRequest: graal/21130
2 parents 8fa7b17 + 157b4b7 commit 5cb3049

File tree

60 files changed

+118
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+118
-68
lines changed

‎compiler/mx.compiler/mx_graal_tools.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,11 @@ def run_netbeans_app(app_name, jdkhome, args=None, dist=None):
8080
def igv(args):
8181
"""run the Ideal Graph Visualizer
8282
83-
The current version is based on NetBeans 22 which officially supports JDK 17 through JDK 22. A
83+
The current version is based on NetBeans 26 which officially supports JDK 17 through JDK 24. A
8484
supported JDK will be chosen from the JDKs known to mx but it will fall back to whatever is
8585
configured as JAVA_HOME if a supported JDK can't be found. It's not recommended to run igv with
86-
pre-release JDKs.
86+
pre-release JDKs. Setting TOOLS_JAVA_HOME to point at a supported JDK is the recommended way to
87+
configure the JDK for IGV.
8788
8889
You can directly control which JDK is used to launch IGV using
8990
@@ -95,18 +96,20 @@ def igv(args):
9596
help for the NetBeans launcher.
9697
9798
"""
98-
v17 = mx.VersionSpec("17")
99-
v23 = mx.VersionSpec("23")
99+
min_version = 17
100+
max_version = 24
101+
min_version_spec = mx.VersionSpec(str(min_version))
102+
next_version_spec = mx.VersionSpec(str(max_version + 1))
100103
def _igvJdkVersionCheck(version):
101-
return v17 <= version < v23
104+
return min_version_spec <= version < next_version_spec
102105

103106
jdkhome = None
104107
if not '--jdkhome' in args:
105108
def _do_not_abort(msg):
106109
pass
107110

108111
# try to find a fully supported version first
109-
jdk = mx.get_tools_jdk(versionCheck=_igvJdkVersionCheck, versionDescription='IGV prefers JDK 17 through JDK 22', abortCallback=_do_not_abort)
112+
jdk = mx.get_tools_jdk(versionCheck=_igvJdkVersionCheck, versionDescription=f'IGV prefers JDK {min_version} through JDK {max_version}', abortCallback=_do_not_abort)
110113
if jdk is None:
111114
# try any JDK
112115
jdk = mx.get_jdk()
@@ -116,7 +119,7 @@ def _do_not_abort(msg):
116119
mx.log(f'Launching IGV with {jdkhome}')
117120
if not _igvJdkVersionCheck(jdk.version):
118121
mx.warn(f'{jdk.home} is not an officially supported JDK for IGV.')
119-
mx.warn('If you experience any problems try to use a JDK 17 or JDK 21 instead.')
122+
mx.warn(f'If you experience any problems try to use an LTS release between JDK {min_version} and JDK {max_version} instead.')
120123
mx.warn(f'mx help igv provides more details.')
121124

122125
run_netbeans_app('IdealGraphVisualizer', jdkhome, args=args, dist='IDEALGRAPHVISUALIZER_DIST')

‎compiler/mx.compiler/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
"packedResource": True,
6666
},
6767
"IDEALGRAPHVISUALIZER_DIST" : {
68-
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/idealgraphvisualizer/idealgraphvisualizer-1.21-6336c496583.zip"],
69-
"digest" : "sha512:978b5f2e7f807238dcb2bf4e5b7acdd88176c3742bdc0e472d96cbd5a5d72ff411a110098abbbbcd6ad55c6baa27ea9b530e78736085e1bee80d61f723e47c60",
68+
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/idealgraphvisualizer/idealgraphvisualizer-1.22-6cb0d3acbb1.zip"],
69+
"digest" : "sha512:8c4795fae203bfa84c40b041fe6d0f46a89bd8b975120d28aea9483eef1c1b63ab685716c1258387c12a255560904284fd0bf9aa947f2efabc4a629148000b5d",
7070
"packedResource": True,
7171
},
7272

‎visualizer/IdealGraphVisualizer/Bytecodes/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.graalvm.visualizer</groupId>
55
<artifactId>IdealGraphVisualizer-parent</artifactId>
6-
<version>1.22-SNAPSHOT</version>
6+
<version>1.23-SNAPSHOT</version>
77
</parent>
88
<artifactId>Bytecodes</artifactId>
99
<packaging>nbm</packaging>

‎visualizer/IdealGraphVisualizer/Bytecodes/src/main/nbm/manifest.mf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ OpenIDE-Module: org.graalvm.visualizer.bytecodes
33
OpenIDE-Module-Layer: org/graalvm/visualizer/bytecodes/layer.xml
44
OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/bytecodes/Bundle.properties
55
OpenIDE-Module-Specification-Version: 1.1
6+
OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

‎visualizer/IdealGraphVisualizer/ControlFlow/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.graalvm.visualizer</groupId>
55
<artifactId>IdealGraphVisualizer-parent</artifactId>
6-
<version>1.22-SNAPSHOT</version>
6+
<version>1.23-SNAPSHOT</version>
77
</parent>
88
<artifactId>ControlFlow</artifactId>
99
<packaging>nbm</packaging>

‎visualizer/IdealGraphVisualizer/ControlFlow/src/main/nbm/manifest.mf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ OpenIDE-Module: org.graalvm.visualizer.controlflow
33
OpenIDE-Module-Layer: org/graalvm/visualizer/controlflow/layer.xml
44
OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/controlflow/Bundle.properties
55
OpenIDE-Module-Specification-Version: 1.1
6+
OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

‎visualizer/IdealGraphVisualizer/Coordinator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.graalvm.visualizer</groupId>
55
<artifactId>IdealGraphVisualizer-parent</artifactId>
6-
<version>1.22-SNAPSHOT</version>
6+
<version>1.23-SNAPSHOT</version>
77
</parent>
88
<artifactId>Coordinator</artifactId>
99
<packaging>nbm</packaging>

‎visualizer/IdealGraphVisualizer/Coordinator/src/main/nbm/manifest.mf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ OpenIDE-Module-Install: org/graalvm/visualizer/coordinator/impl/Installer.class
44
OpenIDE-Module-Layer: org/graalvm/visualizer/coordinator/layer.xml
55
OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/coordinator/Bundle.properties
66
OpenIDE-Module-Specification-Version: 1.2
7-
7+
OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

‎visualizer/IdealGraphVisualizer/Data/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.graalvm.visualizer</groupId>
55
<artifactId>IdealGraphVisualizer-parent</artifactId>
6-
<version>1.22-SNAPSHOT</version>
6+
<version>1.23-SNAPSHOT</version>
77
</parent>
88
<artifactId>Data</artifactId>
99
<packaging>nbm</packaging>

‎visualizer/IdealGraphVisualizer/Data/src/main/nbm/manifest.mf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ Manifest-Version: 1.0
22
OpenIDE-Module: org.graalvm.visualizer.data
33
OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/data/Bundle.properties
44
OpenIDE-Module-Specification-Version: 1.5
5-
5+
OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

0 commit comments

Comments
 (0)