better UPLOAD_PORT assumption

Moddable-OpenSource · Oct 2, 2023 · aec7d8b · aec7d8b
1 parent f018dfe
commit aec7d8b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 26 deletions.
diff --git a/tools/mcconfig/make.esp.mk b/tools/mcconfig/make.esp.mk
@@ -50,11 +50,8 @@ endif
 UPLOAD_SPEED ?= 921600
 DEBUGGER_SPEED ?= 921600
 ifeq ($(HOST_OS),Darwin)
-	ifeq ($(findstring _13.,_$(shell sw_vers -productVersion)),_13.)
-		UPLOAD_PORT ?= /dev/cu.usbserial-0001
-	else ifeq ($(findstring _12.,_$(shell sw_vers -productVersion)),_12.)
-		UPLOAD_PORT ?= /dev/cu.usbserial-0001
-	else ifeq ($(findstring _11.,_$(shell sw_vers -productVersion)),_11.)
+	VERS = $(shell sw_vers -productVersion | cut -f1 -d.)
+	ifeq ($(shell test $(VERS) -gt 10; echo $$?), 0)
 		UPLOAD_PORT ?= /dev/cu.usbserial-0001
 	else
 		UPLOAD_PORT ?= /dev/cu.SLAB_USBtoUART

diff --git a/tools/mcconfig/make.nrf52.mk b/tools/mcconfig/make.nrf52.mk
@@ -48,13 +48,16 @@ else
 	BOOTLOADER_HEX ?= $(PLATFORM_DIR)/bootloader/moddable_nrf52_bootloader-0.2.13-21-g454b281_s140_6.1.1.hex
 endif
 
+PLATFORM_DIR = $(MODDABLE)/build/devices/nrf52
+
+UF2_VOLUME_NAME ?= MODDABLE4
+M4_VID ?= beef
+M4_PID ?= cafe
+
 ifeq ($(USE_USB),0)
 	ifeq ($(HOST_OS),Darwin)
-		ifeq ($(findstring _13.,_$(shell sw_vers -productVersion)),_13.)
-			UPLOAD_PORT ?= /dev/cu.usbserial-0001
-		else ifeq ($(findstring _12.,_$(shell sw_vers -productVersion)),_12.)
-			UPLOAD_PORT ?= /dev/cu.usbserial-0001
-		else ifeq ($(findstring _11.,_$(shell sw_vers -productVersion)),_11.)
+		VERS = $(shell sw_vers -productVersion | cut -f1 -d.)
+		ifeq ($(shell test $(VERS) -gt 10; echo $$?), 0)
 			UPLOAD_PORT ?= /dev/cu.usbserial-0001
 		else
 			UPLOAD_PORT ?= /dev/cu.SLAB_USBtoUART
@@ -64,12 +67,6 @@ ifeq ($(USE_USB),0)
 	endif
 endif
 
-PLATFORM_DIR = $(MODDABLE)/build/devices/nrf52
-
-UF2_VOLUME_NAME ?= MODDABLE4
-M4_VID ?= beef
-M4_PID ?= cafe
-
 KILL_SERIAL2XSBUG = $(shell pkill serial2xsbug)
 
 CONNECT_XSBUG =

diff --git a/tools/mcrun/make.esp.mk b/tools/mcrun/make.esp.mk
@@ -19,11 +19,8 @@
 
 HOST_OS := $(shell uname)
 ifeq ($(HOST_OS),Darwin)
-	ifeq ($(findstring _13.,_$(shell sw_vers -productVersion)),_13.)
-		UPLOAD_PORT ?= /dev/cu.usbserial-0001
-	else ifeq ($(findstring _12.,_$(shell sw_vers -productVersion)),_12.)
-		UPLOAD_PORT ?= /dev/cu.usbserial-0001
-	else ifeq ($(findstring _11.,_$(shell sw_vers -productVersion)),_11.)
+	VERS = $(shell sw_vers -productVersion | cut -f1 -d.)
+	ifeq ($(shell test $(VERS) -gt 10; echo $$?), 0)
 		UPLOAD_PORT ?= /dev/cu.usbserial-0001
 	else
 		UPLOAD_PORT ?= /dev/cu.SLAB_USBtoUART

diff --git a/tools/mcrun/make.esp32.mk b/tools/mcrun/make.esp32.mk
@@ -19,12 +19,9 @@
 
 HOST_OS := $(shell uname)
 
-PROJ_DIR_TEMPLATE = $(BUILD_DIR)/devices/esp32/xsProj-$(ESP32_SUBCLASS)
-
-UPLOAD_PORT ?= $(shell bash -c "python $(PROJ_DIR_TEMPLATE)/getPort.py")
-
 ifeq ($(HOST_OS),Darwin)
-	ifeq ($(findstring _11.,_$(shell sw_vers -productVersion)),_11.)
+	VERS = $(shell sw_vers -productVersion | cut -f1 -d.)
+	ifeq ($(shell test $(VERS) -gt 10; echo $$?), 0)
 		UPLOAD_PORT ?= /dev/cu.usbserial-0001
 	else
 		UPLOAD_PORT ?= /dev/cu.SLAB_USBtoUART