Make svm-jdwp options known to driver and convert to macro

Author: olpaw

substratevm/mx.substratevm/macro-svmjdwp.properties

@@ -0,0 +1,9 @@
+# This file contains support for building images with JDWP debugging support
+
+CustomHostedOptions = JDWP CopyNativeJDWPLibrary
+
+ImageBuilderModulePath = ${.}/builder/svm-jdwp-common.jar:${.}/builder/svm-jdwp-resident.jar
+
+Args = -H:+UnlockExperimentalVMOptions \
+       -H:+JDWP \
+       -H:-UnlockExperimentalVMOptions

substratevm/mx.substratevm/mx_substratevm.py

@@ -1620,6 +1620,20 @@ def prevent_build_path_in_libgraal():
     "-H:+PreserveFramePointer",
 ]
 
+mx_sdk_vm.register_graalvm_component(mx_sdk_vm.GraalVMSvmMacro(
+    suite=suite,
+    name='SubstrateVM JDWP Debugger Resident',
+    short_name='svmjdwp',
+    dir_name="svmjdwp",
+    license_files=[],
+    third_party_license_files=[],
+    dependencies=['SubstrateVM'],
+    builder_jar_distributions=['substratevm:SVM_JDWP_COMMON', 'substratevm:SVM_JDWP_RESIDENT'],
+    support_distributions=['substratevm:SVM_JDWP_RESIDENT_SUPPORT'],
+    stability="experimental",
+    jlink=False,
+))
+
 libsvmjdwp_lib_config = mx_sdk_vm.LibraryConfig(
     destination="<lib:svmjdwp>",
     jvm_library=True,
@@ -1634,19 +1648,20 @@ def prevent_build_path_in_libgraal():
 libsvmjdwp = mx_sdk_vm.GraalVmJreComponent(
     suite=suite,
     name='SubstrateVM JDWP Debugger',
-    short_name='svmjdwp',
+    short_name='svmjdwpserver',
     dir_name="svm",
     license_files=[],
     third_party_license_files=[],
     dependencies=[],
     jar_distributions=[],
-    builder_jar_distributions=['substratevm:SVM_JDWP_COMMON', 'substratevm:SVM_JDWP_RESIDENT'],
+    builder_jar_distributions=[],
     support_distributions=[],
     priority=1,
     library_configs=[libsvmjdwp_lib_config],
     stability="experimental",
     jlink=False,
 )
+
 mx_sdk_vm.register_graalvm_component(libsvmjdwp)
 
 def _native_image_configure_extra_jvm_args():

substratevm/mx.substratevm/suite.py

@@ -2586,6 +2586,14 @@
             }
         },
 
+        "SVM_JDWP_RESIDENT_SUPPORT" : {
+            "native" : True,
+            "description" : "JDWP debugging support",
+            "layout" : {
+                "native-image.properties" : "file:mx.substratevm/macro-svmjdwp.properties",
+            },
+        },
+
         "SVM_JDWP_SERVER": {
             "subDir": "src",
             "dependencies": [