Skip to content

Commit c3449da

Browse files
cmidgleymkellner
cmidgley
authored and
mkellner
committed
add XSBUG_LOG_PORT (#1376 - Custom IP/Port fixes for xsbug on Windows)
1 parent a55bfd8 commit c3449da

11 files changed

+78
-22
lines changed

‎tools/mcconfig/make.esp.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ DEBUG_IP ?=
7979
# xsbug defaults
8080
XSBUG_HOST ?= localhost
8181
XSBUG_PORT ?= 5002
82+
XSBUG_LOG_PORT ?= 5002
8283

8384
NEWLIBC_PATH = $(ESPRESSIF_SDK_ROOT)/components/newlib/newlib/lib/libc.a
8485

@@ -285,7 +286,7 @@ ifeq ($(DEBUG),1)
285286
START_XSBUG =
286287
ifeq ($(HOST_OS),Darwin)
287288
ifeq ("$(XSBUG_LAUNCH)","log")
288-
CONNECT_XSBUG = export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(LOG_LAUNCH) serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1 -elf $(TMP_DIR)/main.elf -bin $(TOOLS_BIN)
289+
CONNECT_XSBUG = export XSBUG_LOG_PORT=$(XSBUG_LOG_PORT) && export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(LOG_LAUNCH) serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1 -elf $(TMP_DIR)/main.elf -bin $(TOOLS_BIN)
289290
else
290291
CONNECT_XSBUG = export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1 -elf $(TMP_DIR)/main.elf -bin $(TOOLS_BIN)
291292
ifeq ("$(XSBUG_LAUNCH)","app")
@@ -294,7 +295,7 @@ ifeq ($(DEBUG),1)
294295
endif
295296
else
296297
ifeq ("$(XSBUG_LAUNCH)","log")
297-
CONNECT_XSBUG = export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(LOG_LAUNCH) serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1
298+
CONNECT_XSBUG = export XSBUG_LOG_PORT=$(XSBUG_LOG_PORT) && export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(LOG_LAUNCH) serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1
298299
else
299300
CONNECT_XSBUG = export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1
300301
ifeq ("$(XSBUG_LAUNCH)","app")

‎tools/mcconfig/make.esp32.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ DEBUGGER_SPEED ?= 460800
2424

2525
XSBUG_HOST ?= localhost
2626
XSBUG_PORT ?= 5002
27+
XSBUG_LOG_PORT ?= 5002
2728

2829
USE_USB ?= 0
2930
# USE_USB = 1 - TinyUSB - uses a custom VID/PID
@@ -546,7 +547,7 @@ ifeq ($(DEBUG),1)
546547

547548
ifeq ("$(XSBUG_LAUNCH)","log")
548549
DO_LAUNCH = echo ; echo $(BEFORE_DEBUGGING_MESSAGE); echo ; \
549-
XSBUG_PORT=$(XSBUG_PORT) XSBUG_HOST=$(XSBUG_HOST) \
550+
XSBUG_LOG_PORT=$(XSBUG_LOG_PORT) XSBUG_PORT=$(XSBUG_PORT) XSBUG_HOST=$(XSBUG_HOST) \
550551
cd $(MODDABLE)/tools/xsbug-log && node xsbug-log \
551552
serial2xsbug `cat $(PORT_NAME_PATH)` $(DEBUGGER_SPEED) 8N1
552553
endif

‎tools/mcconfig/make.lin.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2016-2023 Moddable Tech, Inc.
2+
# Copyright (c) 2016-2025 Moddable Tech, Inc.
33
#
44
# This file is part of the Moddable SDK Tools.
55
#
@@ -30,7 +30,7 @@ KILL_SIMULATOR =
3030
ifeq ($(DEBUG),1)
3131
ifeq ("$(XSBUG_LAUNCH)","log")
3232
# START_SIMULATOR = export DISPLAY=:0.0 && export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)/mc.so
33-
START_SIMULATOR = export DISPLAY=:2.0 && export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)/mc.so
33+
START_SIMULATOR = export DISPLAY=:2.0 && export XSBUG_LOG_PORT=$(XSBUG_LOG_PORT) && export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)/mc.so
3434
else
3535
ifeq ("$(XSBUG_LAUNCH)","app")
3636
START_XSBUG = $(shell nohup $(BUILD_DIR)/bin/lin/release/xsbug > /dev/null 2>&1 &)
@@ -141,6 +141,7 @@ VPATH += $(XS_DIRECTORIES)
141141

