godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

C#: Allow configuring Mono debugger agent with cmdline args

Browse Source 
The command line option is the same you would pass to Mono, but it
begins with `--mono-debugger-agent=` instead of `--debugger-agent=`.

This is useful for platforms where it's difficult for the user to
configure it via environment variables, like Android.

(cherry picked from commit 3b085e2665)
This commit is contained in:
Ignacio Roldán Etcheverry 2022-01-16 12:33:50 +01:00 committed by Rémi Verschelde
parent 965fbce9d4
commit cd016ea0b1
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/mono/mono_gd/gd_mono.cpp
View File

@ -132,14 +132,31 @@ void gd_mono_debug_init() {
CharString da_args = OS::get_singleton()->get_environment("GODOT_MONO_DEBUGGER_AGENT").utf8(); CharString da_args = OS::get_singleton()->get_environment("GODOT_MONO_DEBUGGER_AGENT").utf8();
if (da_args.length()) { if (da_args.length()) {
// Clear to avoid passing it to child processes
OS::get_singleton()->set_environment("GODOT_MONO_DEBUGGER_AGENT", String()); OS::get_singleton()->set_environment("GODOT_MONO_DEBUGGER_AGENT", String());
} else {
// Try with command line arguments. This is useful on platforms where it's difficult to pass
// environment variables. The command line arguments can be specified in the export options.
String da_cmdline_arg;
List<String> cmdline_args = OS::get_singleton()->get_cmdline_args();
for (List<String>::Element *E = cmdline_args.front(); E; E = E->next()) {
const String &arg = E->get();
if (arg.begins_with("--mono-debugger-agent=")) {
da_cmdline_arg = arg;
break;
}
}
if (da_cmdline_arg.length()) {
da_cmdline_arg.replace_first("--mono-debugger-agent=", "--debugger-agent=");
da_args = da_cmdline_arg.utf8();
}
} }
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
int da_port = GLOBAL_DEF("mono/debugger_agent/port", 23685);
bool da_suspend = GLOBAL_DEF("mono/debugger_agent/wait_for_debugger", false);
int da_timeout = GLOBAL_DEF("mono/debugger_agent/wait_timeout", 3000);
if (Engine::get_singleton()->is_editor_hint() || if (Engine::get_singleton()->is_editor_hint() ||
ProjectSettings::get_singleton()->get_resource_path().empty() || ProjectSettings::get_singleton()->get_resource_path().empty() ||
Main::is_project_manager()) { Main::is_project_manager()) {
@ -148,6 +165,12 @@ void gd_mono_debug_init() {
} }
if (da_args.length() == 0) { if (da_args.length() == 0) {
// Use project settings defaults for the editor player
int da_port = GLOBAL_DEF("mono/debugger_agent/port", 23685);
bool da_suspend = GLOBAL_DEF("mono/debugger_agent/wait_for_debugger", false);
int da_timeout = GLOBAL_DEF("mono/debugger_agent/wait_timeout", 3000);
da_args = String("--debugger-agent=transport=dt_socket,address=127.0.0.1:" + itos(da_port) + da_args = String("--debugger-agent=transport=dt_socket,address=127.0.0.1:" + itos(da_port) +
",embedding=1,server=y,suspend=" + (da_suspend ? "y,timeout=" + itos(da_timeout) : "n")) ",embedding=1,server=y,suspend=" + (da_suspend ? "y,timeout=" + itos(da_timeout) : "n"))
.utf8(); .utf8();