[GR-65374] Unchained standalone cleanups

PullRequest: graalpython/3819

Author: eregon

mx.graalpython/mx_graalpython.py

@@ -245,7 +245,7 @@ def get_jdk():
 
 # Called from suite.py
 def graalpy_standalone_deps():
-    include_truffle_runtime = not os.environ.get("EXCLUDE_TRUFFLE_RUNTIME")
+    include_truffle_runtime = not mx.env_var_to_bool("EXCLUDE_TRUFFLE_RUNTIME")
     deps = mx_truffle.resolve_truffle_dist_names(use_optimized_runtime=include_truffle_runtime)
     return deps
 
@@ -2004,11 +2004,6 @@ def _python_checkpatchfiles():
 ))
 
 
-standalone_dependencies_common = {
-    "Truffle NFI": "truffle:TRUFFLE_NFI",
-    "Truffle NFI LIBFFI": "truffle:TRUFFLE_NFI_LIBFFI",
-}
-
 def bytecode_dsl_build_args():
     return ['-Dpython.EnableBytecodeDSLInterpreter=true'] if BYTECODE_DSL_INTERPRETER else []
 
@@ -2021,10 +2016,7 @@ def bytecode_dsl_build_args():
     suite=SUITE,
     name='GraalVM Python',
     short_name='pyn',
-    installable_id='python',
     dir_name='python',
-    standalone_dir_name='graalpy-community-<version>-<graalvm_os>-<arch>',
-    standalone_dir_name_enterprise='graalpy-<version>-<graalvm_os>-<arch>',
     license_files=[],
     third_party_license_files=[],
     dependencies=[
@@ -2034,13 +2026,6 @@ def bytecode_dsl_build_args():
         'ICU4J',
         'XZ',
     ],
-    standalone_dependencies={**standalone_dependencies_common, **{
-        'GraalVM Python license files': ('', []),
-    }},
-    standalone_dependencies_enterprise={**standalone_dependencies_common, **{
-        'GraalVM Python license files EE': ('', []),
-        'GraalVM enterprise license files': ('', ['LICENSE.txt', 'GRAALVM-README.md']),
-    }},
     truffle_jars=[
         'graalpython:GRAALPYTHON',
         'graalpython:BOUNCYCASTLE-PROVIDER',

mx.graalpython/native-ee

@@ -1,5 +1,5 @@
-DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/vm-enterprise,/substratevm-enterprise,substratevm-enterprise-gcs
+DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/vm-enterprise,/substratevm-enterprise
 BUILD_TARGETS=GRAALPY_NATIVE_STANDALONE
-COMPONENTS=SubstrateVM Enterprise,Truffle SVM Macro Enterprise,suite:substratevm-enterprise-gcs
+COMPONENTS=SubstrateVM Enterprise,Truffle SVM Macro Enterprise
 NATIVE_IMAGES=lib:pythonvm
 GRAALVM_SKIP_ARCHIVE=true

mx.graalpython/suite.py

@@ -1356,8 +1356,13 @@
                                 "dependency:GRAALPYTHON_INCLUDE_RESOURCES/META-INF/resources/include/*",
                             ],
                             "./": [
-                                "dependency:GRAALPYTHON_NI_RESOURCES/META-INF/resources/*",
-                                "dependency:GRAALPYTHON_NATIVE_RESOURCES/META-INF/resources/<os>/<arch>/*",
+                                "dependency:GRAALPYTHON_NI_RESOURCES/META-INF/resources/native-image.properties",
+                                {
+                                    "source_type": "dependency",
+                                    "dependency": "GRAALPYTHON_NATIVE_RESOURCES",
+                                    "path": "META-INF/resources/<os>/<arch>/*",
+                                    "exclude": ["META-INF/resources/<os>/<arch>/native.sha256", "META-INF/resources/<os>/<arch>/native.files"],
+                                },
                             ],
                         },
                     },
@@ -1375,8 +1380,13 @@
                                 "dependency:GRAALPYTHON_INCLUDE_RESOURCES/META-INF/resources/include/*",
                             ],
                             "./": [
-                                "dependency:GRAALPYTHON_NI_RESOURCES/META-INF/resources/*",
-                                "dependency:GRAALPYTHON_NATIVE_RESOURCES/META-INF/resources/<os>/<arch>/*",
+                                "dependency:GRAALPYTHON_NI_RESOURCES/META-INF/resources/native-image.properties",
+                                {
+                                    "source_type": "dependency",
+                                    "dependency": "GRAALPYTHON_NATIVE_RESOURCES",
+                                    "path": "META-INF/resources/<os>/<arch>/*",
+                                    "exclude": ["META-INF/resources/<os>/<arch>/native.sha256", "META-INF/resources/<os>/<arch>/native.files"],
+                                },
                             ],
                         },
                     },
@@ -1506,6 +1516,7 @@
             "standalone_dist": "GRAALPY_NATIVE_STANDALONE",
             "community_archive_name": "graalpy-community",
             "enterprise_archive_name": "graalpy",
+            "language_id": "python",
         },
 
         "GRAALPY_JVM_STANDALONE_RELEASE_ARCHIVE": {
@@ -1514,6 +1525,7 @@
             "standalone_dist": "GRAALPY_JVM_STANDALONE",
             "community_archive_name": "graalpy-community-jvm",
             "enterprise_archive_name": "graalpy-jvm",
+            "language_id": "python",
         },
 
         "graalpy-archetype-polyglot-app": {