Skip to content

fix: improve Windows compatibility for Makefile and sync tools #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rainoeelmae wants to merge 1 commit into
base: main
Choose a base branch
from
+78 −114
Open

fix: improve Windows compatibility for Makefile and sync tools #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
# ==============================================================================

.PHONY: dev
dev: server client ## Run both backend and frontend development servers
dev: ## Run both backend and frontend development servers
@$(MAKE) -j2 server client


.PHONY: server
server: ## Start the backend server in the background
Expand All @@ -12,14 +14,14 @@ server: ## Start the backend server in the background

.PHONY: client
client: ## Start the frontend development server
@cd frontend && VITE_API_BASE_URL=http://localhost:6400 npm run dev
@cd frontend && npx cross-env VITE_API_BASE_URL=http://localhost:6400 npm run dev

.PHONY: stop
stop: ## Stop backend and frontend servers
stop: ## Stop backend and frontend servers cross-platform
@echo "Stopping backend server (port 6400)..."
@lsof -t -i:6400 | xargs kill -9 2>/dev/null || echo "Backend server not found on port 6400."
@npx kill-port 6400
@echo "Stopping frontend server (port 5173)..."
@lsof -t -i:5173 | xargs kill -9 2>/dev/null || echo "Frontend server not found on port 5173."
@npx kill-port 5173

# ==============================================================================
# Tools & Maintenance
Expand All @@ -39,4 +41,5 @@ validate-yamls: ## Validate all YAML configuration files

.PHONY: help
help: ## Display this help message
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
@python -c "import re; \
[print(f'{m[0]:<20} {m[1]}') for m in re.findall(r'^([a-zA-Z_-]+):.*?## (.*)$$', open('$(MAKEFILE_LIST)').read(), re.M)]" | sort
129 changes: 22 additions & 107 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"devDependencies": {
"@eslint/js": "^9.39.1",
"@vitejs/plugin-vue": "^6.0.1",
"cross-env": "^10.1.0",
"eslint": "^9.39.1",
"eslint-plugin-vue": "^10.5.1",
"globals": "^16.5.0",
Expand Down
40 changes: 40 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"devDependencies": {
"kill-port": "^2.0.1"
}
}
2 changes: 1 addition & 1 deletion tools/sync_vuegraphs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def sync_yaml_to_vuegraphs():
try:
filename = Path(file_path).stem # simulation_hospital_lmstudio

with open(file_path, "r") as f:
with open(file_path, 'r', encoding='utf-8') as f:
content = f.read()

# Basic validation to ensure it's a valid YAML
Expand Down