From cbbd8fbd4295fb8ad2d660201b8c778d9312da5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Manso?= Date: Sat, 8 Aug 2026 22:35:21 +0100 Subject: [PATCH] refactor(make): report the real dev ports and document every override (#2389) --- Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 7d55fc1aa3..31c49d8208 100644 --- a/Makefile +++ b/Makefile @@ -53,13 +53,16 @@ SERVICE_BUNDLE_DIR ?= $(CURDIR)/dist/kandev SERVICE_LAUNCHER = $(SERVICE_BUNDLE_DIR)/bin/kandev SERVICE_VERSION ?= $(RUNTIME_VERSION) SERVICE_ENV = KANDEV_BUNDLE_DIR="$(SERVICE_BUNDLE_DIR)" KANDEV_VERSION="$(SERVICE_VERSION)" -SERVICE_PORT_FLAG := $(if $(PORT),--port $(PORT),) +PORT_FLAG := $(if $(PORT),--port $(PORT),) SERVICE_HOME_DIR_FLAG := $(if $(HOME_DIR),--home-dir "$(HOME_DIR)",) SERVICE_NO_BOOT_START_FLAG := $(if $(filter 1 true yes,$(NO_BOOT_START)),--no-boot-start,) -SERVICE_INSTALL_FLAGS := $(SERVICE_PORT_FLAG) $(SERVICE_HOME_DIR_FLAG) $(SERVICE_NO_BOOT_START_FLAG) -DEV_PORT_FLAG := $(if $(PORT),--port $(PORT),) +SERVICE_INSTALL_FLAGS := $(PORT_FLAG) $(SERVICE_HOME_DIR_FLAG) $(SERVICE_NO_BOOT_START_FLAG) DEV_WEB_PORT_FLAG := $(if $(WEB_PORT),--web-internal-port $(WEB_PORT),) -DEV_FLAGS := $(DEV_PORT_FLAG) $(DEV_WEB_PORT_FLAG) $(DEV_ARGS) +DEV_FLAGS := $(PORT_FLAG) $(DEV_WEB_PORT_FLAG) $(DEV_ARGS) +# $(if …) does not strip its condition, so an all-whitespace DEV_FLAGS reads as +# true. Test and print this instead, and forward DEV_FLAGS itself — stripping +# what reaches the CLI would collapse whitespace inside a quoted DEV_ARGS value. +DEV_FLAGS_DISPLAY := $(strip $(DEV_FLAGS)) DESKTOP_BUNDLES ?= dmg # Phase headers @@ -87,7 +90,8 @@ help: @echo " bootstrap Install mise tools, workspace deps, and git hooks" @echo " bootstrap-e2e Bootstrap plus Playwright browser/system deps" @echo " dev Run backend + web via local CLI (auto ports)" - @echo " dev PORT=38430 Run dev on a fixed backend port (beats KANDEV_BACKEND_PORT)" + @echo " dev PORT=38430 WEB_PORT=37430 Run dev on fixed ports (beat KANDEV_BACKEND_PORT/KANDEV_PORT)" + @echo " dev DEV_ARGS='--verbose' Pass extra flags through to the dev CLI" @echo " dev-prod-db Run dev mode against the production db at ~/.kandev" @echo " dev-backend Run backend in development mode (port 38429)" @echo " dev-web Run web app in development mode (port 37429)" @@ -191,7 +195,7 @@ ifeq ($(OS),Windows_NT) @echo "Building winjob (Ctrl-C-safe wrapper for Windows)..." @$(MAKE) -C $(BACKEND_DIR) build-winjob endif - @echo "Launching via CLI (auto ports)..." + @echo "Launching via CLI$(if $(DEV_FLAGS_DISPLAY), ($(DEV_FLAGS_DISPLAY)), (auto ports))..." @cd $(APPS_DIR) && $(PNPM) -C cli dev -- dev $(DEV_FLAGS) .PHONY: dev-prod-db