kevin
ebe082500f
路由性能优化: - 修复 macOS route 命令语法错误（去掉 -net 参数） - 路由应用拆分为 Essential（ready前，4-6条命令<1s）+ Deferred（ready后，批量脚本） - 新增 CIDR 聚合算法（cidrmerge.go），合并相邻 CIDR 块减少路由数量（10826->7500） - 批量脚本执行：3平台各实现8个批量函数，临时脚本单次执行替代逐条进程创建 - 并行批量：拆为4个子shell并行执行，总时间降为1/4 连接步骤显示: - stats 新增 connectStep + cidrError 原子变量 - 连接生命周期中设置步骤（fetch_cidrs/connecting/load_routes），UI 实时显示 - after-proxy CIDR 获取期间显示加载状态，获取失败显示错误提示 CIDR 刷新按钮: - ipc 新增 CmdRefreshCIDR 命令 - daemon 处理刷新请求，session.RefreshCIDRs() 重新获取+添加路由 - UI 状态卡新增刷新按钮，proxy/bypass 模式已连接时显示 README: - 补充 URL 获取时机注意事项（bypass模式after-proxy可能失败） - 补充 CIDR 聚合与批量执行说明
122 lines
4.6 KiB
Makefile
122 lines
4.6 KiB
Makefile
# LMVPN Client — Makefile
|
|
|
|
APP_NAME = LMVPN
|
|
BUNDLE_ID = com.lmvpn.client
|
|
GUI_BIN = lmvpn
|
|
DAEMON_BIN = lmvpnd
|
|
BUILD_DIR = build
|
|
APP_BUNDLE = $(APP_NAME).app
|
|
|
|
GO = go
|
|
CGO_ENABLED = 1
|
|
WINDRES ?= x86_64-w64-mingw32-windres
|
|
MINGW_CC ?= x86_64-w64-mingw32-gcc
|
|
SEMVER ?= 0.5.9
|
|
GIT_HASH = $(shell git rev-parse --short HEAD 2>/dev/null || echo unknown)
|
|
VERSION = $(SEMVER)-$(GIT_HASH)
|
|
LDFLAGS = -s -w -X lmvpn/internal/version.Version=$(VERSION)
|
|
|
|
.PHONY: all build app run daemon clean vet tidy fmt icon icon-windows build-windows installer-windows
|
|
|
|
## all: build the .app bundle (default)
|
|
all: app
|
|
|
|
## build: compile both the GUI and daemon binaries
|
|
build:
|
|
mkdir -p $(BUILD_DIR)
|
|
CGO_ENABLED=$(CGO_ENABLED) $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(GUI_BIN) ./cmd/lmvpn
|
|
CGO_ENABLED=$(CGO_ENABLED) $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(DAEMON_BIN) ./cmd/lmvpnd
|
|
|
|
## app: build binaries and assemble .app bundle
|
|
app: build
|
|
rm -rf $(APP_BUNDLE)
|
|
mkdir -p $(APP_BUNDLE)/Contents/MacOS
|
|
mkdir -p $(APP_BUNDLE)/Contents/Resources
|
|
cp $(BUILD_DIR)/$(GUI_BIN) $(APP_BUNDLE)/Contents/MacOS/$(GUI_BIN)
|
|
cp $(BUILD_DIR)/$(DAEMON_BIN) $(APP_BUNDLE)/Contents/MacOS/$(DAEMON_BIN)
|
|
cp resources/Info.plist $(APP_BUNDLE)/Contents/Info.plist
|
|
/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $(SEMVER)" \
|
|
-c "Set :CFBundleVersion $(GIT_HASH)" \
|
|
$(APP_BUNDLE)/Contents/Info.plist
|
|
@if [ -f resources/icon.icns ]; then \
|
|
cp resources/icon.icns $(APP_BUNDLE)/Contents/Resources/icon.icns; \
|
|
else echo " (no icon.icns found, skipping icon)"; fi
|
|
@echo "Built $(APP_BUNDLE)"
|
|
|
|
## icon: generate icon.icns from resources/icon.png (or resources/logo.svg)
|
|
icon:
|
|
@if [ -f resources/logo.svg ] && [ ! -f resources/icon.png -o resources/logo.svg -nt resources/icon.png ]; then \
|
|
echo "Converting resources/logo.svg -> resources/icon.png"; \
|
|
sips -z 1024 1024 -s format png resources/logo.svg --out resources/icon.png >/dev/null 2>&1; \
|
|
fi
|
|
@if [ ! -f resources/icon.png ]; then echo "resources/icon.png not found"; exit 1; fi
|
|
mkdir -p resources/icon.iconset
|
|
@for size in 16 32 64 128 256 512 1024; do \
|
|
sips -z $$size $$size resources/icon.png --out resources/icon.iconset/icon_$${size}x$${size}.png >/dev/null 2>&1; \
|
|
done
|
|
@for pair in "16 32" "32 64" "128 256" "256 512"; do \
|
|
set -- $$pair; \
|
|
sips -z $$2 $$2 resources/icon.png --out resources/icon.iconset/icon_$${1}x$${1}@2x.png >/dev/null 2>&1; \
|
|
done
|
|
cp resources/icon.png resources/icon.iconset/icon_512x512@2x.png
|
|
iconutil -c icns resources/icon.iconset -o resources/icon.icns
|
|
rm -rf resources/icon.iconset
|
|
@echo "Generated resources/icon.icns"
|
|
|
|
## run: build and run the GUI
|
|
run: build
|
|
./$(BUILD_DIR)/$(GUI_BIN)
|
|
|
|
## daemon: run the daemon directly (needs root)
|
|
daemon: build
|
|
sudo ./$(BUILD_DIR)/$(DAEMON_BIN)
|
|
|
|
## vet: run go vet
|
|
vet:
|
|
$(GO) vet ./...
|
|
|
|
## tidy: run go mod tidy
|
|
tidy:
|
|
$(GO) mod tidy
|
|
|
|
## fmt: format Go code
|
|
fmt:
|
|
$(GO) fmt ./...
|
|
|
|
## clean: remove build artifacts
|
|
clean:
|
|
rm -rf $(BUILD_DIR) $(APP_BUNDLE)
|
|
|
|
## icon-windows: generate icon.ico and compile Windows resource (.syso)
|
|
icon-windows:
|
|
go run resources/genico/main.go
|
|
$(WINDRES) -i resources/lmvpn.rc -O coff -o cmd/lmvpn/resource_windows_amd64.syso
|
|
$(WINDRES) -i resources/lmvpn.rc -O coff -o cmd/lmvpnd/resource_windows_amd64.syso
|
|
@echo "Generated Windows icon resources"
|
|
|
|
## build-windows: cross-compile Windows x86_64 exes (requires mingw-w64)
|
|
## The .syso icon resources are committed in cmd/*/; run `make icon-windows` to regenerate.
|
|
build-windows:
|
|
mkdir -p $(BUILD_DIR)
|
|
CGO_ENABLED=1 GOOS=windows GOARCH=amd64 CC=$(MINGW_CC) \
|
|
$(GO) build -ldflags "$(LDFLAGS) -H windowsgui" -o $(BUILD_DIR)/$(GUI_BIN).exe ./cmd/lmvpn
|
|
CGO_ENABLED=1 GOOS=windows GOARCH=amd64 CC=$(MINGW_CC) \
|
|
$(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(DAEMON_BIN).exe ./cmd/lmvpnd
|
|
@echo "Built $(BUILD_DIR)/$(GUI_BIN).exe and $(BUILD_DIR)/$(DAEMON_BIN).exe"
|
|
|
|
## installer-windows: build exes and compile Inno Setup installer (.exe)
|
|
## Requires ISCC on PATH (Windows) or Wine + Inno Setup 6 (macOS/Linux).
|
|
installer-windows: build-windows
|
|
@echo "Compiling installer with version $(VERSION)..."
|
|
@if command -v ISCC >/dev/null 2>&1; then \
|
|
ISCC /DAppVersion=$(VERSION) installer/lmvpn.iss; \
|
|
elif command -v wine >/dev/null 2>&1; then \
|
|
wine "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" /DAppVersion=$(VERSION) installer/lmvpn.iss; \
|
|
else \
|
|
echo "ERROR: ISCC not found. Install Inno Setup 6 on Windows,"; \
|
|
echo " or install Wine + Inno Setup 6 on macOS/Linux."; \
|
|
echo " Download: https://jrsoftware.org/isdl.php"; \
|
|
exit 1; \
|
|
fi
|
|
@echo "Installer: $(BUILD_DIR)/LMVPN-Setup-$(VERSION).exe"
|