142142
XSBUG_HOST ?= localhost
143143
XSBUG_PORT ?= 5002
144+
XSBUG_LOG_PORT ?= 5002
144145

145146
.PHONY: all build clean xsbug
146147

‎tools/mcconfig/make.mac.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2016-2025 Moddable Tech, Inc.
2+
# Copyright (c) 2016-2025 Moddable Tech, Inc.
33
#
44
# This file is part of the Moddable SDK Tools.
55
#
@@ -23,7 +23,7 @@ KILL_SIMULATOR = osascript -e 'quit app "mcsim"'
2323
ifeq ($(DEBUG),1)
2424
START_XSBUG =
2525
ifeq ("$(XSBUG_LAUNCH)","log")
26-
START_SIMULATOR = export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log open -a $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)/mc.so
26+
START_SIMULATOR = export XSBUG_LOG_PORT=$(XSBUG_LOG_PORT) && export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log open -a $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)/mc.so
2727
else ifeq ("$(XSBUG_LAUNCH)","app")
2828
START_XSBUG = open -a $(BUILD_DIR)/bin/mac/release/xsbug.app -g
2929
endif
@@ -123,6 +123,7 @@ VPATH += $(XS_DIRECTORIES)
123123

124124
XSBUG_HOST ?= localhost
125125
XSBUG_PORT ?= 5002
126+
XSBUG_LOG_PORT ?= 5002
126127

127128
.PHONY: all build clean xsbug
128129

‎tools/mcconfig/make.nrf52.mk

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ UF2_VOLUME_NAME ?= MODDABLE4
5353
M4_VID ?= beef
5454
M4_PID ?= cafe
5555

56+
XSBUG_HOST ?= localhost
57+
XSBUG_PORT ?= 5002
58+
XSBUG_LOG_PORT ?= 5002
59+
5660
ifeq ($(USE_USB),0)
5761
ifeq ($(HOST_OS),Darwin)
5862
VERS = $(shell sw_vers -productVersion | cut -f1 -d.)
@@ -76,7 +80,7 @@ ifeq ($(HOST_OS),Darwin)
7680
UF2_VOLUME_PATH = /Volumes/$(UF2_VOLUME_NAME)
7781

7882
SET_PROGRAMMING_MODE = $(PLATFORM_DIR)/config/programmingMode $(M4_VID) $(M4_PID) $(UF2_VOLUME_PATH)
79-
START_NODE = cd $(MODDABLE)/tools/xsbug-log && XSBUG_PORT=$(XSBUG_PORT) XSBUG_HOST=$(XSBUG_HOST) node xsbug-log
83+
START_NODE = cd $(MODDABLE)/tools/xsbug-log && XSBUG_LOG_PORT=$(XSBUG_LOG_PORT) XSBUG_PORT=$(XSBUG_PORT) XSBUG_HOST=$(XSBUG_HOST) node xsbug-log
8084

8185
ifeq ($(USE_USB),1)
8286
START_SERIAL2XSBUG = serial2xsbug $(M4_VID):$(M4_PID) 921600 8N1
@@ -129,7 +133,7 @@ else
129133
else
130134
# not usb
131135
ifeq ($(XSBUG_LOG),1)
132-
CONNECT_XSBUG = XSBUG_PORT=$(XSBUG_PORT) XSBUG_HOST=$(XSBUG_HOST) cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(MODDABLE_TOOLS_DIR)/serial2xsbug $(DEBUGGER_PORT) $(DEBUGGER_SPEED) 8N1
136+
CONNECT_XSBUG = XSBUG_LOG_PORT=$(XSBUG_LOG_PORT) XSBUG_PORT=$(XSBUG_PORT) XSBUG_HOST=$(XSBUG_HOST) cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(MODDABLE_TOOLS_DIR)/serial2xsbug $(DEBUGGER_PORT) $(DEBUGGER_SPEED) 8N1
133137
else
134138
CONNECT_XSBUG = XSBUG_PORT=$(XSBUG_PORT) XSBUG_HOST=$(XSBUG_HOST) $(MODDABLE_TOOLS_DIR)/serial2xsbug $(DEBUGGER_PORT) $(DEBUGGER_SPEED) 8N1
135139
endif

