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

Remove "debug/remote_port" project setting (moved to editor)

Browse Source 
Also updated default port from 6007 (X11) to 6096 (unspec)
This commit is contained in:
Fabio Alessandrelli 2017-07-22 14:22:45 +02:00
parent 63a9b02131
commit c3055b24d1
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/editor_import_export.cpp
View File

@ -1030,6 +1030,7 @@ static int _get_pad(int p_alignment, int p_n) {
void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags) {
String host = EditorSettings::get_singleton()->get("network/debug_host");
int remote_port = (int)EditorSettings::get_singleton()->get("network/debug_port");
if (p_flags & EXPORT_REMOTE_DEBUG_LOCALHOST)
host = "localhost";
@ -1049,7 +1050,7 @@ void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags
r_flags.push_back("-rdebug");
r_flags.push_back(host + ":" + String::num(GLOBAL_DEF("network/debug_port", 6007)));
r_flags.push_back(host + ":" + String::num(remote_port));
List<String> breakpoints;
ScriptEditor::get_singleton()->get_breakpoints(&breakpoints);

3
editor/editor_run.cpp
View File

@ -41,6 +41,7 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li
String resource_path = Globals::get_singleton()->get_resource_path();
String remote_host = EditorSettings::get_singleton()->get("network/debug_host");
int remote_port = (int)EditorSettings::get_singleton()->get("network/debug_port");
if (resource_path != "") {
args.push_back("-path");
@ -49,7 +50,7 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li
if (true) {
args.push_back("-rdebug");
args.push_back(remote_host + ":" + String::num(GLOBAL_DEF("network/debug_port", 6007)));
args.push_back(remote_host + ":" + String::num(remote_port));
}
args.push_back("-epid");

2
editor/editor_settings.cpp
View File

@ -413,7 +413,7 @@ void EditorSettings::setup_network() {
String lip;
String hint;
String current = has("network/debug_host") ? get("network/debug_host") : "";
int port = has("network/debug_port") ? (int)get("network/debug_port") : 6007;
int port = has("network/debug_port") ? (int)get("network/debug_port") : 6096;
for (List<IP_Address>::Element *E = local_ip.front(); E; E = E->next()) {

6
editor/script_editor_debugger.cpp
View File

@ -1169,9 +1169,9 @@ void ScriptEditorDebugger::start() {
perf_max[i] = 0;
}
uint16_t remote_port = GLOBAL_DEF("debug/remote_port", 6007);
if (server->listen(remote_port) != OK) {
EditorNode::get_log()->add_message(String("** Error listening on port ") + itos(remote_port) + String(" **"));
uint16_t debug_port = (int)EditorSettings::get_singleton()->get("network/debug_port");
if (server->listen(debug_port) != OK) {
EditorNode::get_log()->add_message(String("** Error listening on port ") + itos(debug_port) + String(" **"));
return;
}
set_process(true);

2
main/main.cpp
View File

@ -562,7 +562,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
if (debug_mode == "remote") {
ScriptDebuggerRemote *sdr = memnew(ScriptDebuggerRemote);
uint16_t debug_port = GLOBAL_DEF("debug/remote_port", 6007);
uint16_t debug_port = 6096;
if (debug_host.find(":") != -1) {
int sep_pos = debug_host.find_last(":");
debug_port = debug_host.substr(sep_pos + 1, debug_host.length()).to_int();