Skip to content

Commit ba1e80d

Browse files
committed
Make svm-jdwp options known to driver and convert to macro
1 parent c7e41e3 commit ba1e80d

File tree

3 files changed

+34
-2
lines changed

3 files changed

+34
-2
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# This file contains support for building images with JDWP debugging support
2+
3+
CustomHostedOptions = JDWP CopyNativeJDWPLibrary
4+
5+
ImageBuilderModulePath = ${.}/builder/svm-jdwp-common.jar:${.}/builder/svm-jdwp-resident.jar
6+
7+
Args = -H:+UnlockExperimentalVMOptions \
8+
-H:+JDWP \
9+
-H:-UnlockExperimentalVMOptions

substratevm/mx.substratevm/mx_substratevm.py

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1620,6 +1620,20 @@ def prevent_build_path_in_libgraal():
16201620
"-H:+PreserveFramePointer",
16211621
]
16221622

1623+
mx_sdk_vm.register_graalvm_component(mx_sdk_vm.GraalVMSvmMacro(
1624+
suite=suite,
1625+
name='SubstrateVM JDWP Debugger Resident',
1626+
short_name='svmjdwp',
1627+
dir_name="svmjdwp",
1628+
license_files=[],
1629+
third_party_license_files=[],
1630+
dependencies=['SubstrateVM'],
1631+
builder_jar_distributions=['substratevm:SVM_JDWP_COMMON', 'substratevm:SVM_JDWP_RESIDENT'],
1632+
support_distributions=['substratevm:SVM_JDWP_RESIDENT_SUPPORT'],
1633+
stability="experimental",
1634+
jlink=False,
1635+
))
1636+
16231637
libsvmjdwp_lib_config = mx_sdk_vm.LibraryConfig(
16241638
destination="<lib:svmjdwp>",
16251639
jvm_library=True,
@@ -1634,19 +1648,20 @@ def prevent_build_path_in_libgraal():
16341648
libsvmjdwp = mx_sdk_vm.GraalVmJreComponent(
16351649
suite=suite,
16361650
name='SubstrateVM JDWP Debugger',
1637-
short_name='svmjdwp',
1651+
short_name='svmjdwpserver',
16381652
dir_name="svm",
16391653
license_files=[],
16401654
third_party_license_files=[],
16411655
dependencies=[],
16421656
jar_distributions=[],
1643-
builder_jar_distributions=['substratevm:SVM_JDWP_COMMON', 'substratevm:SVM_JDWP_RESIDENT'],
1657+
builder_jar_distributions=[],
16441658
support_distributions=[],
16451659
priority=1,
16461660
library_configs=[libsvmjdwp_lib_config],
16471661
stability="experimental",
16481662
jlink=False,
16491663
)
1664+
16501665
mx_sdk_vm.register_graalvm_component(libsvmjdwp)
16511666

16521667
def _native_image_configure_extra_jvm_args():

substratevm/mx.substratevm/suite.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2586,6 +2586,14 @@
25862586
}
25872587
},
25882588

2589+
"SVM_JDWP_RESIDENT_SUPPORT" : {
2590+
"native" : True,
2591+
"description" : "JDWP debugging support",
2592+
"layout" : {
2593+
"native-image.properties" : "file:mx.substratevm/macro-svmjdwp.properties",
2594+
},
2595+
},
2596+
25892597
"SVM_JDWP_SERVER": {
25902598
"subDir": "src",
25912599
"dependencies": [

0 commit comments

Comments
 (0)