‎tools/mcconfig/make.pico.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2016-2024 Moddable Tech, Inc.
2+
# Copyright (c) 2016-2025 Moddable Tech, Inc.
33
#
44
# This file is part of the Moddable SDK Tools.
55
#
@@ -39,6 +39,7 @@ DEBUGGER_PORT ?= /dev/cu.SLAB_USBtoUART
3939

4040
XSBUG_HOST ?= localhost
4141
XSBUG_PORT ?= 5002
42+
XSBUG_LOG_PORT ?= 5002
4243

4344
UF2_VOLUME_NAME ?= RPI-RP2
4445
PICO_VID ?= 2e8a
@@ -79,7 +80,7 @@ ifeq ($(HOST_OS),Darwin)
7980

8081
ifeq ($(DEBUG),1)
8182
ifeq ("$(XSBUG_LAUNCH)","log")
82-
CONNECT_XSBUG=@echo "Connect to xsbug-log @ $(PICO_VID):$(PICO_PID)." && export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log serial2xsbug $(PICO_VID):$(PICO_PID) $(DEBUGGER_SPEED) 8N1
83+
CONNECT_XSBUG=@echo "Connect to xsbug-log @ $(PICO_VID):$(PICO_PID)." && export XSBUG_LOG_PORT=$(XSBUG_LOG_PORT) && export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log serial2xsbug $(PICO_VID):$(PICO_PID) $(DEBUGGER_SPEED) 8N1
8384
else
8485
CONNECT_XSBUG=@echo "Connect to xsbug @ $(PICO_VID):$(PICO_PID)." ; export XSBUG_PORT=$(XSBUG_PORT) ; export XSBUG_HOST=$(XSBUG_HOST) ; serial2xsbug $(PICO_VID):$(PICO_PID) $(DEBUGGER_SPEED) 8N1
8586
ifeq ("$(XSBUG_LAUNCH)","app")

‎tools/mcconfig/nmake.esp.mk

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2016-2024 Moddable Tech, Inc.
2+
# Copyright (c) 2016-2025 Moddable Tech, Inc.
33
#
44
# This file is part of the Moddable SDK Tools.
55
#
@@ -54,8 +54,18 @@ UPLOAD_RESET = nodemcu
5454
UPLOAD_VERB = -v
5555
!ENDIF
5656

57+
!IFNDEF XSBUG_HOST
58+
XSBUG_HOST = localhost
59+
!ENDIF
60+
!IFNDEF XSBUG_PORT
61+
XSBUG_PORT = 5002
62+
!ENDIF
63+
!IFNDEF XSBUG_LOG_PORT
64+
XSBUG_LOG_PORT = 5002
65+
!ENDIF
66+
5767
!IF "$(XSBUG_LOG)"=="1"
58-
START_SERIAL2XSBUG= echo "Starting serial2xsbug..." && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log $(BUILD_DIR)\bin\win\release\serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1 -elf $(TMP_DIR)\main.elf
68+
START_SERIAL2XSBUG= echo "Starting serial2xsbug..." && set "XSBUG_LOG_PORT=$(XSBUG_LOG_PORT)" && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log $(BUILD_DIR)\bin\win\release\serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1 -elf $(TMP_DIR)\main.elf
5969
START_XSBUG=
6070
!ELSE
6171
START_SERIAL2XSBUG= echo "Starting serial2xsbug..." && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && $(BUILD_DIR)\bin\win\release\serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1 -elf $(TMP_DIR)\main.elf

