mirror of
https://gitcode.com/JianFeeeee/HomeAgent.git
synced 2026-09-23 02:18:06 +00:00
fix: WebUI 版本显示 + Windows 交叉编译 + 发布脚本三处回归
## WebUI 版本链路修复 问题：handler.go:949 报的是 sdk.SDKVersion，那条链最终指向 SDK 仓 meta.Version 的硬编码值，与 -ldflags 注入的内核版本 完全不相交。构建时间、commit hash 全部丢失。 dashboard.html 兜底值是 '0.1.0'——碰巧版本号相等时不显眼， 一旦不等就报错。 修复： - KernelStatus 新增 BuildStatus 字段（Version/Commit/BuildTime/SDKCompatible/KernelName） 取自 internal/meta（-ldflags 注入点），与接口冻结无关（KernelStatus 只在 internal/sdk） - /api/v1/status 改用 meta.Version，另加 sdk_version 字段暴露 SDK 版本 - dashboard.html 概览卡显示 HomeAgent vX.Y.Z + commit/日期/SDK 兼容版本， 去掉 || '0.1.0' 误导性兜底 ## Windows 交叉编译修复 问题：internal/plugin/dynamic_proc_windows.go（Part 1 的桩，610e9d0）只定义了 tryLoadProc，但平台中立的 registry.go 还在调 loadProc / closeProcHost——这两个 函数只在 dynamic_proc_unix.go 里。Windows 下整个 homed 从 Part 1 起编译不过。 plan.md §12.5 声称「Windows 只做了交叉编译，无真机验证」——实际是连编译都没通过。 修复：dynamic_proc_unix.go / dynamic_proc_windows.go 合并为平台中立的 dynamic_proc.go（文件内无任何平台专属调用，proc 包内部通过 shmalloc_* / evtfd_* / shmpass_* / procattr_* 各自带构建标签处理差异）。 ## 发布脚本三处回归修复 deploy/packaging/build.sh（从 package/build.sh 移到 deploy/packaging/ 后）： 1. PROJECT_ROOT 少一层目录（.. → ../..），产物落进 deploy/build/ 而非根目录 2. initconfig 从未被构建，但 installer.nsi 和 package-linux.sh 都引用它 3. GO 兜底路径指向 /home/jianf/go1.26.5（陈旧硬编码）改为 command -v go 4. electron-builder --config package.json 校验整个文件导致 devDependencies 被判为 unknown property，去掉 --config 让它从 build 键读配置 deploy/packaging/package-linux.sh： 1. build_go() 补上 initconfig 构建步骤 2. GO 兜底路径同步修复 知识库 3 条重写 + 1 条新增： - homeagent_identity：v0.9.0 C ABI → v1.0.0 子进程 - homeagent_architecture：全篇重写为子进程架构（三面通信、Supervisor 台账、 崩溃自愈、权限三道闸） - homeagent_recent_updates：在 v0.9.0 前插入 v1.0.0 主线摘要 - changelog_v1.0.0（新建）：6 类缺陷消除、架构、实测、已知限制、迁移指引
This commit is contained in:
JianFeeeee
@ -1,12 +1,18 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
PROJECT_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
|
||||
# 本脚本位于 deploy/packaging/，故仓库根在上两级。
|
||||
#
|
||||
# v0.7.2 的根目录清理把 package/build.sh 移到 deploy/packaging/build.sh
|
||||
# （深度 1 → 2 层），但这行的 ".." 没跟着改成 "../.."，于是 PROJECT_ROOT
|
||||
# 变成了 <repo>/deploy：产物落进 deploy/build/、GUI 去找 deploy/cmd/gui。
|
||||
# 跨平台构建从那次起一直是坏的（Makefile 的单平台 build 不走这里，所以没暴露）。
|
||||
PROJECT_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
|
||||
BUILD_DIR="${PROJECT_ROOT}/build"
|
||||
VERSION="${VERSION:-$(git -C "$PROJECT_ROOT" describe --tags --dirty 2>/dev/null || echo "0.8.0")}"
|
||||
COMMIT="${COMMIT:-$(git -C "$PROJECT_ROOT" rev-parse --short HEAD 2>/dev/null || echo "unknown")}"
|
||||
BUILD_TIME="${BUILD_TIME:-$(date -u '+%Y-%m-%dT%H:%M:%SZ')}"
|
||||
GO="${GO:-$(command -v go 2>/dev/null || echo "/home/jianf/go1.26.5/go/bin/go")}"
|
||||
GO="${GO:-$(command -v go 2>/dev/null || echo "go")}"
|
||||
LDFLAGS="-X gitcode.com/JianFeeeee/HomeAgent/internal/meta.Version=${VERSION} -X gitcode.com/JianFeeeee/HomeAgent/internal/meta.Commit=${COMMIT} -X gitcode.com/JianFeeeee/HomeAgent/internal/meta.BuildTime=${BUILD_TIME}"
|
||||
|
||||
TARGET="${1:-native}"
|
||||
@ -21,10 +27,10 @@ COMPONENT="${2:-all}"
|
||||
case "$TARGET" in
|
||||
native) GOOS="" GOARCH="" ;;
|
||||
linux/amd64) GOOS=linux GOARCH=amd64 CC="${CC:-}" ;;
|
||||
linux/arm64) GOOS=linux GOARCH=arm64 CC="${CC:-aarch64-linux-gnu-gcc}" CXX="${CXX:-aarch64-linux-gnu-g++}" ;;
|
||||
linux/arm64) GOOS=linux GOARCH=arm64 CC="${CC:-aarch64-linux-gnu-gcc}" ;;
|
||||
darwin/amd64) GOOS=darwin GOARCH=amd64 CC="${CC:-}" ;;
|
||||
darwin/arm64) GOOS=darwin GOARCH=arm64 CC="${CC:-}" ;;
|
||||
windows/amd64) GOOS=windows GOARCH=amd64 CC="${CC:-x86_64-w64-mingw32-gcc}" CXX="${CXX:-x86_64-w64-mingw32-g++}" ;;
|
||||
windows/amd64) GOOS=windows GOARCH=amd64 CC="${CC:-x86_64-w64-mingw32-gcc}" ;;
|
||||
all)
|
||||
"$0" linux/amd64 "$COMPONENT"
|
||||
"$0" linux/arm64 "$COMPONENT"
|
||||
@ -36,7 +42,7 @@ case "$TARGET" in
|
||||
*)
|
||||
echo "Unknown target: $TARGET"
|
||||
echo "Usage: $0 [native|linux/amd64|linux/arm64|darwin/amd64|darwin/arm64|windows/amd64|all]"
|
||||
echo " [all|homed|waiter|gui]"
|
||||
echo " [all|homed|waiter|initconfig|gui]"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
@ -67,7 +73,11 @@ build_homed() {
|
||||
out="${out}.exe"
|
||||
fi
|
||||
echo "[BUILD] homed ${plat} → $out"
|
||||
CGO_ENABLED=1 "$GO" build -trimpath -installsuffix dynlink \
|
||||
# Go 用 CC 驱动 CGO 编译与链接，用 CC 指定的交叉工具链来决定目标架构。
|
||||
# 必须同时 export CC 给 Go 的 CGO 代码生成器，否则 CGO_ENABLED=1 下的
|
||||
# 目标文件与 host 的 ld 不兼容（如 arm64 的 .o 给了 x86_64 的 ld）。
|
||||
local _cc="${CC:-cc}"
|
||||
CGO_ENABLED=1 CC="$_cc" "$GO" build -trimpath -installsuffix dynlink \
|
||||
-ldflags "$LDFLAGS" -o "$out" ./cmd/homed/
|
||||
echo " OK ($(file "$out" | sed 's/.*: //') | $(du -h "$out" | cut -f1))"
|
||||
}
|
||||
@ -84,6 +94,22 @@ build_waiter() {
|
||||
echo " OK ($(du -h "$out" | cut -f1))"
|
||||
}
|
||||
|
||||
# ---- initconfig (CGO-free 配置初始化器) ----
|
||||
#
|
||||
# NSIS 安装包（installer.nsi:220 File "..\build\initconfig.exe"）与
|
||||
# package-linux.sh 的 stage_variant 都引用它，但此前 build.sh 从不构建它——
|
||||
# Windows 安装包构建会直接失败在缺文件上。
|
||||
build_initconfig() {
|
||||
local plat="${GOOS:-linux}/${GOARCH:-amd64}"
|
||||
local out="$BUILD_DIR/initconfig${SUFFIX:+_$SUFFIX}"
|
||||
if [ "$GOOS" = "windows" ]; then out="${out}.exe"; fi
|
||||
|
||||
echo "[BUILD] initconfig ${plat} → $out"
|
||||
CGO_ENABLED=0 "$GO" build -trimpath -installsuffix dynlink \
|
||||
-ldflags "$LDFLAGS" -o "$out" ./cmd/initconfig/
|
||||
echo " OK ($(du -h "$out" | cut -f1))"
|
||||
}
|
||||
|
||||
# ---- gui (Electron) ----
|
||||
build_gui() {
|
||||
if [ -n "${GOOS:-}" ] && [ "$GOOS" != "$("$GO" env GOOS)" ]; then
|
||||
@ -99,7 +125,10 @@ build_gui() {
|
||||
(cd "$gui_dir" && npm install --production)
|
||||
fi
|
||||
|
||||
(cd "$gui_dir" && npx electron-builder --config "$gui_dir/package.json" \
|
||||
# 不传 --config：electron-builder 默认从 package.json 的 "build" 键读配置。
|
||||
# 传 --config package.json 会让它把**整个** package.json 当配置校验，
|
||||
# 于是 devDependencies / build / scripts 全被判为 "unknown property" 而失败。
|
||||
(cd "$gui_dir" && npx electron-builder \
|
||||
--linux --win --mac \
|
||||
--x64 --arm64 \
|
||||
-p never \
|
||||
@ -109,9 +138,10 @@ build_gui() {
|
||||
|
||||
# ---- dispatch ----
|
||||
case "$COMPONENT" in
|
||||
all) build_homed; build_waiter; build_gui ;;
|
||||
all) build_homed; build_waiter; build_initconfig; build_gui ;;
|
||||
homed) build_homed ;;
|
||||
waiter) build_waiter ;;
|
||||
initconfig) build_initconfig ;;
|
||||
gui) build_gui ;;
|
||||
*)
|
||||
echo "Unknown component: $COMPONENT"
|
||||
|
||||
@ -6,7 +6,7 @@ BUILD_DIR="${PROJECT_ROOT}/build"
|
||||
DIST_DIR="${PROJECT_ROOT}/dist/linux"
|
||||
VERSION="${VERSION:-$(git -C "$PROJECT_ROOT" describe --tags --dirty 2>/dev/null || echo "0.8.0")}"
|
||||
PACKAGE_ROOT="${PROJECT_ROOT}/deploy/packaging/linux"
|
||||
GO="${GO:-$(command -v go 2>/dev/null || echo "/home/jianf/go1.26.5/go/bin/go")}"
|
||||
GO="${GO:-$(command -v go 2>/dev/null || echo "go")}"
|
||||
|
||||
ARCH="${1:-amd64}" # amd64 or arm64
|
||||
ACTION="${2:-all}" # all, build, deb, tar, rpm
|
||||
@ -99,6 +99,9 @@ build_go() {
|
||||
bash "$PROJECT_ROOT/deploy/packaging/build.sh" "linux/$ARCH" "waiter" 2>&1 || {
|
||||
echo "WARNING: waiter build failed."
|
||||
}
|
||||
bash "$PROJECT_ROOT/deploy/packaging/build.sh" "linux/$ARCH" "initconfig" 2>&1 || {
|
||||
echo "WARNING: initconfig build failed（包内将缺少首次配置初始化器）。"
|
||||
}
|
||||
|
||||
local suffix="linux_${ARCH}"
|
||||
local homed_bin="$BUILD_DIR/homed_$suffix"
|
||||
|
||||
Reference in New Issue
Block a user