[GR-68714] Fix building GraalWasm using JDK21 JAVA_HOME.

PullRequest: graal/21854

Author: woess

regex/mx.regex/suite.py

@@ -168,15 +168,14 @@
       "moduleInfo" : {
         "name" : "com.oracle.truffle.regex.test.dummylang",
         "requires": [
+          "org.graalvm.polyglot",
           "org.graalvm.truffle",
         ],
       },
       "subDir" : "src",
       "dependencies" : ["com.oracle.truffle.regex.test.dummylang"],
       "distDependencies" : [
-        "regex:TREGEX"
-      ],
-      "exclude" : [
+        "regex:TREGEX",
       ],
       "description" : "Truffle regular expressions testing dummy language.",
       "allowsJavadocWarnings": True,

wasm/mx.wasm/mx_wasm.py

@@ -39,6 +39,7 @@
 # SOFTWARE.
 #
 import os
+import re
 import shutil
 import stat
 import tempfile
@@ -326,11 +327,14 @@ def build(self):
                 mx.warn("No WABT_DIR specified.")
             mx.abort("Could not check the wat2wasm version.")
 
-        wat2wasm_version = str(out.data).split(".")
-        major = int(wat2wasm_version[0])
-        build = int(wat2wasm_version[2])
-        if major <= 1 and build <= 24:
-            bulk_memory_option = "--enable-bulk-memory"
+        try:
+            wat2wasm_version = re.match(r'^(\d+)\.(\d+)(?:\.(\d+))?', str(out.data)).groups()
+
+            major, minor, build = wat2wasm_version
+            if int(major) == 1 and int(minor) == 0 and int(build) <= 24:
+                bulk_memory_option = "--enable-bulk-memory"
+        except:
+            mx.warn(f"Could not parse wat2wasm version. Output: '{out.data}'")
 
         mx.log("Building files from the source dir: " + source_dir)
         for root, filename in self.subject.getProgramSources():

wasm/mx.wasm/suite.py

@@ -94,7 +94,6 @@
       "annotationProcessors" : ["truffle:TRUFFLE_DSL_PROCESSOR"],
       "workingSets" : "WebAssembly",
       "license" : "UPL",
-      "javac.lint.overrides" : "-incubating",
     },
 
     "org.graalvm.wasm.jdk25" : {
@@ -109,10 +108,12 @@
       "overlayTarget" : "org.graalvm.wasm",
       "multiReleaseJarVersion" : "25",
       "checkstyle" : "org.graalvm.wasm",
-      "javaCompliance" : "21+",
+      "javaCompliance" : "25+",
+      "forceJavac": True,
       "workingSets" : "WebAssembly",
       "license" : "UPL",
       "javac.lint.overrides" : "-incubating",
+      "spotbugs" : "false",
     },
 
     "org.graalvm.wasm.launcher" : {
@@ -381,6 +382,7 @@
       ],
       "exclude" : [
         "mx:JUNIT",
+        "mx:HAMCREST",
       ],
       "distDependencies" : [
         "truffle:TRUFFLE_API",
@@ -427,6 +429,7 @@
         "name" : "org.graalvm.wasm.benchmark",
         "requires" : [
           "java.compiler",
+          "org.graalvm.polyglot",
         ],
       },
       "subDir" : "src",