kevin
b0aa386ee2
- 分离二进制: cmd/lmvpn (GUI+Fyne) 和 cmd/lmvpnd (daemon, 无 Fyne)
消除 daemon 启动时的 Fyne locale 初始化错误
- 新增 daemon-launch 子命令: 用 syscall.SysProcAttr{Setsid: true}
替代 nohup, 解决 osascript 无 TTY 时的 'Inappropriate ioctl' 错误
- daemon 日志写到用户家目录: paths.SetUserHome() 覆盖 root 默认路径
- IPC socket chown 给用户: 解决 root:wheel 0660 导致 GUI 无法连接
- 修复 JWT→密码认证回退: 捕获 ServerError{auth_err} 而非仅 AuthError
- 修复 token URL 编码: 用 url.QueryEscape 替代裸拼接
- 日志去重: LMVPN_DAEMON=1 时 daemon 不再 stderr 镜像到文件
- Makefile 构建双二进制并打包到 .app bundle
77 lines
2.2 KiB
Makefile
77 lines
2.2 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
|
|
LDFLAGS = -s -w
|
|
|
|
.PHONY: all build app run daemon clean vet tidy fmt icon
|
|
|
|
## 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
|
|
@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
|
|
icon:
|
|
@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)
|