Drop dependency on truffle-enterprise

mx.trufflesqueak/mx_trufflesqueak.py

@@ -15,7 +15,6 @@
 import mx_sdk
 import mx_sdk_vm
 import mx_sdk_vm_impl
-import mx_truffle
 
 # re-export custom mx project classes so they can be used from suite.py
 from mx_cmake import CMakeNinjaProject  # pylint: disable=unused-import
@@ -195,23 +194,18 @@ def patched_native_image(self, build_args, output_file, out=None, err=None):
                 ),
             )
         build_args.remove("--macro:smalltalkvm-library")
-        dist_names = (
-            [
-                "TRUFFLESQUEAK",
-                "TRUFFLESQUEAK_LAUNCHER",
-                "TRUFFLE_NFI_LIBFFI",
-                "SDK-NATIVEBRIDGE",
-            ]
-            + (["TRUFFLE-ENTERPRISE"] if is_oracle_graalvm else [])
-            + mx_truffle.resolve_truffle_dist_names(
-                use_optimized_runtime=True, use_enterprise=True
-            )
-        )
         selected_gc = "G1" if is_oracle_graalvm and mx.is_linux() else "serial"
         build_command = (
             [native_image_bin]
             + build_args
-            + mx.get_runtime_jvm_args(names=dist_names)
+            + mx.get_runtime_jvm_args(
+                names=[
+                    "TRUFFLESQUEAK",
+                    "TRUFFLESQUEAK_LAUNCHER",
+                    "truffle:TRUFFLE_NFI_LIBFFI",
+                    "truffle:TRUFFLE_RUNTIME",
+                ]
+            )
             + [
                 "-o",
                 os.path.splitext(output_file)[0],

mx.trufflesqueak/suite.py

@@ -33,12 +33,6 @@
         "read": "https://github.com/hpi-swa/trufflesqueak.git",
         "write": "[email protected]:hpi-swa/trufflesqueak.git",
     },
-    "licenses": {
-        "GFTC": {
-            "name": "GraalVM Free Terms and Conditions (GFTC) including License for Early Adopter Versions",
-            "url": "https://www.oracle.com/downloads/licenses/graal-free-license.html",
-        },
-    },
     # ==========================================================================
     #  DEPENDENCIES
     # ==========================================================================
@@ -108,25 +102,6 @@
                 "<others>": {"<others>": {"optional": True}},
             },
         },
-        "TRUFFLE-ENTERPRISE": {
-            "digest": "sha512:ce4cefe6706110cf352271c58d519cfed5bc73d419f1946ff03f0064a80d1a64e633cd4a1f6aa93c3e732b422ff69c132ae73767972526dbf4063cae7cc9df60",
-            "maven": {
-                "groupId": "org.graalvm.truffle",
-                "artifactId": "truffle-enterprise",
-                "version": "24.1.2",
-            },
-            "useModulePath": True,
-            "licence": "GFTC",
-        },
-        "SDK-NATIVEBRIDGE": {
-            "digest": "sha512:1e25b3b58ae01ef929ad71c9c1bb01376258919384810634e23a483836f53e9e77f1c5317c6220fee6bc3e7f5f36359c2ce84e5287c8335208431c675fa0925a",
-            "maven": {
-                "groupId": "org.graalvm.sdk",
-                "artifactId": "nativebridge",
-                "version": "24.1.2",
-            },
-            "useModulePath": True,
-        },
     },
     # ==========================================================================
     #  PROJECTS
@@ -273,39 +248,16 @@
             "noMavenJavadoc": True,
             "license": ["MIT"],
         },
-        "TRUFFLE_ENTERPRISE_PLACEHOLDER": {
-            "maven": {
-                "groupId": "org.graalvm.truffle",
-                "artifactId": "truffle-enterprise",
-            },
-            "testDistribution": True,  # ensure it does not get 'maven-deploy'ed
-            "noMavenJavadoc": True,
-            "license": ["GFTC"],
-        },
         "SMALLTALK": {
-            "type": "pom",
-            "runtimeDependencies": [
-                "TRUFFLESQUEAK",
-                "TRUFFLE_ENTERPRISE_PLACEHOLDER",
-            ],
-            "description": "TruffleSqueak virtual machine for Oracle GraalVM",
-            "maven": {
-                "groupId": "de.hpi.swa.trufflesqueak",
-                "artifactId": "smalltalk",
-                "tag": ["default", "public"],
-            },
-            "license": ["MIT", "GFTC"],
-        },
-        "SMALLTALK_COMMUNITY": {
             "type": "pom",
             "runtimeDependencies": [
                 "TRUFFLESQUEAK",
                 "truffle:TRUFFLE_RUNTIME",
             ],
-            "description": "TruffleSqueak virtual machine for GraalVM CE",
+            "description": "TruffleSqueak virtual machine",
             "maven": {
                 "groupId": "de.hpi.swa.trufflesqueak",
-                "artifactId": "smalltalk-community",
+                "artifactId": "smalltalk",
                 "tag": ["default", "public"],
             },
             "license": ["MIT"],