‎tools/mcconfig/nmake.esp32.mk

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2016-2024 Moddable Tech, Inc.
2+
# Copyright (c) 2016-2025 Moddable Tech, Inc.
33
#
44
# This file is part of the Moddable SDK Tools.
55
#
@@ -111,6 +111,16 @@ UPLOAD_SPEED = 921600
111111
DEBUGGER_SPEED = 460800
112112
!ENDIF
113113

114+
!IFNDEF XSBUG_HOST
115+
XSBUG_HOST = localhost
116+
!ENDIF
117+
!IFNDEF XSBUG_PORT
118+
XSBUG_PORT = 5002
119+
!ENDIF
120+
!IFNDEF XSBUG_LOG_PORT
121+
XSBUG_LOG_PORT = 5002
122+
!ENDIF
123+
114124
!IF "$(BASE_DIR)"==""
115125
BASE_DIR = $(USERPROFILE)
116126
!ENDIF
@@ -173,9 +183,9 @@ KILL_SERIAL2XSBUG= -tasklist /nh /fi "imagename eq serial2xsbug.exe" | (find /i
173183

174184
!IF "$(XSBUG_LOG)"=="1"
175185
!IF "$(USE_USB)"=="0"
176-
START_SERIAL2XSBUG = echo Launching app... & set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log start /B $(BUILD_DIR)\bin\win\release\serial2xsbug $(PORT_TO_USE) $(DEBUGGER_SPEED) 8N1
186+
START_SERIAL2XSBUG = echo Launching app... && set "XSBUG_LOG_PORT=$(XSBUG_LOG_PORT)" && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log start /B $(BUILD_DIR)\bin\win\release\serial2xsbug $(PORT_TO_USE) $(DEBUGGER_SPEED) 8N1
177187
!ELSE
178-
START_SERIAL2XSBUG = echo Launching app... && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log start /B $(BUILD_DIR)\bin\win\release\serial2xsbug $(USB_VENDOR_ID):$(USB_PRODUCT_ID) $(DEBUGGER_SPEED) 8N1
188+
START_SERIAL2XSBUG = echo Launching app... && set "XSBUG_LOG_PORT=$(XSBUG_LOG_PORT)" && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log start /B $(BUILD_DIR)\bin\win\release\serial2xsbug $(USB_VENDOR_ID):$(USB_PRODUCT_ID) $(DEBUGGER_SPEED) 8N1
179189
!ENDIF
180190
START_XSBUG =
181191
!ENDIF
@@ -548,8 +558,6 @@ release: precursor
548558
python %IDF_PATH%\tools\idf.py $(IDF_PY_LOG_FLAG) $(PORT_COMMAND) -b $(UPLOAD_SPEED) monitor
549559

550560
prepare:
551-
$(KILL_SERIAL2XSBUG)
552-
$(START_XSBUG)
553561
if exist $(BLD_DIR)\xs_esp32.elf del $(BLD_DIR)\xs_esp32.elf
554562
if not exist $(BLD_DIR) mkdir $(BLD_DIR)
555563
copy $(BIN_DIR)\xs_$(ESP32_SUBCLASS).a $(BLD_DIR)\.

‎tools/mcconfig/nmake.nrf52.mk

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,16 @@ UPLOAD_SPEED = 921600
6363
DEBUGGER_SPEED = 921600
6464
!ENDIF
6565

66+
!IFNDEF XSBUG_HOST
67+
XSBUG_HOST = localhost
68+
!ENDIF
69+
!IFNDEF XSBUG_PORT
70+
XSBUG_PORT = 5002
71+
!ENDIF
72+
!IFNDEF XSBUG_LOG_PORT
73+
XSBUG_LOG_PORT = 5002
74+
!ENDIF
75+
6676
#VERBOSE = 1
6777

6878
!IF "$(VERBOSE)"=="1"
@@ -108,7 +118,7 @@ WAIT_FOR_NEW_SERIAL = $(PLATFORM_DIR)\config\waitForNewSerialWindows.bat 1 $(UF2
108118
NORESTART =
109119
!IF "$(XSBUG_LOG)"=="1"
110120
DO_XSBUG =
111-
SERIAL_2_XSBUG = echo Starting serial2xsbug. Type Ctrl-C twice after debugging app. && cd $(MODDABLE)\tools\xsbug-log && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && node xsbug-log start /B $(MODDABLE_TOOLS_DIR)\serial2xsbug $(M4_VID):$(M4_PID) $(DEBUGGER_SPEED) 8N1
121+
SERIAL_2_XSBUG = echo Starting serial2xsbug. Type Ctrl-C twice after debugging app. && cd $(MODDABLE)\tools\xsbug-log && set "XSBUG_LOG_PORT=$(XSBUG_LOG_PORT)" && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && node xsbug-log start /B $(MODDABLE_TOOLS_DIR)\serial2xsbug $(M4_VID):$(M4_PID) $(DEBUGGER_SPEED) 8N1
112122
!ELSE
113123
DO_XSBUG = tasklist /nh /fi "imagename eq xsbug.exe" | find /i "xsbug.exe" > nul || (start $(MODDABLE_TOOLS_DIR)\xsbug.exe)
114124
SERIAL_2_XSBUG = echo Starting serial2xsbug. Type Ctrl-C twice after debugging app. && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && $(MODDABLE_TOOLS_DIR)\serial2xsbug $(M4_VID):$(M4_PID) $(DEBUGGER_SPEED) 8N1 -dtr

‎tools/mcconfig/nmake.win.mk

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,39 @@
2323
!CMDSWITCHES +S
2424
!ENDIF
2525

26+
2627
!IF "$(DEBUG)"=="1"
2728
!IF "$(XSBUG_LOG)"=="1"
2829
START_XSBUG =
2930
!ELSE
31+
!IF "$(XSBUG_HOST)"=="localhost"
3032
START_XSBUG = tasklist /nh /fi "imagename eq xsbug.exe" | find /i "xsbug.exe" > nul || (start $(BUILD_DIR)\bin\win\release\xsbug.exe)
33+
!ELSE
34+
START_XSBUG = echo "mcconfig -x" is remote ($(XSBUG_HOST):$(XSBUG_PORT)), not starting xsbug
35+
!ENDIF
3136
!ENDIF
3237
!ELSE
3338
START_XSBUG =
3439
!ENDIF
3540

41+
!IFNDEF XSBUG_PORT
42+
XSBUG_PORT = 5002
43+
!ENDIF
44+
!IFNDEF XSBUG_LOG_PORT
45+
XSBUG_LOG_PORT = 5002
46+
!ENDIF
47+
!IFNDEF XSBUG_HOST
48+
XSBUG_HOST = localhost
49+
!ENDIF
50+
3651
!IF "$(XSBUG_LOG)"=="1"
37-
START_COMMAND = cd $(MODDABLE)\tools\xsbug-log && node xsbug-log start /B $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll
52+
!IF "$(XSBUG_HOST)"=="localhost"
53+
START_COMMAND = cmd /c "set "XSBUG_LOG_PORT=$(XSBUG_LOG_PORT)" && 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"
54+
!ELSE
55+
START_COMMAND = cmd /c "set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && start $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll"
56+
!ENDIF
3857
!ELSE
39-
START_COMMAND = start $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll
58+
START_COMMAND = cmd /c "set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && start $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll"
4059
!ENDIF
4160
KILL_COMMAND = taskkill /im mcsim.exe /F 2> nul || (call )
4261

‎tools/xsbug-log/xsbug-log.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ catch (e) {
3939
process.exit();
4040
}
4141

42-
const portIn = 5002;
42+
const portIn = process.env.XSBUG_LOG_PORT ?? 5002;
4343
let connections = 0;
4444
let autoexit = false;
4545

0 commit comments

Comments
 (0)