Fix: use mx.VersionSpec instead of JavaCompliance for getting/verifying JVM version in graalpy_standalone_home

Author: steve-s

mx.graalpython/mx_graalpython.py

@@ -952,7 +952,7 @@ def _graalpy_launcher(managed=False):
 
 def graalpy_standalone_home(standalone_type, enterprise=False):
     assert standalone_type in ['native', 'jvm']
-    jdk_version = mx.get_jdk().javaCompliance  # Not our "get_jdk", because we do not want the jvmci tag.
+    jdk_version = mx.get_jdk().version
     python_home = os.environ.get("GRAALPY_HOME", None)
     if python_home and "*" in python_home:
         python_home = os.path.abspath(glob.glob(python_home)[0])
@@ -969,7 +969,7 @@ def graalpy_standalone_home(standalone_type, enterprise=False):
                 line = f.readline()
         if 'JAVA_VERSION=' not in line:
             mx.abort(f"GRAALPY_HOME does not contain 'release' file. Cannot check Java version.")
-        actual_jdk_version = line.strip('JAVA_VERSION=').strip(' "\n\r')
+        actual_jdk_version = mx.VersionSpec(line.strip('JAVA_VERSION=').strip(' "\n\r'))
         if actual_jdk_version != jdk_version:
             mx.abort(f"GRAALPY_HOME is not compatible with the requested JDK version.\n"
                      f"actual version: '{actual_jdk_version}', version string: {line}, requested version: {jdk_version}.")
@@ -990,7 +990,7 @@ def graalpy_standalone_home(standalone_type, enterprise=False):
         mx_args = ['-p', vm_suite_path, '--env', env_file]
         if not DISABLE_REBUILD:
             dep_type = 'JAVA' if standalone_type == 'jvm' else 'NATIVE'
-            mx.run_mx(mx_args + ["build", "--dep", f"PYTHON_{dep_type}_STANDALONE_SVM{svm_distr}_JAVA{jdk_version}"])
+            mx.run_mx(mx_args + ["build", "--dep", f"PYTHON_{dep_type}_STANDALONE_SVM{svm_distr}_JAVA{jdk_version.parts[0]}"])
         out = mx.OutputCapture()
         mx.run_mx(mx_args + ["standalone-home", "--type", standalone_type, "python"], out=out)
         python_home = out.data.splitlines()[-1].strip()