Revert to language launchers on macOS

Fixes #168
hpi-swa · Jun 14, 2022 · 6cdbe80 · 6cdbe80
1 parent 4a84aa7
commit 6cdbe80
Showing 1 changed file with 22 additions and 10 deletions.
diff --git a/mx.trufflesqueak/mx_trufflesqueak.py b/mx.trufflesqueak/mx_trufflesqueak.py
@@ -185,6 +185,13 @@ def patched_init(self, *args, **kw_args):
 mx_sdk_vm.register_vm_config('trufflesqueak-svm', ['cmp', 'nfi', 'nfi-libffi', 'sdk', 'st', 'svm', 'svmnfi', 'tfl', 'tflm'],
                                 _SUITE, env_file='trufflesqueak-svm')
 
+SVM_BUILD_ARGS = [
+    '-H:+ReportExceptionStackTraces',
+    '-H:+DumpThreadStacksOnSignal',
+    '-H:+DetectUserDirectoriesInImageHeap',
+    '-H:+TruffleCheckBlockListMethods',
+]
+
 mx_sdk.register_graalvm_component(mx_sdk.GraalVmLanguage(
     suite=_SUITE,
     name='TruffleSqueak',
@@ -201,21 +208,26 @@ def patched_init(self, *args, **kw_args):
     provided_executables=[
         'bin/<cmd:trufflesqueak>',
     ],
-    library_configs=[
-        mx_sdk.LanguageLibraryConfig(
+    # Use language launcher on macOS to work around AWT issues
+    launcher_configs=(
+        [mx_sdk.LanguageLauncherConfig(
+            language=LANGUAGE_ID,
+            destination='bin/<exe:trufflesqueak-launcher>',
+            jar_distributions=['trufflesqueak:TRUFFLESQUEAK_LAUNCHER'],
+            main_class='%s.launcher.TruffleSqueakLauncher' % PACKAGE_NAME,
+            build_args=SVM_BUILD_ARGS,
+        )] if mx.is_darwin() else []
+    ),
+    library_configs=(
+        [] if mx.is_darwin() else [mx_sdk.LanguageLibraryConfig(
             language=LANGUAGE_ID,
             destination='lib/<lib:%svm>' % LANGUAGE_ID,
             launchers=['bin/<exe:trufflesqueak-launcher>'],
             jar_distributions=['trufflesqueak:TRUFFLESQUEAK_LAUNCHER'],
             main_class='%s.launcher.TruffleSqueakLauncher' % PACKAGE_NAME,
-            build_args=[
-                '-H:+ReportExceptionStackTraces',
-                '-H:+DumpThreadStacksOnSignal',
-                '-H:+DetectUserDirectoriesInImageHeap',
-                '-H:+TruffleCheckBlockListMethods',
-            ],
-        )
-    ],
+            build_args=SVM_BUILD_ARGS,
+        )]
+    ),
     stability="experimental",
     post_install_msg=None,
 ))