From 026c4c7662ec4900df55c710c022cf60c2358cb0 Mon Sep 17 00:00:00 2001 From: wizardchen Date: Sat, 11 Apr 2026 00:56:28 +0800 Subject: [PATCH] fix: resolve neo4j parsing issue during macOS desktop app build by skipping bindings and fixing paths --- wails.json => cmd/desktop/wails.json | 8 ++------ scripts/package-mac-app.sh | 8 ++++++-- 2 files changed, 8 insertions(+), 8 deletions(-) rename wails.json => cmd/desktop/wails.json (69%) diff --git a/wails.json b/cmd/desktop/wails.json similarity index 69% rename from wails.json rename to cmd/desktop/wails.json index ae3807f2..72932f44 100644 --- a/wails.json +++ b/cmd/desktop/wails.json @@ -2,12 +2,8 @@ "$schema": "https://wails.io/schemas/config.v2.json", "name": "WeKnora Lite", "outputfilename": "WeKnora Lite", - "frontend:install": "npm install", - "frontend:build": "npm run build", - "frontend:dev:watcher": "npm run dev", - "frontend:dev:serverUrl": "auto", - "frontend:dir": "frontend", - "wailsjsdir": "frontend/src", + "frontend:dir": "../../frontend", + "wailsjsdir": "../../frontend/src", "author": { "name": "WeKnora Team", "email": "" diff --git a/scripts/package-mac-app.sh b/scripts/package-mac-app.sh index f6d716f7..d4ab225f 100755 --- a/scripts/package-mac-app.sh +++ b/scripts/package-mac-app.sh @@ -48,14 +48,18 @@ export CGO_CFLAGS="-Wno-deprecated-declarations" export CGO_LDFLAGS="-Wl,-no_warn_duplicate_libraries" export EDITION=lite +# 获取版本号并配置 LDFLAGS +eval "$(./scripts/get_version.sh env)" +LDFLAGS="$(./scripts/get_version.sh ldflags) -X 'google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=warn'" + # 我们实际上只用 Wails 构建外壳,前端仍然由后台服务提供 -wails build -clean -buildmode default -tags "sqlite_fts5" -o "${APP_NAME}" +(cd cmd/desktop && wails build -skipbindings -clean -tags "sqlite_fts5" -ldflags="$LDFLAGS" -o "${APP_NAME}") # ── Step 3: Copy generated .app to dist ── echo ">> Assembling package..." mkdir -p dist rm -rf "${DIST_DIR}" -cp -R "build/bin/${APP_BUNDLE}" "dist/" +cp -R "cmd/desktop/build/bin/${APP_BUNDLE}" "dist/" # 将配置文件和初始数据库迁移脚本塞进 .app 内部资源里 RESOURCES_DIR="${DIST_DIR}/Contents/Resources"