generate graalvm and python versions for use in java at build time

Author: timfel

graalpython/com.oracle.graal.python.resources/src/com/oracle/graal/python/resources/PythonResource.java

@@ -41,6 +41,7 @@
 package com.oracle.graal.python.resources;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.util.List;
@@ -56,12 +57,22 @@
  */
 @Id("python-home")
 public final class PythonResource implements InternalResource {
-    // These fields should be initialized by the language using these resource so the layout will
-    // match up
-    public static int PYTHON_MAJOR = 0;
-    public static int PYTHON_MINOR = 0;
-    public static int GRAALVM_MAJOR = 0;
-    public static int GRAALVM_MINOR = 0;
+    private static final int PYTHON_MAJOR;
+    private static final int PYTHON_MINOR;
+    private static final int GRAALVM_MAJOR;
+    private static final int GRAALVM_MINOR;
+
+    static {
+        try (InputStream is = PythonResource.class.getResourceAsStream("/graalpy_versions")) {
+            PYTHON_MAJOR = is.read();
+            PYTHON_MINOR = is.read();
+            is.read(); // skip python micro version
+            GRAALVM_MAJOR = is.read();
+            GRAALVM_MINOR = is.read();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     private static final Path BASE_PATH = Path.of("META-INF", "resources");
     private static final String LIBGRAALPY = "libgraalpy";

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -34,6 +34,7 @@
 import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.InvalidPathException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -180,9 +181,8 @@ public final class PythonLanguage extends TruffleLanguage<PythonContext> {
 
     /**
      * GraalVM version. Unfortunately, we cannot just use {@link Version#getCurrent} as it relies on
-     * a GraalVM build, but we may run from Jar files directly during development. So we hardcode
-     * the version here. It will fail at runtime if it doesn't match the distribution layout that is
-     * derived from the actual version.
+     * a GraalVM build, but we may run from Jar files directly during development. We generate the
+     * version during the build that are checked against these constants.
      */
     public static final int GRAALVM_MAJOR = 23;
     public static final int GRAALVM_MINOR = 1;
@@ -191,21 +191,11 @@ public final class PythonLanguage extends TruffleLanguage<PythonContext> {
 
     @SuppressWarnings("unchecked")
     private static Class<PythonResource> getPythonResourceClass() {
-        Class<PythonResource> pr;
         try {
-            pr = (Class<PythonResource>) Class.forName("com.oracle.graal.python.resources.PythonResource");
+            return (Class<PythonResource>) Class.forName("com.oracle.graal.python.resources.PythonResource");
         } catch (ClassNotFoundException e) {
             return null;
         }
-        try {
-            pr.getDeclaredField("PYTHON_MAJOR").set(pr, MAJOR);
-            pr.getDeclaredField("PYTHON_MINOR").set(pr, MINOR);
-            pr.getDeclaredField("GRAALVM_MAJOR").set(pr, GRAALVM_MAJOR);
-            pr.getDeclaredField("GRAALVM_MINOR").set(pr, GRAALVM_MINOR);
-        } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) {
-            return null;
-        }
-        return pr;
     }
 
     static {
@@ -225,6 +215,25 @@ private static Class<PythonResource> getPythonResourceClass() {
         }
 
         PYTHON_RESOURCE_CLASS = getPythonResourceClass();
+        try (InputStream is = PythonLanguage.class.getResourceAsStream("/graalpy_versions")) {
+            if (MAJOR != is.read()) {
+                throw new RuntimeException("suite.py version info does not match PythonLanguage#MAJOR");
+            }
+            if (MINOR != is.read()) {
+                throw new RuntimeException("suite.py version info does not match PythonLanguage#MINOR");
+            }
+            if (MICRO != is.read()) {
+                throw new RuntimeException("suite.py version info does not match PythonLanguage#MICRO");
+            }
+            if (GRAALVM_MAJOR != is.read()) {
+                throw new RuntimeException("suite.py version info does not match PythonLanguage#GRAALVM_MAJOR");
+            }
+            if (GRAALVM_MINOR != is.read()) {
+                throw new RuntimeException("suite.py version info does not match PythonLanguage#GRAALVM_MINOR");
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
     public static final int RELEASE_SERIAL = 0;
     public static final int VERSION_HEX = MAJOR << 24 |

mx.graalpython/mx_graalpython.py

@@ -84,10 +84,10 @@
 SUITE_COMPILER = mx.suite("compiler", fatalIfMissing=False)
 SUITE_SULONG = mx.suite("sulong")
 
-GRAAL_VERSION = ".".join(SUITE.suiteDict['version'].split('.')[:2])
-GRAAL_VERSION_NODOT = GRAAL_VERSION.replace('.', '')
-PYTHON_VERSION = "3.10"
-PYTHON_VERSION_NODOT = "3.10".replace('.', '')
+GRAAL_VERSION = SUITE.suiteDict['version']
+GRAAL_VERSION_MAJ_MIN = ".".join(GRAAL_VERSION.split(".")[:2])
+PYTHON_VERSION = SUITE.suiteDict[f'{SUITE.name}:pythonVersion']
+PYTHON_VERSION_MAJ_MIN = ".".join(PYTHON_VERSION.split('.')[:2])
 
 GRAALPYTHON_MAIN_CLASS = "com.oracle.graal.python.shell.GraalPythonMain"
 
@@ -1746,14 +1746,21 @@ def _get_output_root(projectname):
 
 def py_version_short(variant=None, **kwargs):
     if variant == 'major_minor_nodot':
-        return PYTHON_VERSION_NODOT
-    return PYTHON_VERSION
+        return PYTHON_VERSION_MAJ_MIN.replace(".", "")
+    elif variant == 'binary':
+        return "".join([chr(int(p)) for p in PYTHON_VERSION.split(".")])
+    else:
+        return PYTHON_VERSION_MAJ_MIN
 
 
 def graal_version_short(variant=None, **kwargs):
     if variant == 'major_minor_nodot':
-        return GRAAL_VERSION_NODOT
-    return GRAAL_VERSION
+        return GRAAL_VERSION_MAJ_MIN.replace(".", "")
+    elif variant == 'binary':
+        return "".join([chr(int(p)) for p in GRAAL_VERSION.split(".")])
+    else:
+        return GRAAL_VERSION_MAJ_MIN
+
 
 def graalpy_ext(llvm_mode, **kwargs):
     if not llvm_mode:
@@ -1774,7 +1781,7 @@ def graalpy_ext(llvm_mode, **kwargs):
     # https://github.com/python/cpython/issues/37510
     ext = 'pyd' if os == 'windows' else 'so'
 
-    return f'.graalpy{GRAAL_VERSION_NODOT}-{PYTHON_VERSION_NODOT}-{llvm_mode}-{arch}-{pyos}.{ext}'
+    return f'.graalpy{GRAAL_VERSION_MAJ_MIN.replace(".", "")}-{PYTHON_VERSION_MAJ_MIN.replace(".", "")}-{llvm_mode}-{arch}-{pyos}.{ext}'
 
 
 mx_subst.path_substitutions.register_with_arg('suite', _get_suite_dir)

mx.graalpython/suite.py

@@ -10,6 +10,7 @@
     "versionConflictResolution": "latest",
 
     "version": "23.1.0",
+    "graalpython:pythonVersion": "3.10.8",
     "release": False,
     "groupId": "org.graalvm.graalpython",
     "url": "http://www.graalvm.org/",
@@ -790,6 +791,18 @@
     #
     # --------------------------------------------------------------------------------------------------------------
     "distributions": {
+        # We need the versions twice (even though that's silly), because
+        # otherwise they will not get included in both the resources jar and
+        # the language jar.
+        "GRAALPYTHON_VERSIONS_RES": {
+            "type": "dir",
+            "layout": {"./graalpy_versions": ["string:<py_ver:binary><graal_ver:binary>"]},
+        },
+        "GRAALPYTHON_VERSIONS_MAIN": {
+            "type": "dir",
+            "layout": {"./graalpy_versions": ["string:<py_ver:binary><graal_ver:binary>"]},
+        },
+
         "GRAALPYTHON-LAUNCHER": {
             "moduleInfo": {
                 "name": "org.graalvm.py.launcher",
@@ -871,6 +884,7 @@
             "useModulePath": True,
             "dependencies": [
                 "com.oracle.graal.python.resources",
+                "GRAALPYTHON_VERSIONS_RES",
                 "GRAALPYTHON_LIBPYTHON_RESOURCES",
                 "GRAALPYTHON_LIBGRAALPY_RESOURCES",
                 "GRAALPYTHON_INCLUDE_RESOURCES",
@@ -911,6 +925,7 @@
             },
             "useModulePath": True,
             "dependencies": [
+                "GRAALPYTHON_VERSIONS_MAIN",
                 "com.oracle.graal.python",
                 "com.oracle.graal.python.frozen",
             ],