From d9a863370004c5be0b030b199bbbf06fb217f6ac Mon Sep 17 00:00:00 2001
From: cmidgley <chris@Koose.com>
Date: Fri, 5 Jul 2024 18:57:48 -0400
Subject: [PATCH 1/4] Support env var XSBUG_PORT on xsbug-log.js

---
 tools/xsbug-log/xsbug-log.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/xsbug-log/xsbug-log.js b/tools/xsbug-log/xsbug-log.js
index f0679b2cfd..d3c33775af 100644
--- a/tools/xsbug-log/xsbug-log.js
+++ b/tools/xsbug-log/xsbug-log.js
@@ -70,7 +70,7 @@ class LogMachine extends Machine {
 	}
 }
 
-const portIn = 5002;
+const portIn = process.env.XSBUG_PORT ?? 5002;
 let connections = 0;
 let autoexit = false;
 

From 342e623eb0066ecf7ca9b241f5bbf325f318c3aa Mon Sep 17 00:00:00 2001
From: cmidgley <chris@Koose.com>
Date: Sat, 6 Jul 2024 06:33:18 -0400
Subject: [PATCH 2/4] Set XSBUG_PORT/XSBUG_HOST for simulator on Windows

---
 tools/mcconfig/nmake.win.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/mcconfig/nmake.win.mk b/tools/mcconfig/nmake.win.mk
index eaf9835549..91998313cc 100644
--- a/tools/mcconfig/nmake.win.mk
+++ b/tools/mcconfig/nmake.win.mk
@@ -33,8 +33,15 @@ START_XSBUG = tasklist /nh /fi "imagename eq xsbug.exe" | find /i "xsbug.exe" >
 START_XSBUG =
 !ENDIF
 
+!IFNDEF XSBUG_PORT
+XSBUG_PORT = 5002
+!ENDIF
+!IFNDEF XSBUG_HOST
+XSBUG_HOST = localhost
+!ENDIF
+
 !IF "$(XSBUG_LOG)"=="1"
-START_COMMAND = cd $(MODDABLE)\tools\xsbug-log && node xsbug-log start /B $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll
+START_COMMAND = cmd /c "set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log start /B $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll"
 !ELSE
 START_COMMAND = start $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll
 !ENDIF

From 33816106fce104a82aab091411bfc11ca06502a9 Mon Sep 17 00:00:00 2001
From: cmidgley <chris@Koose.com>
Date: Sat, 6 Jul 2024 09:14:31 -0400
Subject: [PATCH 3/4] Remove kill serial2xsbug / start xsbug from prepare

---
 tools/mcconfig/nmake.esp32.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/mcconfig/nmake.esp32.mk b/tools/mcconfig/nmake.esp32.mk
index 4207fbba38..a0b0c2d0c5 100644
--- a/tools/mcconfig/nmake.esp32.mk
+++ b/tools/mcconfig/nmake.esp32.mk
@@ -510,8 +510,6 @@ release: precursor
 	python %IDF_PATH%\tools\idf.py $(IDF_PY_LOG_FLAG) $(PORT_COMMAND) -b $(UPLOAD_SPEED) monitor
 
 prepare:
-	$(KILL_SERIAL2XSBUG)
-	$(START_XSBUG)
 	if exist $(BLD_DIR)\xs_esp32.elf del $(BLD_DIR)\xs_esp32.elf
 	if not exist $(BLD_DIR) mkdir $(BLD_DIR)
 	copy $(BIN_DIR)\xs_$(ESP32_SUBCLASS).a $(BLD_DIR)\.

From 5729d2119a063921e1190a48565db3eb789509b4 Mon Sep 17 00:00:00 2001
From: cmidgley <chris@Koose.com>
Date: Tue, 24 Sep 2024 18:36:22 -0400
Subject: [PATCH 4/4] Merged localhost launch xsbug logic

---
 tools/mcconfig/nmake.win.mk | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/mcconfig/nmake.win.mk b/tools/mcconfig/nmake.win.mk
index fce0c6349e..a37ea37e43 100644
--- a/tools/mcconfig/nmake.win.mk
+++ b/tools/mcconfig/nmake.win.mk
@@ -23,11 +23,16 @@
 !CMDSWITCHES +S
 !ENDIF
 
+
 !IF "$(DEBUG)"=="1"
 !IF "$(XSBUG_LOG)"=="1"
 START_XSBUG =
 !ELSE
+!IF "$(XSBUG_HOST)"=="localhost"
 START_XSBUG = tasklist /nh /fi "imagename eq xsbug.exe" | find /i "xsbug.exe" > nul || (start $(BUILD_DIR)\bin\win\release\xsbug.exe)
+!ELSE
+START_XSBUG = echo "mcconfig -x" is remote ($(XSBUG_HOST):$(XSBUG_PORT)), not starting xsbug
+!ENDIF
 !ENDIF
 !ELSE
 START_XSBUG =
@@ -41,9 +46,13 @@ XSBUG_HOST = localhost
 !ENDIF
 
 !IF "$(XSBUG_LOG)"=="1"
+!IF "$(XSBUG_HOST)"=="localhost"
 START_COMMAND = cmd /c "set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log start /B $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll"
 !ELSE
-START_COMMAND = start $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll
+START_COMMAND = cmd /c "set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && start $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll"
+!ENDIF
+!ELSE
+START_COMMAND = cmd /c "set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && start $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll"
 !ENDIF
 KILL_COMMAND = taskkill /im mcsim.exe /F 2> nul || (call )