feat: 全面迁移到 Flutter + 新增 GitHub 源与 CI 流水线
前端
- 移除全部 Avalonia 依赖,模型渲染与界面统一改用 Flutter
- 新增用户页:登录/注册(SHA-512 + 盐)、签到积分(30 天一循环)、
主题色积分购买、二选一随机、今日人品
- 新增百宝箱页、模型内嵌渲染页、自绘标题栏(最小化/最大化/关闭)
- 下载页显示模型下载进度条,下载源读取加速
- 关于页新增「重新下载启动器」并在下载后做 sha256 完整性校验
- 修复浅色主题下标题栏不跟随主题色、无法连接后端等问题
后端
- 新增 UserService:.GC/user/<用户名>.yaml 存用户名/积分/SHA-512 口令,
登录返回 session token,本地 .GC/user/user.yaml 保存登录态
- 新增 /api/user/{register,login,me,signin,theme} 接口
- 去掉 Avalonia 窗口宿主,后端只提供 HTTP API
下载源
- 新增 GitHub 镜像源(Morris-morris-cloud/GC),与 Xhmcl 并发测速
- 单源探测超时收紧到 2 秒,取最快且可用的源;GitHub 复用 GiteaRemote
(contents 带 ref、releases 带 per_page=100)
构建与 CI
- macOS 上默认只出 macOS 包,Windows 交给原生 Windows 构建
- 修复 Windows 交叉编译中 flutter-cpp-client-wrapper 双层目录嵌套
- 新增 GitHub Actions:
· nightly-prerelease:每天 21:00 编译三平台,发布 nightly 预发布
· build-bot:Issue/PR 评论 @build-bot build <mac|win-amd|win-arm|all>,
发布 ip-prerelease 预发布
· pr-review:检查能否编译、静态分析、合并冲突、是否落后 main
- 忽略 79MB 课件产物等高线.html 与工具链临时备份
This commit is contained in:
1 parent
b9cb56cb8b
commit
ea1fa6b6d1
134 files changed
+4309
-16614
No files matched your search
+240
-133
@@ -1,154 +1,261 @@
|
||||
#!/bin/sh
|
||||
# buildsh/build.sh —— 完整发布(原 publish)
|
||||
# buildsh/build.sh —— 完整发布
|
||||
#
|
||||
# 目标平台按构建主机决定,每条产物都带 Flutter 前端:
|
||||
# macOS 主机 : mac-arm64(原生)+ win-amd64 / win-arm64(mingw 交叉)
|
||||
# 目标平台(默认按构建主机推断,可用 --targets= 覆盖):
|
||||
# macOS 主机 : mac-arm64(原生) + win-amd64 / win-arm64(mingw 交叉)
|
||||
# Linux 主机 : win-amd64 / win-arm64(mingw 交叉)
|
||||
# Linux 产物默认不构建:目标为 linux-arm64,官方 Flutter 引擎只有
|
||||
# x64 产物,必须在 aarch64 主机上编。需要时用 GC_BUILD_LINUX=1 显式开启
|
||||
# (云端 aarch64 runner 就是这么用的)。
|
||||
# Linux 产物默认不构建(目标 linux-arm64,官方 Flutter 引擎只有 x64,
|
||||
# 必须在 aarch64 主机上编);需要时 GC_BUILD_LINUX=1 显式开启
|
||||
# Windows 主机: win-amd64 / win-arm64(原生)
|
||||
#
|
||||
# 前端是默认必需项:flutter 缺失或编译失败一律中断,不再悄悄产出只带 Avalonia
|
||||
# 回退界面的包。确实要降级时用 ./build.sh build --allow-no-ui。
|
||||
# ./build.sh build 全平台
|
||||
# ./build.sh build --targets=mac 只出 macOS(跳过 Windows 交叉编译,秒级省下几分钟)
|
||||
# ./build.sh build --targets=win 只出 Windows
|
||||
#
|
||||
# 进度权重按实测耗时设定,供进度条估算总进度与剩余时间。
|
||||
# 前端是必需项:flutter 缺失或编译失败一律中断,不出只有 Avalonia 回退界面的包。
|
||||
# 确实要降级时用 ./build.sh build --allow-no-ui。
|
||||
#
|
||||
# 并行:Flutter 前端编译 与 C# 各 RID 发布 互不依赖,两组同时跑。
|
||||
|
||||
bs_build() {
|
||||
ROOT_DIR="$1"
|
||||
: "${APP_PROJ:?}" "${SLN:?}" "${VERSION:?}"
|
||||
# ---------------------------------------------------------------- 目标与权重
|
||||
|
||||
HOST=$(uname -s)
|
||||
BUILD_MAC=0
|
||||
BUILD_LINUX=0
|
||||
case "$HOST" in
|
||||
Darwin) BUILD_MAC=1 ;;
|
||||
MINGW*|MSYS*|CYGWIN*) : ;; # Windows 主机只能编 Windows
|
||||
*) BUILD_LINUX=1 ;;
|
||||
_resolve_targets() {
|
||||
BUILD_MAC=0; BUILD_WIN=0; BUILD_LINUX=0
|
||||
|
||||
case "$(uname -s)" in
|
||||
Darwin) _host="mac" ;;
|
||||
MINGW*|MSYS*|CYGWIN*) _host="windows" ;;
|
||||
*) _host="linux" ;;
|
||||
esac
|
||||
# Linux 产物默认不出:目标平台是 linux-arm64,而官方 Flutter 引擎只发 x64 产物,
|
||||
# x64 主机上编出来的是 x64 二进制,装到 arm 机器上跑不起来。
|
||||
# 需要时显式开启(云端 aarch64 runner):GC_BUILD_LINUX=1 ./build.sh build
|
||||
if [ "$BUILD_LINUX" = 1 ]; then
|
||||
case "${GC_BUILD_LINUX:-0}" in
|
||||
1|true|yes)
|
||||
case "$(uname -m)" in
|
||||
aarch64|arm64) ;;
|
||||
*)
|
||||
BUILD_LINUX=0
|
||||
echo "!! 已请求 Linux 产物,但当前主机是 $(uname -m)"
|
||||
echo " (linux-arm64 需要有 aarch64 主机,Flutter 引擎只有 x64 官方产物)"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
BUILD_LINUX=0
|
||||
echo "==> 跳过 Linux 产物(默认不构建;需要时用 GC_BUILD_LINUX=1 显式开启)"
|
||||
;;
|
||||
GC_HOST="$_host"
|
||||
|
||||
_want="${GC_TARGETS:-}"
|
||||
if [ -z "$_want" ]; then
|
||||
case "$_host" in
|
||||
mac) _want="mac,win" ;;
|
||||
windows) _want="win" ;;
|
||||
*) _want="win" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# 显式降级:允许在没有该平台 Flutter 宿主的情况下仍出 Avalonia 版包
|
||||
ALLOW_NO_UI="${GC_ALLOW_NO_UI:-0}"
|
||||
|
||||
# 权重:清理 版本 Mac WinX64 WinArm64 Linux 前端 骨架 打包 收尾
|
||||
WEIGHTS="2 3"
|
||||
[ "$BUILD_MAC" = 1 ] && WEIGHTS="$WEIGHTS 35"
|
||||
WEIGHTS="$WEIGHTS 25 25"
|
||||
[ "$BUILD_LINUX" = 1 ] && WEIGHTS="$WEIGHTS 30"
|
||||
WEIGHTS="$WEIGHTS 25 3 5 2"
|
||||
TOTAL=0
|
||||
for _w in $WEIGHTS; do TOTAL=$((TOTAL + _w)); done
|
||||
|
||||
progress_init "$TOTAL" $WEIGHTS
|
||||
|
||||
progress_step "清理旧产物"; progress_tick 100
|
||||
rm -rf "$ROOT_DIR/dist"; mkdir -p "$ROOT_DIR/dist"
|
||||
# 上次打包挪出来的中间产物(.app 目录,体积大、文件多)直接移出 build,
|
||||
# 不做递归删除:避免动辄几百个文件的不可逆删除。
|
||||
if [ -d "$ROOT_DIR/build/trash" ]; then
|
||||
mv "$ROOT_DIR/build/trash" "${TMPDIR:-/tmp}/gc-trash-$(date +%s)" 2>/dev/null || true
|
||||
fi
|
||||
|
||||
progress_step "版本戳"; progress_tick 100
|
||||
# 末次签名:这里只生成清单不签名,等 pack_launcher 打完 zip、刷新完包信息后统一签一次。
|
||||
# 避免 ECDSA 随机签名 + 时间戳导致清单在中间反复变化。
|
||||
stamp_versions --no-sign
|
||||
|
||||
# 每个 publish 用后台任务包裹,边跑边按「已用时/预估用时」推进当前步骤进度
|
||||
_run_publish() {
|
||||
_label="$1"; _est="$2"; shift 2
|
||||
( "$@" >"$ROOT_DIR/build/logs/publish-$_label.log" 2>&1 ) &
|
||||
_pid=$!
|
||||
_t0=$(date +%s)
|
||||
while kill -0 "$_pid" 2>/dev/null; do
|
||||
_elapsed=$(( $(date +%s) - _t0 ))
|
||||
_p=$(( _elapsed * 100 / _est ))
|
||||
[ "$_p" -gt 96 ] && _p=96
|
||||
progress_tick "$_p"
|
||||
sleep 1
|
||||
done
|
||||
wait "$_pid" || { echo; echo "!! $_label 编译失败,见 build/logs/publish-$_label.log"; return 1; }
|
||||
progress_tick 100
|
||||
}
|
||||
|
||||
if [ "$BUILD_MAC" = 1 ]; then
|
||||
progress_step "编译 Mac"
|
||||
_run_publish mac 90 publish_rid "osx-arm64" "dist/mac-arm64" true || return 1
|
||||
# Flutter 的 macOS 产物必须用 Xcode 在本机编,Linux 上无法替代
|
||||
build_flutter_ui macos "dist/mac-arm64" || {
|
||||
echo "!! macOS 前端编译失败。macOS 版 Flutter 只能在 macOS 上编。"
|
||||
return 1
|
||||
}
|
||||
elif [ "$ALLOW_NO_UI" = 1 ]; then
|
||||
progress_step "编译 Mac"
|
||||
_run_publish mac 90 publish_rid "osx-arm64" "dist/mac-arm64" true || return 1
|
||||
echo "!! --allow-no-ui:macOS 包内不含 Flutter 前端,启动器将回退 Avalonia"
|
||||
fi
|
||||
|
||||
progress_step "编译 Win-x64"
|
||||
_run_publish winx64 70 publish_rid "win-x64" "dist/win-amd64" true || return 1
|
||||
|
||||
progress_step "编译 Win-arm64"
|
||||
_run_publish winarm 70 publish_rid "win-arm64" "dist/win-arm64" true || return 1
|
||||
|
||||
if [ "$BUILD_LINUX" = 1 ]; then
|
||||
progress_step "编译 Linux"
|
||||
_run_publish linux 70 publish_rid "linux-arm64" "dist/linux-arm64" true || return 1
|
||||
build_flutter_ui linux "dist/linux-arm64" || return 1
|
||||
fi
|
||||
|
||||
# Windows 前端:Windows 主机走官方 toolchain;Linux/macOS 主机用 mingw-w64 +
|
||||
# wine 交叉编译(buildsh/cross)。只产出 x64 一份,两个包共用,
|
||||
# ARM64 上由系统模拟 x64 进程运行前端。
|
||||
progress_step "编译 Win 前端"
|
||||
case "$HOST" in
|
||||
MINGW*|MSYS*|CYGWIN*) build_flutter_ui windows "dist/win-flutter" || return 1 ;;
|
||||
*) build_flutter_ui_cross "dist/win-flutter" || return 1 ;;
|
||||
esac
|
||||
for label in win-amd64 win-arm64; do
|
||||
cp -R "$ROOT_DIR/dist/win-flutter/." "$ROOT_DIR/dist/$label/"
|
||||
_ifs=$IFS; IFS=','
|
||||
for _t in $_want; do
|
||||
case "$_t" in
|
||||
''|' ') continue ;;
|
||||
mac|macos|darwin) BUILD_MAC=1 ;;
|
||||
win|windows) BUILD_WIN=1 ;;
|
||||
linux) BUILD_LINUX=1 ;;
|
||||
all) BUILD_MAC=1; BUILD_WIN=1; BUILD_LINUX=1 ;;
|
||||
*) IFS=$_ifs; err "未知目标 '$_t'(可用:mac / win / linux / all)"; return 1 ;;
|
||||
esac
|
||||
done
|
||||
rm -rf "$ROOT_DIR/dist/win-flutter"
|
||||
IFS=$_ifs
|
||||
|
||||
progress_step "运行骨架"; progress_tick 100
|
||||
if [ -d "$ROOT_DIR/dist/mac-arm64" ]; then
|
||||
package_mac_app
|
||||
if [ "$BUILD_MAC" = 1 ] && [ "$_host" != mac ]; then
|
||||
err "macOS 产物只能在 macOS 上编译(当前 $(uname -s))"; return 1
|
||||
fi
|
||||
prepare_runtime_layout "dist/win-amd64"
|
||||
prepare_runtime_layout "dist/win-arm64"
|
||||
|
||||
# Linux 产物:必须是 aarch64 主机且显式开启
|
||||
if [ "$BUILD_LINUX" = 1 ]; then
|
||||
prepare_runtime_layout "dist/linux-arm64"
|
||||
fi
|
||||
if [ -d "$ROOT_DIR/dist/mac-arm64/GC.app/Contents/MacOS" ]; then
|
||||
prepare_runtime_layout "dist/mac-arm64/GC.app/Contents/MacOS"
|
||||
case "${GC_BUILD_LINUX:-0}" in
|
||||
1|true|yes) ;;
|
||||
*) BUILD_LINUX=0; detail "跳过 Linux 产物(需要时 GC_BUILD_LINUX=1)" ;;
|
||||
esac
|
||||
if [ "$BUILD_LINUX" = 1 ]; then
|
||||
case "$(uname -m)" in
|
||||
aarch64|arm64) ;;
|
||||
*) BUILD_LINUX=0
|
||||
warn "已请求 Linux 产物,但当前主机是 $(uname -m)(linux-arm64 需要 aarch64 主机)" ;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
|
||||
progress_step "打包 zip"; progress_tick 100
|
||||
pack_launcher
|
||||
# 发布计划:RID:标签
|
||||
_PLAN=""
|
||||
[ "$BUILD_MAC" = 1 ] && _PLAN="$_PLAN osx-arm64:mac-arm64"
|
||||
[ "$BUILD_WIN" = 1 ] && _PLAN="$_PLAN win-x64:win-amd64 win-arm64:win-arm64"
|
||||
[ "$BUILD_LINUX" = 1 ] && _PLAN="$_PLAN linux-arm64:linux-arm64"
|
||||
|
||||
progress_step "收尾"; progress_tick 100
|
||||
[ -n "$_PLAN" ] || { err "没有要构建的目标"; return 1; }
|
||||
|
||||
# 打包阶段只处理本次构建的平台,避免把 dist 里其它平台的旧残留也重新打包
|
||||
GC_PACK_LABELS=""
|
||||
for _t in $_PLAN; do GC_PACK_LABELS="$GC_PACK_LABELS ${_t##*:}"; done
|
||||
export GC_PACK_LABELS
|
||||
}
|
||||
|
||||
_init_weights() {
|
||||
_ws="3 52" # 准备 / 编译发布
|
||||
[ "$BUILD_WIN" = 1 ] && _ws="$_ws 8" # Win 前端交叉编译
|
||||
_ws="$_ws 7 27 3" # 组装 / 打包 / 收尾
|
||||
_tot=0
|
||||
for _w in $_ws; do _tot=$((_tot + _w)); done
|
||||
progress_init "$_tot" $_ws
|
||||
}
|
||||
|
||||
# 编译阶段预估秒数(只用于进度条推进,不影响正确性)
|
||||
_est_compile() {
|
||||
_n=0
|
||||
for _t in $_PLAN; do _n=$((_n + 1)); done
|
||||
_e=$((_n * 70))
|
||||
[ "$BUILD_MAC" = 1 ] && _e=$((_e + 60))
|
||||
printf '%s' "$_e"
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------- 脚本自检
|
||||
|
||||
# `$VAR` 紧跟全角字符(如 ")")时,变量名会把多字节字符一起吃进去,
|
||||
# set -u 下直接报 "_plat?: unbound variable"。这个坑历史上出现过两次,
|
||||
# 交给机器每轮查一遍比靠人眼可靠(找不到 python3 就跳过)。
|
||||
_lint_scripts() {
|
||||
command -v python3 >/dev/null 2>&1 || { detail "无 python3,跳过脚本自检"; return 0; }
|
||||
python3 - "$GC_ROOT" <<'PY'
|
||||
import re, sys, glob, os
|
||||
|
||||
root = sys.argv[1]
|
||||
pat = re.compile(r'(?<!\$\{)\$([A-Za-z_][A-Za-z0-9_]*)([^\x00-\x7f])')
|
||||
files = [os.path.join(root, 'build.sh')]
|
||||
files += glob.glob(os.path.join(root, 'buildsh', '**', '*.sh'), recursive=True)
|
||||
|
||||
bad = []
|
||||
for f in files:
|
||||
try:
|
||||
lines = open(f, encoding='utf-8').read().splitlines()
|
||||
except OSError:
|
||||
continue
|
||||
for i, line in enumerate(lines, 1):
|
||||
if line.lstrip().startswith('#'): # 整行注释里的 $符号不会参与解析
|
||||
continue
|
||||
for m in pat.finditer(line):
|
||||
bad.append('%s:%d: $%s 后接 %r' % (os.path.relpath(f, root), i, m.group(1), m.group(2)))
|
||||
|
||||
if bad:
|
||||
sys.stderr.write(' 脚本里变量名后紧跟全角字符(请改成 ${VAR}):\n')
|
||||
for b in bad:
|
||||
sys.stderr.write(' ' + b + '\n')
|
||||
sys.exit(1)
|
||||
PY
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------- 阶段
|
||||
|
||||
# 各 RID 发布 + macOS 前端:两条链互不依赖,同时进行
|
||||
_phase_compile() {
|
||||
_fbg=""
|
||||
if [ "$BUILD_MAC" = 1 ]; then
|
||||
# 后台编前端;GC_QUIET 避免它的输出打乱进度条
|
||||
( GC_QUIET=1; flutter_build macos ) &
|
||||
_fbg=$!
|
||||
fi
|
||||
|
||||
_rc=0
|
||||
for _t in $_PLAN; do
|
||||
publish_rid "${_t%%:*}" "${_t##*:}" || { _rc=1; break; }
|
||||
done
|
||||
|
||||
if [ -n "$_fbg" ]; then
|
||||
if [ "$_rc" != 0 ]; then
|
||||
kill "$_fbg" 2>/dev/null || true
|
||||
else
|
||||
if wait "$_fbg"; then
|
||||
flutter_stage macos "$GC_STAGE/mac-arm64" || _rc=1
|
||||
else
|
||||
err "Flutter macOS 前端编译失败(日志:build/logs/flutter-macos.log)"
|
||||
_rc=1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
return "$_rc"
|
||||
}
|
||||
|
||||
# Windows 前端:只产出一份 x64,两个包共用(ARM64 上由系统模拟 x64 进程运行)。
|
||||
# Windows 主机走官方 toolchain,其它主机走 mingw + wine 交叉编译。
|
||||
_phase_win_ui() {
|
||||
if [ "$GC_HOST" = windows ]; then
|
||||
( GC_QUIET=1; build_flutter_ui windows "$GC_STAGE/win-flutter" ) || return 1
|
||||
else
|
||||
build_flutter_ui_cross "$GC_STAGE/win-flutter" || return 1
|
||||
fi
|
||||
for _l in win-amd64 win-arm64; do
|
||||
[ -d "$GC_STAGE/$_l" ] || continue
|
||||
cp -R "$GC_STAGE/win-flutter/." "$GC_STAGE/$_l/" || return 1
|
||||
done
|
||||
_trash "$GC_STAGE/win-flutter"
|
||||
}
|
||||
|
||||
_phase_assemble() {
|
||||
for _l in win-amd64 win-arm64 linux-arm64; do
|
||||
prepare_runtime_layout "$GC_STAGE/$_l"
|
||||
done
|
||||
if [ -d "$GC_STAGE/mac-arm64" ]; then
|
||||
prepare_runtime_layout "$GC_STAGE/mac-arm64"
|
||||
package_mac_app "$GC_STAGE/mac-arm64" || return 1
|
||||
step_ok "GC.app 组装完成"
|
||||
fi
|
||||
}
|
||||
|
||||
_summary() {
|
||||
_span=$(timer_span "$_t_all")
|
||||
printf '\n'
|
||||
say "完成,用时 ${_span}"
|
||||
_found=0
|
||||
for _z in "$GC_ROOT"/dist/*/*.zip; do
|
||||
[ -f "$_z" ] || continue
|
||||
_found=1
|
||||
printf ' %6s %s\n' "$(_hsize "$_z")" "$(_rel "$_z")"
|
||||
done
|
||||
[ "$_found" = 1 ] || note "(dist 下没有产物)"
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------- 入口
|
||||
|
||||
bs_build() {
|
||||
ROOT_DIR="$1"
|
||||
GC_ROOT="$ROOT_DIR"; export GC_ROOT
|
||||
GC_STAGE="$ROOT_DIR/build/stage"; export GC_STAGE
|
||||
: "${APP_PROJ:?}" "${VERSION:?}"
|
||||
|
||||
_resolve_targets || return 1
|
||||
preflight || return 1
|
||||
_init_weights
|
||||
_t_all=$(timer_start)
|
||||
|
||||
# ---- 准备:清暂存区 + 生成清单(不签名,打包结束后统一签一次)
|
||||
progress_step "准备"
|
||||
mkdir -p "$GC_ROOT/build/logs" "$GC_ROOT/build/cache"
|
||||
if [ -d "$GC_ROOT/build/trash" ]; then
|
||||
mv "$GC_ROOT/build/trash" "${TMPDIR:-/tmp}/gc-trash-$(date +%s)" 2>/dev/null || true
|
||||
fi
|
||||
_trash "$GC_STAGE"
|
||||
mkdir -p "$GC_STAGE"
|
||||
_trash "$GC_ROOT/build/pkg"
|
||||
detail "目标:$(printf '%s' "$_PLAN" | tr ' ' '\n' | cut -d: -f2 | tr '\n' ' ')"
|
||||
_lint_scripts || return 1
|
||||
stamp_versions --no-sign || return 1
|
||||
progress_tick 100
|
||||
|
||||
# ---- 编译:各 RID 发布 ‖ Flutter mac 前端
|
||||
progress_step "编译"
|
||||
_run_phase "$(_est_compile)" _phase_compile || return 1
|
||||
|
||||
# ---- Windows 前端(mac 前端编完后才启动,避免两个 flutter 抢 SDK 锁)
|
||||
if [ "$BUILD_WIN" = 1 ]; then
|
||||
progress_step "Win 前端"
|
||||
_run_phase 70 _phase_win_ui || return 1
|
||||
fi
|
||||
|
||||
# ---- 组装:运行目录布局 + mac .app
|
||||
progress_step "组装"
|
||||
_phase_assemble || return 1
|
||||
progress_tick 100
|
||||
|
||||
# ---- 打包:zip + 清单 sha256 + 签名
|
||||
progress_step "打包"
|
||||
pack_launcher || return 1
|
||||
progress_tick 100
|
||||
|
||||
# ---- 收尾
|
||||
progress_step "收尾"
|
||||
progress_done
|
||||
echo "==> 完成,产物:"
|
||||
ls -lh "$ROOT_DIR"/dist/*/GCL-"$VERSION"-*.zip 2>/dev/null || true
|
||||
_summary
|
||||
}
|
||||
+28
-29
@@ -1,46 +1,45 @@
|
||||
#!/bin/sh
|
||||
# buildsh/check.sh —— 验证:编译 + 自检 + 离屏测试 + 产物完整性
|
||||
# 步骤权重:编译(40) 自检(15) 离屏(25) 产物(20)
|
||||
# buildsh/check.sh —— 验证:编译 + 产物完整性
|
||||
#
|
||||
# 原先的「模型自检」和「离屏渲染」两项都依赖 Avalonia 界面与截图工程;
|
||||
# 界面与模型渲染迁到 Flutter 之后它们已经没有意义 —— 前端正确性交给
|
||||
# `flutter analyze`,这里只保证 C# 侧编译干净、发布包齐备。
|
||||
#
|
||||
# 步骤权重:编译(60) 产物(40)
|
||||
|
||||
bs_check() {
|
||||
ROOT_DIR="$1"
|
||||
progress_init 100 40 15 25 20
|
||||
GC_ROOT="${GC_ROOT:-$ROOT_DIR}"; export GC_ROOT
|
||||
mkdir -p "$GC_ROOT/build/logs"
|
||||
|
||||
progress_init 100 60 40
|
||||
_fail=0
|
||||
|
||||
progress_step "编译检查"
|
||||
if dotnet build "$SLN" -c Debug -v quiet >"$ROOT_DIR/build/logs/check-build.log" 2>&1; then
|
||||
progress_step "编译"
|
||||
if run_logged "$GC_ROOT/build/logs/check-build.log" "解决方案编译 " \
|
||||
dotnet build "$SLN" -c Release --nologo -v:q; then
|
||||
progress_tick 100
|
||||
else
|
||||
progress_tick 100; _fail=1
|
||||
echo; echo "!! 编译失败,见 build/logs/check-build.log"
|
||||
_fail=1; progress_tick 100
|
||||
fi
|
||||
|
||||
progress_step "模型自检"
|
||||
if EMS_SELFTEST=1 dotnet run --project "$APP_PROJ" -c Debug --no-build \
|
||||
>"$ROOT_DIR/build/logs/check-selftest.log" 2>&1; then
|
||||
grep -q "FAIL" "$ROOT_DIR/build/logs/check-selftest.log" && { _fail=1; echo; echo "!! 自检有失败项"; }
|
||||
progress_step "产物"
|
||||
_n=0
|
||||
for _z in "$ROOT_DIR"/dist/*/GCL-"$VERSION"-*.zip; do
|
||||
[ -f "$_z" ] && _n=$((_n + 1))
|
||||
done
|
||||
if [ "$_n" -ge 1 ]; then
|
||||
detail "共 ${_n} 个发布包"
|
||||
else
|
||||
_fail=1; echo; echo "!! 自检异常"
|
||||
_fail=1; warn "dist 下没有发布包(先跑 ./build.sh build)"
|
||||
fi
|
||||
progress_tick 100
|
||||
|
||||
progress_step "离屏渲染"
|
||||
if dotnet run --project "$TEST_PROJ" -c Debug --no-build -- \
|
||||
"$ROOT_DIR/build/screenshots" >"$ROOT_DIR/build/logs/check-render.log" 2>&1; then
|
||||
progress_tick 100
|
||||
else
|
||||
_fail=1; progress_tick 100; echo; echo "!! 离屏渲染失败"
|
||||
fi
|
||||
|
||||
progress_step "产物检查"
|
||||
_n=$(ls "$ROOT_DIR"/dist/*/GC-"$VERSION"-*.zip 2>/dev/null | wc -l | tr -d ' ')
|
||||
if [ "$_n" -ge 3 ]; then
|
||||
progress_tick 100
|
||||
else
|
||||
_fail=1; progress_tick 100; echo; echo "!! 产物不足 3 个(当前 $_n)"
|
||||
fi
|
||||
|
||||
progress_done
|
||||
[ "$_fail" -eq 0 ] && echo "==> 全部通过" || echo "==> 有失败项"
|
||||
if [ "$_fail" -eq 0 ]; then
|
||||
step_ok "全部通过"
|
||||
else
|
||||
err "有失败项"
|
||||
fi
|
||||
return "$_fail"
|
||||
}
|
||||
@@ -87,7 +87,7 @@ resolve_flutter() {
|
||||
# pubspec 要求 Dart 3.5+(Flutter 3.24+),版本不对直接提醒
|
||||
local dart_ver
|
||||
dart_ver=$("$root/bin/cache/dart-sdk/bin/dart" --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1) || dart_ver=""
|
||||
say "Flutter SDK: $root(engine ${ENGINE_HASH:0:10}${dart_ver:+, dart $dart_ver})"
|
||||
say "Flutter SDK: ${root}(engine ${ENGINE_HASH:0:10}${dart_ver:+, dart $dart_ver})"
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------- 引擎产物
|
||||
@@ -96,14 +96,18 @@ ENGINE_DIR="" # 由 resolve_flutter 填充
|
||||
|
||||
fetch_engine() {
|
||||
local base="$MIRROR/flutter/$ENGINE_HASH"
|
||||
local cache="${TMPDIR:-/tmp}/gc-win-engine"
|
||||
# 缓存放仓库内 build/cache(原来放 ${TMPDIR},系统会清理,导致每次构建都重下 200MB+)
|
||||
local cache="${GC_WIN_ENGINE_CACHE:-$ROOT_DIR/build/cache/win-engine}"
|
||||
mkdir -p "$cache" 2>/dev/null || cache="${TMPDIR:-/tmp}/gc-win-engine"
|
||||
mkdir -p "$cache"
|
||||
|
||||
# 每个条目:远端相对路径 | 落地目录 | 落地后的标志文件
|
||||
# 注意 flutter-cpp-client-wrapper.zip 内部已经带一层 cpp_client_wrapper/,
|
||||
# 所以落地目录只能是 windows-x64,否则会解成 cpp_client_wrapper/cpp_client_wrapper。
|
||||
local -a items=(
|
||||
"windows-x64-release/windows-x64-flutter.zip|$ENGINE_DIR/windows-x64-release|flutter_windows.dll.lib"
|
||||
"windows-x64/artifacts.zip|$ENGINE_DIR/windows-x64|frontend_server_aot.dart.snapshot"
|
||||
"windows-x64/flutter-cpp-client-wrapper.zip|$ENGINE_DIR/windows-x64/cpp_client_wrapper|core_implementations.cc"
|
||||
"windows-x64/flutter-cpp-client-wrapper.zip|$ENGINE_DIR/windows-x64|cpp_client_wrapper/core_implementations.cc"
|
||||
)
|
||||
|
||||
local item remote dest marker zip
|
||||
@@ -114,7 +118,11 @@ fetch_engine() {
|
||||
zip="$cache/$(echo "$remote" | tr '/' '_')"
|
||||
if [ ! -s "$zip" ]; then
|
||||
say "下载 $(basename "$remote")"
|
||||
curl -fL --retry 3 --retry-delay 2 -o "$zip.part" "$base/$remote" \
|
||||
# -C - 断点续传:中断后重跑接着下,不从头开始
|
||||
# --speed-limit/--speed-time:网速掉到 4KB/s 持续 30 秒就放弃重试,避免无限挂住
|
||||
curl -fL -sS -C - --retry 5 --retry-delay 2 \
|
||||
--connect-timeout 20 --speed-limit 4096 --speed-time 30 \
|
||||
-o "$zip.part" "$base/$remote" \
|
||||
|| die "下载失败:$base/$remote
|
||||
可设置 WIN_ENGINE_MIRROR=https://storage.flutter-io.cn/flutter_infra_release 走国内镜像"
|
||||
mv "$zip.part" "$zip"
|
||||
|
||||
@@ -34,3 +34,14 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
|
||||
# 和系统 DLL,拷到干净机器上也能跑。
|
||||
set(CMAKE_CXX_FLAGS_INIT "-DUNICODE -D_UNICODE -DNOMINMAX -D_HAS_EXCEPTIONS=1")
|
||||
set(CMAKE_EXE_LINKER_FLAGS_INIT "-static -static-libgcc -static-libstdc++")
|
||||
|
||||
# GCC 16 兼容性
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-compound-token-split-by-macro -Wno-deprecated-attributes")
|
||||
|
||||
# 强制 C++17,避免 GCC 16 的 C++20 三路比较问题
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||
|
||||
# 兼容 mingw-w64 14 + GCC 16 的问题
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wno-error -D__STDC_CONSTANT_MACROS")
|
||||
+14
-491
@@ -1,494 +1,17 @@
|
||||
#!/bin/sh
|
||||
# buildsh/lib/build_funcs.sh —— 构建函数库(由入口脚本 source)
|
||||
# 依赖调用方提供:ROOT_DIR, APP_PROJ, PREVIEW_PROJ, STAMP_PROJ, TEST_PROJ, SLN, VERSION
|
||||
# 以及任务进度上报函数 step / progress(由进度条引擎提供,未定义时降级为 echo)
|
||||
|
||||
if ! type step >/dev/null 2>&1; then step() { echo "==> $1"; }; fi
|
||||
if ! type progress >/dev/null 2>&1; then progress() { :; }; fi
|
||||
|
||||
# $1=--no-sign 时只生成清单、不签名。
|
||||
# 完整 build 会在 pack_launcher 末尾统一签一次(末次签名),中间这次签名是浪费的:
|
||||
# ECDSA 用随机 nonce + signedAt 时间戳,每次签名字节都不同,白白多一次全量签名,
|
||||
# 也让中间产物反复抖动。单独的 stamp / models 工具没有后续打包,仍走默认签名。
|
||||
stamp_versions() {
|
||||
echo "==> 自动计算模型版本并生成 version.json"
|
||||
dotnet run --project "$STAMP_PROJ" -c Release -- "$ROOT_DIR" "$VERSION"
|
||||
case "${1:-}" in
|
||||
--no-sign) echo " (跳过签名,打包结束后统一签一次)" ;;
|
||||
*) sign_manifest ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# 打完 zip 之后刷新 launcher.packages(写入 path / dir / name / sha256 / size)。
|
||||
# 只重写清单的启动器段:模型指纹可能涉及几百 MB 文件,没必要再算一遍。
|
||||
stamp_launcher_only() {
|
||||
echo "==> 刷新启动器包信息(sha256 / 体积 / dist 路径)"
|
||||
dotnet run --project "$STAMP_PROJ" -c Release -- "$ROOT_DIR" "$VERSION" --launcher-only
|
||||
sign_manifest
|
||||
}
|
||||
|
||||
# 用 .signing/ 里的私钥给 version.json 签名(私钥不入库)。
|
||||
# 没有私钥时只警告:清单不带 signature,客户端会按「未签名」处理。
|
||||
sign_manifest() {
|
||||
KEY="$ROOT_DIR/.signing/gc-signing.pem"
|
||||
KEYID="${GC_SIGNING_KEY_ID:-gc-2026-12}"
|
||||
if [ ! -f "$KEY" ]; then
|
||||
echo "!! 未找到签名私钥 ${KEY},本次 version.json 未签名(客户端会拒绝更新)"
|
||||
echo " 生成密钥:dotnet run --project GC-SAVEDOG -- keygen"
|
||||
return 0
|
||||
fi
|
||||
echo "==> 签名 version.json(${KEYID})"
|
||||
if dotnet run --project "$ROOT_DIR/GC-SAVEDOG/GC-SAVEDOG.csproj" -c Release -- \
|
||||
sign --manifest "$ROOT_DIR/version.json" --key "$KEY" --key-id "$KEYID"; then
|
||||
# model/version.json 必须与根清单完全一致(同一个签名),否则走 model 地址的源会验签失败
|
||||
cp "$ROOT_DIR/version.json" "$ROOT_DIR/model/version.json"
|
||||
else
|
||||
echo "!! 签名失败,version.json 保持未签名状态"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# 编译模型自己的功能程序集,并把 dll / 封面直接写进模型包
|
||||
build_models() {
|
||||
echo "==> 编译模型功能程序集(源码就在各模型目录的 src/ 里)"
|
||||
for DIR in "$ROOT_DIR"/model/*/; do
|
||||
ID=$(basename "$DIR")
|
||||
[ -d "$DIR/src" ] || continue
|
||||
PROJ=$(ls "$DIR"src/*.csproj 2>/dev/null | head -1)
|
||||
[ -n "$PROJ" ] || continue
|
||||
dotnet build "$PROJ" -c Release
|
||||
if [ -d "$DIR$ID.model" ]; then
|
||||
for DLL in "$DIR"src/bin/Release/net8.0/*.dll; do
|
||||
[ -f "$DLL" ] || continue
|
||||
NAME=$(basename "$DLL")
|
||||
[ "$NAME" = "GC.ModelSdk.dll" ] && continue
|
||||
cp "$DLL" "$DIR$ID.model/"
|
||||
echo " -> model/$ID/$ID.model/$NAME"
|
||||
done
|
||||
fi
|
||||
done
|
||||
echo "==> 用模型自己的渲染器生成封面"
|
||||
dotnet run --project "$PREVIEW_PROJ" -c Release -- "$ROOT_DIR"
|
||||
stamp_versions
|
||||
}
|
||||
|
||||
# 发布目录只放程序本体:不预置 .GC,也不放模型。
|
||||
# .GC(config / model / cache / update / safedog / logs)一律在首次启动时
|
||||
# 由 AppPaths.EnsureCreated + RuntimeLayout 创建,压缩包里只有 GC 本体。
|
||||
prepare_runtime_layout() {
|
||||
REL="$1"
|
||||
DEST="$ROOT_DIR/$REL"
|
||||
[ -d "$DEST" ] || return 0
|
||||
rm -rf "$DEST/model" "$DEST/examples" "$DEST/.GC"
|
||||
echo " 运行目录 -> $REL(首次启动后生成 .GC/:config model cache update safedog logs)"
|
||||
}
|
||||
|
||||
# 剔除与目标平台无关 / 只在调试诊断时才会加载的组件。
|
||||
# 判定依据:Windows 包用 Kestrel 自托管,不经过 IIS/HttpSys;Avalonia 在 Windows
|
||||
# 上只用 Win32 后端;DAC/DBI/DiaSymReader 只有调试器与读 PDB 时才需要,
|
||||
# 而发布包 DebugType=none、不带 PDB。全都不在启动与正常运行路径上。
|
||||
prune_package() {
|
||||
DEST="$1"; PLAT="$2"
|
||||
[ -d "$DEST" ] || return 0
|
||||
case "$PLAT" in
|
||||
win)
|
||||
# ProjectReference 会把后端 exe 的 runtimeconfig 一起拷过来;后端已编入启动器,
|
||||
# 这些残留没有用。
|
||||
rm -f "$DEST"/GC.UI.Server.exe "$DEST"/GC.UI.Server.dll \
|
||||
"$DEST"/GC.UI.Server.deps.json "$DEST"/GC.UI.Server.runtimeconfig.json
|
||||
rm -f "$DEST"/mscordaccore*.dll \
|
||||
"$DEST"/mscordbi.dll \
|
||||
"$DEST"/Microsoft.DiaSymReader.Native*.dll \
|
||||
"$DEST"/web.config \
|
||||
"$DEST"/aspnetcorev2_inprocess.dll \
|
||||
"$DEST"/Microsoft.AspNetCore.Server.IIS.dll \
|
||||
"$DEST"/Microsoft.AspNetCore.Server.IISIntegration.dll \
|
||||
"$DEST"/Microsoft.AspNetCore.Server.HttpSys.dll \
|
||||
"$DEST"/Avalonia.X11.dll \
|
||||
"$DEST"/Avalonia.Native.dll \
|
||||
"$DEST"/Avalonia.FreeDesktop.dll \
|
||||
"$DEST"/Tmds.DBus.Protocol.dll
|
||||
;;
|
||||
linux)
|
||||
rm -f "$DEST"/mscordaccore*.dll \
|
||||
"$DEST"/mscordbi.dll \
|
||||
"$DEST"/Microsoft.DiaSymReader.Native*.dll \
|
||||
"$DEST"/web.config \
|
||||
"$DEST"/aspnetcorev2_inprocess.dll \
|
||||
"$DEST"/Microsoft.AspNetCore.Server.IIS.dll \
|
||||
"$DEST"/Microsoft.AspNetCore.Server.IISIntegration.dll \
|
||||
"$DEST"/Microsoft.AspNetCore.Server.HttpSys.dll \
|
||||
"$DEST"/Avalonia.Win32.dll \
|
||||
"$DEST"/Avalonia.Win32.Automation.dll
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# $1=RID $2=输出目录 $3=singlefile(true/false)
|
||||
publish_rid() {
|
||||
RID="$1"; OUT="$2"; SINGLE="${3:-true}"
|
||||
echo ""
|
||||
echo "==> 编译 ${RID} (single-file=${SINGLE}) -> ${OUT}"
|
||||
# 先删旧产物,避免上次 publish 的残留文件混进新包
|
||||
rm -rf "$ROOT_DIR/$OUT"
|
||||
dotnet publish "$APP_PROJ" \
|
||||
-c Release \
|
||||
-r "$RID" \
|
||||
--self-contained true \
|
||||
-p:Version="$VERSION" \
|
||||
-p:DebugType=none \
|
||||
-p:PublishSingleFile="$SINGLE" \
|
||||
-p:IncludeNativeLibrariesForSelfExtract="$SINGLE" \
|
||||
-p:EnableCompressionInSingleFile="$SINGLE" \
|
||||
-p:PublishTrimmed=false \
|
||||
-o "$ROOT_DIR/$OUT" || return 1
|
||||
|
||||
# 更新守护进程:与主程序同目录(macOS 打包时会被一起移入 Contents/MacOS)
|
||||
if [ -n "${SAVEDOG_PROJ:-}" ] && [ -f "$ROOT_DIR/$SAVEDOG_PROJ" ]; then
|
||||
echo "==> 编译 GC-SAVEDOG (${RID}) -> ${OUT}(裁剪 + 压缩单文件)"
|
||||
# 守护进程不引用 Avalonia,可以安全裁剪:70MB -> 14MB。
|
||||
# 前提是 JSON 全部走源生成上下文(GC-SAVEDOG/SavedogJson.cs),新增 JSON 类型
|
||||
# 忘了注册只会在发布产物里炸,所以 update-test 会跑一次真实 apply 兜底。
|
||||
# EnableCompressionInSingleFile:运行时不常驻,启动时解压一次即可,
|
||||
# 换来包内少 4MB 左右,对「下载一次、只在更新时跑」的守护进程很划算。
|
||||
dotnet publish "$SAVEDOG_PROJ" \
|
||||
-c Release \
|
||||
-r "$RID" \
|
||||
--self-contained true \
|
||||
-p:Version="$VERSION" \
|
||||
-p:DebugType=none \
|
||||
-p:PublishSingleFile=true \
|
||||
-p:IncludeNativeLibrariesForSelfExtract=true \
|
||||
-p:EnableCompressionInSingleFile=true \
|
||||
-p:PublishTrimmed=true \
|
||||
-p:TrimMode=full \
|
||||
-p:JsonSerializerIsReflectionEnabledByDefault=false \
|
||||
-o "$ROOT_DIR/$OUT"
|
||||
fi
|
||||
|
||||
rm -rf "$ROOT_DIR/$OUT/model" "$ROOT_DIR/$OUT/examples"
|
||||
}
|
||||
|
||||
# 把 model/ 里的模型数据单独打包(与启动器分开分发)
|
||||
pack_models() {
|
||||
mkdir -p "$ROOT_DIR/dist"
|
||||
ZIP="$ROOT_DIR/dist/models-$VERSION.zip"
|
||||
rm -f "$ZIP"
|
||||
echo "==> 打包模型数据 -> dist/models-$VERSION.zip"
|
||||
( cd "$ROOT_DIR" && zip -qrX "$ZIP" model \
|
||||
-x "*.DS_Store" "*/bin/*" "*/obj/*" "*.user" )
|
||||
du -sh "$ZIP"
|
||||
}
|
||||
|
||||
# 启动器更新包:安装目录根只放 GC 本体;非本体文件(守护进程等)收进 .GC/bin。
|
||||
# .GC 下的用户数据(config / model / cache / update / logs / safedog)不进包。
|
||||
# buildsh/lib/build_funcs.sh —— 兼容入口
|
||||
#
|
||||
# 产物落点遵循「仓库 dist/<系统>-<架构>/」布局:
|
||||
# dist/mac-arm64/GCL-<版本>-mac-arm64.zip
|
||||
# dist/win-amd64/GCL-<版本>-win-amd64.zip
|
||||
# dist/win-arm64/GCL-<版本>-win-arm64.zip
|
||||
# dist/linux-arm64/GCL-<版本>-linux-arm64.zip
|
||||
# 启动器更新时既可以从 Release 附件下载,也会到这些目录里找编译产物
|
||||
# (见 GC-DOWNLOAD/LauncherArtifacts.cs),所以两种发布方式都能用。
|
||||
# 原先是单文件函数库,现按职责拆成:
|
||||
# log.sh 输出层(say / step_ok / note / detail / warn / err / run_logged)
|
||||
# progress.sh 进度显示(终端进度条 / 非终端逐行)
|
||||
# publish.sh 环境预检、工具程序集缓存、dotnet 发布、阶段执行
|
||||
# core.sh 版本清单、签名、模型构建
|
||||
# flutter.sh Flutter 构建与落位
|
||||
# package.sh 组装 .app、生成发布 zip
|
||||
#
|
||||
# Windows: 单文件 exe 直接改名(本身就是可执行产物)
|
||||
# macOS: .app 必须打成 zip 才能作为单文件分发;文件名用 .app.zip,
|
||||
# 这样 macOS 双击会用归档工具解压出可运行的 .app。
|
||||
# 若直接命名 .app,系统会把 zip 当成应用包解析 => 报「已损坏/打不开」。
|
||||
# 当前主机原生构建 Flutter 前端(Windows 主机编 Windows,macOS 主机编 macOS,
|
||||
# Linux 主机编 Linux)。跨平台的 Windows 版由 build_flutter_ui_cross 负责。
|
||||
#
|
||||
# 默认「必须有前端」:缺 flutter 或编译失败直接返回非 0,让 build.sh 停下来说明
|
||||
# 原因,而不是悄悄出一个只有 Avalonia 回退界面的包。确实需要降级时用
|
||||
# ./build.sh build --allow-no-ui 显式声明。
|
||||
build_flutter_ui() {
|
||||
PLAT="$1"; DEST="$2"
|
||||
UI_SRC="$ROOT_DIR/GC-UI/frontend"
|
||||
if [ ! -d "$UI_SRC" ]; then
|
||||
echo "!! 找不到 Flutter 工程:$UI_SRC"
|
||||
return 1
|
||||
fi
|
||||
|
||||
FLUTTER_BIN="${FLUTTER_BIN:-flutter}"
|
||||
if ! command -v "$FLUTTER_BIN" >/dev/null 2>&1; then
|
||||
echo "!! 未找到 flutter(可用 FLUTTER_BIN=<路径> 指定)"
|
||||
return 1
|
||||
fi
|
||||
|
||||
echo "==> 构建 Flutter 前端 (${PLAT})"
|
||||
( cd "$UI_SRC" && "$FLUTTER_BIN" pub get && "$FLUTTER_BIN" build "$PLAT" --release ) || return 1
|
||||
|
||||
mkdir -p "$ROOT_DIR/$DEST"
|
||||
case "$PLAT" in
|
||||
windows)
|
||||
# Release/ 里含 GC-UI.exe、flutter_windows.dll 和 data/
|
||||
cp -R "$UI_SRC/build/windows/x64/runner/Release/." "$ROOT_DIR/$DEST/"
|
||||
;;
|
||||
macos)
|
||||
rm -rf "$ROOT_DIR/$DEST/GC-UI.app"
|
||||
cp -R "$UI_SRC/build/macos/Build/Products/Release/GC-UI.app" "$ROOT_DIR/$DEST/"
|
||||
;;
|
||||
linux)
|
||||
# bundle/ 里是 GC-UI、lib/*.so 与 data/,整体铺到包的根目录。
|
||||
# 目录名跟着目标架构走:aarch64 主机在 build/linux/arm64/,x64 在 build/linux/x64/。
|
||||
BUNDLE=""
|
||||
for cand in "$UI_SRC/build/linux/arm64/release/bundle" \
|
||||
"$UI_SRC/build/linux/x64/release/bundle"; do
|
||||
[ -d "$cand" ] && BUNDLE="$cand" && break
|
||||
done
|
||||
if [ -z "$BUNDLE" ]; then
|
||||
echo "!! 找不到 Flutter Linux bundle(期望 build/linux/{arm64,x64}/release/bundle)"
|
||||
return 1
|
||||
fi
|
||||
# 目标包是 arm64,却只编出 x64 bundle:说明主机架构不对,宁可失败也不出坏包
|
||||
case "$BUNDLE" in
|
||||
*/arm64/*) ;;
|
||||
*)
|
||||
if [ "$(uname -m)" != "aarch64" ] && [ "$(uname -m)" != "arm64" ]; then
|
||||
echo "!! Linux 包目标为 arm64,但当前主机 $(uname -m) 只能编出 x64 前端"
|
||||
return 1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
cp -R "$BUNDLE/." "$ROOT_DIR/$DEST/"
|
||||
;;
|
||||
*)
|
||||
echo "!! 不支持的 Flutter 目标平台:$PLAT"
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
echo " -> $DEST(Flutter ${PLAT})"
|
||||
}
|
||||
|
||||
# 在 Linux / macOS 上交叉编译 Windows 前端:mingw-w64 编 C++ 外壳,
|
||||
# wine 跑 Windows 版 gen_snapshot 生成 AOT 快照,无需 Windows 机器。
|
||||
# 产物布局与官方 toolchain 完全一致(GC-UI.exe + flutter_windows.dll + data/)。
|
||||
build_flutter_ui_cross() {
|
||||
DEST="$1"
|
||||
UI_SRC="$ROOT_DIR/GC-UI/frontend"
|
||||
[ -d "$UI_SRC" ] || return 0
|
||||
|
||||
FLUTTER_BIN="${FLUTTER_BIN:-flutter}"
|
||||
if ! command -v "$FLUTTER_BIN" >/dev/null 2>&1; then
|
||||
echo "!! 未找到 flutter(可用 FLUTTER_BIN=<路径> 指定)"
|
||||
return 1
|
||||
fi
|
||||
|
||||
mkdir -p "$ROOT_DIR/build/logs"
|
||||
echo "==> 交叉编译 Windows 前端(mingw-w64 + wine)"
|
||||
if ! FLUTTER_BIN="$FLUTTER_BIN" bash "$ROOT_DIR/buildsh/cross/build-ui-win-cross.sh" \
|
||||
"$UI_SRC/build/windows/x64/runner/Release" \
|
||||
>"$ROOT_DIR/build/logs/flutter-win-cross.log" 2>&1; then
|
||||
echo "!! 交叉编译失败(日志:build/logs/flutter-win-cross.log)"
|
||||
tail -5 "$ROOT_DIR/build/logs/flutter-win-cross.log" 2>/dev/null | sed 's/^/ /'
|
||||
return 1
|
||||
fi
|
||||
|
||||
mkdir -p "$ROOT_DIR/$DEST"
|
||||
cp -R "$UI_SRC/build/windows/x64/runner/Release/." "$ROOT_DIR/$DEST/"
|
||||
echo " -> $DEST(Flutter windows,交叉编译)"
|
||||
}
|
||||
|
||||
pack_launcher() {
|
||||
echo "==> 生成启动器产物(GCL-<版本>-<系统>-<架构>)"
|
||||
|
||||
# --- Windows:启动器 + 守护进程 + UI 后端 + Flutter 前端,整目录打包 ---
|
||||
for pair in "win-x64:win-amd64" "win-arm64:win-arm64"; do
|
||||
RID="${pair%%:*}"; LABEL="${pair##*:}"
|
||||
SRC="$ROOT_DIR/dist/$LABEL"
|
||||
[ -d "$SRC" ] || SRC="$ROOT_DIR/dist/$RID" # 兼容旧布局
|
||||
[ -d "$SRC" ] || continue
|
||||
|
||||
# 启动器固定是 GC.exe;后端与前端是可选的随包产物,不能当成启动器。
|
||||
EXE="$SRC/GC.exe"
|
||||
[ -f "$EXE" ] || EXE=$(ls "$SRC"/*.exe 2>/dev/null | grep -v 'GC-SAVEDOG\|GC.UI.Server\|GC-UI' | head -1)
|
||||
[ -n "$EXE" ] || continue
|
||||
|
||||
# 包内只有一个顶层目录(GCL-<版本>-<平台>),解压后不会散落一屏 dll。
|
||||
TMP="$ROOT_DIR/dist/.winpkg-$LABEL"
|
||||
PKGNAME="GCL-${VERSION}-${LABEL}"
|
||||
PKG="$TMP/$PKGNAME"
|
||||
rm -rf "$TMP"; mkdir -p "$PKG"
|
||||
cp -R "$SRC"/. "$PKG"/
|
||||
rm -f "$PKG"/*.zip
|
||||
prune_package "$PKG" win
|
||||
mv "$PKG/$(basename "$EXE")" "$PKG/$PKGNAME.exe"
|
||||
chmod +x "$PKG/$PKGNAME.exe" 2>/dev/null || true
|
||||
if [ ! -f "$PKG/GC-SAVEDOG.exe" ]; then
|
||||
echo " !! 缺少 GC-SAVEDOG.exe,该平台将退回旧脚本更新"
|
||||
else
|
||||
# 非本体文件统一收进 .GC/bin:安装目录根只留 GC 本体。
|
||||
# 首次启动复制到 .GC/safedog 再运行,所以这里的源文件更新时可安全替换。
|
||||
mkdir -p "$PKG/.GC/bin"
|
||||
mv "$PKG/GC-SAVEDOG.exe" "$PKG/.GC/bin/"
|
||||
fi
|
||||
if [ ! -f "$PKG/GC-UI.exe" ]; then
|
||||
echo " !! 包内没有 Flutter 前端,启动器将使用内置 Avalonia 界面"
|
||||
fi
|
||||
|
||||
ZIP="$ROOT_DIR/dist/$LABEL/$PKGNAME.zip"
|
||||
rm -f "$ZIP"
|
||||
( cd "$TMP" && zip -qrX "$ZIP" "$PKGNAME" )
|
||||
rm -rf "$TMP"
|
||||
echo " -> dist/$LABEL/$PKGNAME.zip"
|
||||
done
|
||||
|
||||
# --- Linux:整目录打包(启动器 + 守护 + 后端 + Flutter 前端)---
|
||||
SRC="$ROOT_DIR/dist/linux-arm64"
|
||||
if [ -d "$SRC" ]; then
|
||||
TMP="$ROOT_DIR/dist/.linuxpkg"
|
||||
PKGNAME="GCL-${VERSION}-linux-arm64"
|
||||
PKG="$TMP/$PKGNAME"
|
||||
rm -rf "$TMP"; mkdir -p "$PKG"
|
||||
cp -R "$SRC"/. "$PKG"/
|
||||
rm -f "$PKG"/*.zip
|
||||
prune_package "$PKG" linux
|
||||
if [ -f "$PKG/GC" ]; then
|
||||
mv "$PKG/GC" "$PKG/$PKGNAME"
|
||||
chmod +x "$PKG/$PKGNAME" 2>/dev/null || true
|
||||
fi
|
||||
if [ -f "$PKG/GC-SAVEDOG" ]; then
|
||||
mkdir -p "$PKG/.GC/bin"
|
||||
mv "$PKG/GC-SAVEDOG" "$PKG/.GC/bin/"
|
||||
fi
|
||||
if [ ! -f "$PKG/GC-UI" ]; then
|
||||
echo " !! 包内没有 Flutter 前端,启动器将使用内置 Avalonia 界面"
|
||||
fi
|
||||
ZIP="$ROOT_DIR/dist/linux-arm64/$PKGNAME.zip"
|
||||
rm -f "$ZIP"
|
||||
( cd "$TMP" && zip -qryX "$ZIP" "$PKGNAME" )
|
||||
rm -rf "$TMP"
|
||||
echo " -> dist/linux-arm64/$PKGNAME.zip"
|
||||
fi
|
||||
|
||||
# --- macOS:先得到真实 .app 目录(改名 + 同步 Info.plist)---
|
||||
MACAPP="$ROOT_DIR/dist/mac-arm64/GC.app"
|
||||
if [ -d "$MACAPP" ]; then
|
||||
FINAL="$ROOT_DIR/dist/GCL-${VERSION}-mac-arm64.app"
|
||||
rm -rf "$FINAL"
|
||||
mv "$MACAPP" "$FINAL"
|
||||
chmod +x "$FINAL/Contents/MacOS/GC" 2>/dev/null || true
|
||||
PLIST="$FINAL/Contents/Info.plist"
|
||||
if [ -f "$PLIST" ]; then
|
||||
/usr/libexec/PlistBuddy -c "Set :CFBundleName Morris GC" "$PLIST" 2>/dev/null || true
|
||||
/usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName Morris GC" "$PLIST" 2>/dev/null || true
|
||||
fi
|
||||
# 非本体文件收进 .GC/bin(与 Windows 布局一致):.GC 位置不变,仍在启动器同级
|
||||
# (也就是 .app/Contents/MacOS/),首次启动复制到 .GC/safedog 再运行。
|
||||
if [ -f "$FINAL/Contents/MacOS/GC-SAVEDOG" ]; then
|
||||
mkdir -p "$FINAL/Contents/MacOS/.GC/bin"
|
||||
mv "$FINAL/Contents/MacOS/GC-SAVEDOG" "$FINAL/Contents/MacOS/.GC/bin/"
|
||||
chmod +x "$FINAL/Contents/MacOS/.GC/bin/GC-SAVEDOG" 2>/dev/null || true
|
||||
fi
|
||||
xattr -cr "$FINAL" 2>/dev/null || true
|
||||
echo " -> $(basename "$FINAL")/"
|
||||
fi
|
||||
|
||||
# --- 统一压缩:每个产物都打成同名 .zip,放进自己的平台目录 ---
|
||||
# GCL-1.0.3-mac-arm64.app -> dist/mac-arm64/GCL-1.0.3-mac-arm64.zip
|
||||
# 客户端下载时按「原名去掉扩展名 + .zip」取包,再解压回原名。
|
||||
echo "==> 压缩为 zip"
|
||||
for art in "$ROOT_DIR"/dist/GCL-"$VERSION"-*.exe "$ROOT_DIR"/dist/GCL-"$VERSION"-*.app; do
|
||||
[ -e "$art" ] || continue
|
||||
base=$(basename "$art")
|
||||
name="${base%.*}" # 去掉 .exe / .app
|
||||
label="${name#GCL-${VERSION}-}" # mac-arm64 / win-amd64
|
||||
ZIP="$ROOT_DIR/dist/${label}/${name}.zip"
|
||||
mkdir -p "$ROOT_DIR/dist/${label}"
|
||||
rm -f "$ZIP"
|
||||
if [ -d "$art" ]; then
|
||||
# 目录(.app):保留权限与符号链接
|
||||
if command -v ditto >/dev/null 2>&1; then
|
||||
ditto -c -k --sequesterRsrc --keepParent "$art" "$ZIP"
|
||||
else
|
||||
( cd "$(dirname "$art")" && zip -qryX "$ZIP" "$base" -x "*.DS_Store" )
|
||||
fi
|
||||
else
|
||||
( cd "$(dirname "$art")" && zip -qX "$ZIP" "$base" )
|
||||
fi
|
||||
echo " -> dist/${label}/${name}.zip"
|
||||
done
|
||||
|
||||
# 原始产物(.exe / .app 目录)不再保留:只发布 zip。
|
||||
# 用「移入暂存区」而不是 rm -rf:.app 里有两百多个文件,
|
||||
# 一次性删除又慢又不可逆,先挪走更安全(暂存区在下次构建开始时挪出 dist)。
|
||||
TRASH="$ROOT_DIR/build/trash"
|
||||
mkdir -p "$TRASH"
|
||||
for leftover in "$ROOT_DIR"/dist/GCL-"$VERSION"-*.exe "$ROOT_DIR"/dist/GCL-"$VERSION"-*.app; do
|
||||
[ -e "$leftover" ] || continue
|
||||
mv "$leftover" "$TRASH/$(basename "$leftover")-$(date +%s)" 2>/dev/null || true
|
||||
done
|
||||
|
||||
strip_intermediate_dirs
|
||||
stamp_launcher_only
|
||||
echo ""
|
||||
echo "==> dist 里可发布的 zip:"
|
||||
ls -lh "$ROOT_DIR"/dist/*/GCL-"$VERSION"-*.zip 2>/dev/null || true
|
||||
}
|
||||
|
||||
# 删除 publish 过程中的中间目录:平台目录里只留最终 zip
|
||||
strip_intermediate_dirs() {
|
||||
for d in win-amd64 win-x64 win-arm64 mac-arm64 linux-arm64 linux-x64; do
|
||||
[ -d "$ROOT_DIR/dist/$d" ] || continue
|
||||
find "$ROOT_DIR/dist/$d" -mindepth 1 -maxdepth 1 \
|
||||
! -name "GCL-${VERSION}-*.zip" -exec rm -rf {} + 2>/dev/null || true
|
||||
done
|
||||
find "$ROOT_DIR/dist" -name ".DS_Store" -delete 2>/dev/null || true
|
||||
}
|
||||
|
||||
package_mac_app() {
|
||||
DIST="$ROOT_DIR/dist/mac-arm64"
|
||||
APP="$DIST/GC.app"
|
||||
rm -rf "$APP"
|
||||
mkdir -p "$APP/Contents/MacOS" "$APP/Contents/Resources"
|
||||
cat > "$APP/Contents/Info.plist" <<PLIST
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleName</key><string>GC</string>
|
||||
<key>CFBundleDisplayName</key><string>GC</string>
|
||||
<key>CFBundleIdentifier</key><string>com.xhmcl.GC</string>
|
||||
<key>CFBundleVersion</key><string>${VERSION}</string>
|
||||
<key>CFBundleShortVersionString</key><string>${VERSION}</string>
|
||||
<key>CFBundlePackageType</key><string>APPL</string>
|
||||
<key>CFBundleExecutable</key><string>GC</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key><string>6.0</string>
|
||||
<key>LSMinimumSystemVersion</key><string>11.0</string>
|
||||
<key>NSHighResolutionCapable</key><true/>
|
||||
</dict>
|
||||
</plist>
|
||||
PLIST
|
||||
for f in "$DIST"/*; do
|
||||
base=$(basename "$f")
|
||||
[ "$base" = "GC.app" ] && continue
|
||||
[ "$base" = ".DS_Store" ] && continue
|
||||
mv "$f" "$APP/Contents/MacOS/"
|
||||
done
|
||||
# 应用图标:由 Assets/icon-1024.png 生成 .icns
|
||||
ICONSRC="$ROOT_DIR/GC/src/Assets/icon-1024.png"
|
||||
if [ -f "$ICONSRC" ] && command -v iconutil >/dev/null 2>&1; then
|
||||
ICONSET="$DIST/AppIcon.iconset"
|
||||
rm -rf "$ICONSET"; mkdir -p "$ICONSET"
|
||||
for sz in 16 32 64 128 256 512; do
|
||||
sips -z $sz $sz "$ICONSRC" --out "$ICONSET/icon_${sz}x${sz}.png" >/dev/null 2>&1
|
||||
d=$((sz * 2))
|
||||
sips -z $d $d "$ICONSRC" --out "$ICONSET/icon_${sz}x${sz}@2x.png" >/dev/null 2>&1
|
||||
done
|
||||
iconutil -c icns "$ICONSET" -o "$APP/Contents/Resources/AppIcon.icns" 2>/dev/null && \
|
||||
echo " + AppIcon.icns"
|
||||
rm -rf "$ICONSET"
|
||||
# Info.plist 增加图标项
|
||||
if [ -f "$APP/Contents/Info.plist" ]; then
|
||||
/usr/libexec/PlistBuddy -c "Delete :CFBundleIconFile" "$APP/Contents/Info.plist" 2>/dev/null || true
|
||||
/usr/libexec/PlistBuddy -c "Add :CFBundleIconFile string AppIcon" "$APP/Contents/Info.plist" 2>/dev/null || true
|
||||
fi
|
||||
fi
|
||||
|
||||
# 清掉模板类 .GC(config / model / cache / update / logs):首次启动自行创建,
|
||||
# 包里只保留 .GC/bin 这一个由 pack_launcher 补上的非本体文件目录。
|
||||
rm -rf "$APP/Contents/MacOS/.GC"
|
||||
chmod +x "$APP/Contents/MacOS/GC"
|
||||
echo "==> 已打包 $APP"
|
||||
}
|
||||
|
||||
# 保留本文件是为了老的 `source buildsh/lib/build_funcs.sh` 用法继续可用。
|
||||
_bf_root="${GC_ROOT:-${ROOT_DIR:?build_funcs.sh 需要先设置 ROOT_DIR 或 GC_ROOT}}"
|
||||
for _bf_m in log progress publish core flutter package; do
|
||||
. "$_bf_root/buildsh/lib/$_bf_m.sh"
|
||||
done
|
||||
unset _bf_m _bf_root
|
||||
@@ -0,0 +1,75 @@
|
||||
#!/bin/sh
|
||||
# buildsh/lib/core.sh —— 版本清单 / 签名 / 模型构建
|
||||
#
|
||||
# 这些步骤原来全用 dotnet run --project,每次都要走一遍 MSBuild(还不算输出噪音)。
|
||||
# 现在统一走 dt_tool:首次构建工具程序集,之后直接跑 dll。
|
||||
|
||||
# 只在清单需要重算时生成;--no-sign 用于完整构建的中途(打包结束后统一签一次)
|
||||
stamp_versions() {
|
||||
say "生成 version.json"
|
||||
run_logged "$GC_ROOT/build/logs/stamp.log" "生成 version.json " \
|
||||
dt_tool stamp "$STAMP_PROJ" VersionStamp "$GC_ROOT" "$VERSION" || return 1
|
||||
step_ok "version.json(${VERSION})"
|
||||
case "${1:-}" in
|
||||
--no-sign) detail "跳过中途签名,打包结束后统一签一次" ;;
|
||||
*) sign_manifest ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# 打完 zip 后只刷新启动器段(path / dir / name / sha256 / size)。
|
||||
# 模型指纹涉及几百 MB 文件,没必要再算一遍。
|
||||
stamp_launcher_only() {
|
||||
say "刷新包信息(sha256 / 体积)"
|
||||
run_logged "$GC_ROOT/build/logs/stamp-launcher.log" "刷新包信息 " \
|
||||
dt_tool stamp "$STAMP_PROJ" VersionStamp "$GC_ROOT" "$VERSION" --launcher-only || return 1
|
||||
sign_manifest
|
||||
}
|
||||
|
||||
# 用 .signing/ 里的私钥签 version.json(私钥不入库)。没有私钥只警告:
|
||||
# 清单不带 signature,客户端按「未签名」处理。
|
||||
#
|
||||
# keyId 必须与私钥真正对应,否则签出来的清单自己都验不过(客户端更会拒):
|
||||
# 本地私钥可能是上一代 gc-2026-11,而默认值写的是 gc-2026-12。
|
||||
# 所以这里从 SignatureKeyring.cs 取出所有已注册 keyId 逐个试签,第一个通过验签的胜出。
|
||||
sign_manifest() {
|
||||
_key="$GC_ROOT/.signing/gc-signing.pem"
|
||||
if [ ! -f "$_key" ]; then
|
||||
warn "未找到签名私钥 .signing/gc-signing.pem,version.json 未签名(客户端会拒绝更新)"
|
||||
note "生成密钥:dotnet run --project GC-SAVEDOG -- keygen"
|
||||
return 0
|
||||
fi
|
||||
|
||||
_ids="${GC_SIGNING_KEY_ID:-}"
|
||||
if [ -z "$_ids" ]; then
|
||||
_kr="$GC_ROOT/GC/src/Security/SignatureKeyring.cs"
|
||||
[ -f "$_kr" ] && _ids=$(grep -oE '"gc-[0-9]{4}-[0-9]{2}"' "$_kr" | tr -d '"' | sort -u | tr '\n' ' ')
|
||||
fi
|
||||
[ -n "$_ids" ] || _ids="gc-2026-12"
|
||||
|
||||
_tmp="$GC_ROOT/build/tmp/version.signed.json"
|
||||
mkdir -p "$(dirname "$_tmp")"
|
||||
for _id in $_ids; do
|
||||
if dt_tool savedog "$SAVEDOG_PROJ" GC-SAVEDOG sign \
|
||||
--manifest "$GC_ROOT/version.json" --key "$_key" \
|
||||
--key-id "$_id" --out "$_tmp" >"$GC_ROOT/build/logs/sign.log" 2>&1; then
|
||||
mv "$_tmp" "$GC_ROOT/version.json"
|
||||
# model/version.json 必须与根清单完全一致(同一签名),否则走 model 地址的源会验签失败
|
||||
cp "$GC_ROOT/version.json" "$GC_ROOT/model/version.json"
|
||||
step_ok "已签名(${_id})"
|
||||
return 0
|
||||
fi
|
||||
detail "keyId ${_id} 与本地私钥不匹配,换下一个"
|
||||
done
|
||||
|
||||
err "签名失败:本地私钥与内置公钥环里的 keyId 都对不上"
|
||||
note "可用 GC_SIGNING_KEY_ID=<id> 指定;或用 keygen 重新生成并登记公钥"
|
||||
return 1
|
||||
}
|
||||
|
||||
# 模型已全部用 Flutter 实现(GC-UI/frontend/lib/models/),不再编译 C# 程序集,
|
||||
# 也不再需要 Avalonia 渲染引擎生成封面。这里只刷新清单里的模型指纹。
|
||||
build_models() {
|
||||
say "模型清单"
|
||||
note "模型渲染已迁到 Flutter,跳过 C# 程序集编译与封面生成"
|
||||
stamp_versions
|
||||
}
|
||||
@@ -0,0 +1,122 @@
|
||||
#!/bin/sh
|
||||
# buildsh/lib/flutter.sh —— Flutter 前端构建与落位
|
||||
#
|
||||
# 分两步,便于和其它编译并行:
|
||||
# flutter_build <平台> 只编译,产物留在 GC-UI/frontend/build/
|
||||
# flutter_stage <平台> <目录> 把产物铺进打包目录
|
||||
#
|
||||
# 输出策略:flutter 的输出(尤其 macOS 上 flutter_inappwebview 那几百行 Swift
|
||||
# 弃用警告)全部进 build/logs/flutter-<平台>.log,成功时不显示,失败才回显尾部。
|
||||
|
||||
_ui_src() { printf '%s' "$GC_ROOT/GC-UI/frontend"; }
|
||||
|
||||
# pub get 只在 pubspec 变了才跑:package_config.json 比 pubspec.yaml / pubspec.lock
|
||||
# 都新就说明依赖已就绪,省掉每次构建的解析与 "Changed N dependencies!" 抖动
|
||||
_flutter_deps_ready() {
|
||||
_pc="$(_ui_src)/.dart_tool/package_config.json"
|
||||
[ -f "$_pc" ] && [ -f "$(_ui_src)/pubspec.lock" ] &&
|
||||
[ "$_pc" -nt "$(_ui_src)/pubspec.yaml" ] && [ "$_pc" -nt "$(_ui_src)/pubspec.lock" ]
|
||||
}
|
||||
|
||||
_flutter() { ( cd "$(_ui_src)" && "$FLUTTER_BIN" "$@" ); }
|
||||
|
||||
flutter_build() {
|
||||
_plat="$1"
|
||||
UI_SRC="$(_ui_src)"
|
||||
FLUTTER_BIN="${FLUTTER_BIN:-flutter}"
|
||||
|
||||
[ -d "$UI_SRC" ] || { err "找不到 Flutter 工程:GC-UI/frontend"; return 1; }
|
||||
command -v "$FLUTTER_BIN" >/dev/null 2>&1 ||
|
||||
{ err "未找到 flutter(可用 FLUTTER_BIN=<路径> 指定)"; return 1; }
|
||||
|
||||
say "编译 Flutter 前端(${_plat})"
|
||||
if _flutter_deps_ready; then
|
||||
detail "依赖已就绪,跳过 pub get"
|
||||
else
|
||||
run_logged "$GC_ROOT/build/logs/flutter-pubget.log" "pub get " \
|
||||
_flutter pub get || return 1
|
||||
fi
|
||||
|
||||
# CI 上没有签名证书:GC_NO_CODESIGN=1 时给 macOS 加 --no-codesign,
|
||||
# 直接产出未签名的 .app(用户首次打开需右键「打开」或在系统设置里放行)。
|
||||
_flags="--release"
|
||||
if [ "${GC_NO_CODESIGN:-0}" = 1 ] && [ "$_plat" = macos ]; then
|
||||
_flags="$_flags --no-codesign"
|
||||
fi
|
||||
|
||||
run_logged "$GC_ROOT/build/logs/flutter-$_plat.log" "Flutter $_plat 构建 " \
|
||||
_flutter build "$_plat" $_flags || return 1
|
||||
step_ok "Flutter ${_plat}"
|
||||
}
|
||||
|
||||
# flutter_stage <平台> <目标目录(绝对路径)>
|
||||
flutter_stage() {
|
||||
_plat="$1"; _dest="$2"
|
||||
UI_SRC="$(_ui_src)"
|
||||
mkdir -p "$_dest"
|
||||
|
||||
case "$_plat" in
|
||||
windows)
|
||||
# Release/ 里含 GC-UI.exe、flutter_windows.dll 和 data/
|
||||
cp -R "$UI_SRC/build/windows/x64/runner/Release/." "$_dest/" || return 1
|
||||
;;
|
||||
macos)
|
||||
_app="$UI_SRC/build/macos/Build/Products/Release/GC-UI.app"
|
||||
[ -d "$_app" ] || { err "找不到 Flutter macOS 产物(GC-UI.app)"; return 1; }
|
||||
_trash "$_dest/GC-UI.app"
|
||||
cp -R "$_app" "$_dest/" || return 1
|
||||
;;
|
||||
linux)
|
||||
_bundle=""
|
||||
for _cand in "$UI_SRC/build/linux/arm64/release/bundle" \
|
||||
"$UI_SRC/build/linux/x64/release/bundle"; do
|
||||
[ -d "$_cand" ] && _bundle="$_cand" && break
|
||||
done
|
||||
[ -n "$_bundle" ] ||
|
||||
{ err "找不到 Flutter Linux bundle(期望 build/linux/{arm64,x64}/release/bundle)"; return 1; }
|
||||
# 目标包是 arm64 却只编出 x64:主机架构不对,宁可失败也不出坏包
|
||||
case "$_bundle" in
|
||||
*/arm64/*) ;;
|
||||
*) [ "$(uname -m)" = aarch64 ] || [ "$(uname -m)" = arm64 ] ||
|
||||
{ err "Linux 包目标 arm64,但当前主机 $(uname -m) 只能编出 x64 前端"; return 1; } ;;
|
||||
esac
|
||||
cp -R "$_bundle/." "$_dest/" || return 1
|
||||
;;
|
||||
*)
|
||||
err "不支持的 Flutter 目标平台:$_plat"; return 1
|
||||
;;
|
||||
esac
|
||||
detail "$(_rel "$_dest")(Flutter ${_plat})"
|
||||
}
|
||||
|
||||
# 兼容旧调用:编译 + 落位一起做。DEST 可为相对仓库根的路径。
|
||||
build_flutter_ui() {
|
||||
_plat="$1"; _dest="$2"
|
||||
case "$_dest" in
|
||||
/*) : ;;
|
||||
*) _dest="$GC_ROOT/$_dest" ;;
|
||||
esac
|
||||
flutter_build "$_plat" || return 1
|
||||
flutter_stage "$_plat" "$_dest"
|
||||
}
|
||||
|
||||
# 在 Linux / macOS 上交叉编译 Windows 前端:mingw-w64 编 C++ 外壳,
|
||||
# wine 跑 Windows 版 gen_snapshot 生成 AOT 快照。产物布局与官方 toolchain 一致。
|
||||
build_flutter_ui_cross() {
|
||||
_dest="$1"
|
||||
UI_SRC="$(_ui_src)"
|
||||
FLUTTER_BIN="${FLUTTER_BIN:-flutter}"
|
||||
[ -d "$UI_SRC" ] || { err "找不到 Flutter 工程:GC-UI/frontend"; return 1; }
|
||||
|
||||
_log="$GC_ROOT/build/logs/flutter-win-cross.log"
|
||||
say "交叉编译 Windows 前端(mingw-w64 + wine)"
|
||||
# 交叉脚本只接受官方默认输出位置,先按官方 toolchain 编一份骨架(依赖它下载引擎产物)
|
||||
FLUTTER_BIN="$FLUTTER_BIN" \
|
||||
run_logged "$_log" "Windows 前端 " \
|
||||
bash "$GC_ROOT/buildsh/cross/build-ui-win-cross.sh" \
|
||||
"$UI_SRC/build/windows/x64/runner/Release" || return 1
|
||||
|
||||
mkdir -p "$_dest"
|
||||
cp -R "$UI_SRC/build/windows/x64/runner/Release/." "$_dest/" || return 1
|
||||
step_ok "Windows 前端(交叉编译)"
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
#!/bin/sh
|
||||
# buildsh/lib/log.sh —— 统一输出层
|
||||
#
|
||||
# 设计:默认只显示「步骤 / 结论」,细节进日志文件;需要细节时开 GC_VERBOSE=1。
|
||||
#
|
||||
# GC_VERBOSE=1 额外显示细节(日志尾部、跳过项、产物路径)
|
||||
# GC_QUIET=1 只显示警告与错误(后台任务用,避免打乱进度条)
|
||||
# NO_COLOR=1 关闭颜色(写在前面:重定向到文件时自动关闭)
|
||||
#
|
||||
# 提供:
|
||||
# say <文本> 主步骤 ==> 文本
|
||||
# step_ok <文本> 步骤完成 ✓ 文本
|
||||
# note <文本> 一般信息(缩进)
|
||||
# detail <文本> 细节(仅 GC_VERBOSE)
|
||||
# warn / err <文本> 警告 / 错误(不受 GC_QUIET 影响)
|
||||
# run_logged <日志> <标签> <命令...>
|
||||
# 输出全部进日志;失败时回显尾部,成功时静默
|
||||
|
||||
GC_VERBOSE=${GC_VERBOSE:-0}
|
||||
GC_QUIET=${GC_QUIET:-0}
|
||||
GC_ROOT=${GC_ROOT:-}
|
||||
|
||||
if [ -t 1 ] && [ -z "${NO_COLOR:-}" ]; then
|
||||
_C_STEP=$(printf '\033[36m')
|
||||
_C_OK=$(printf '\033[32m')
|
||||
_C_WARN=$(printf '\033[33m')
|
||||
_C_ERR=$(printf '\033[31m')
|
||||
_C_DIM=$(printf '\033[2m')
|
||||
_C_OFF=$(printf '\033[0m')
|
||||
else
|
||||
_C_STEP=''; _C_OK=''; _C_WARN=''; _C_ERR=''; _C_DIM=''; _C_OFF=''
|
||||
fi
|
||||
|
||||
# 路径转相对(日志里少一长串前缀)
|
||||
_rel() {
|
||||
if [ -n "$GC_ROOT" ]; then printf '%s' "${1#"$GC_ROOT"/}"; else printf '%s' "$1"; fi
|
||||
}
|
||||
|
||||
say() { [ "$GC_QUIET" = 1 ] && return 0; printf '%s==>%s %s\n' "$_C_STEP" "$_C_OFF" "$*"; }
|
||||
step_ok() { [ "$GC_QUIET" = 1 ] && return 0; printf '%s ✓%s %s\n' "$_C_OK" "$_C_OFF" "$*"; }
|
||||
note() { [ "$GC_QUIET" = 1 ] && return 0; printf ' %s\n' "$*"; }
|
||||
detail() { [ "$GC_VERBOSE" = 1 ] && [ "$GC_QUIET" != 1 ] || return 0
|
||||
printf '%s %s%s\n' "$_C_DIM" "$*" "$_C_OFF"; }
|
||||
warn() { printf '%s !!%s %s\n' "$_C_WARN" "$_C_OFF" "$*" >&2; }
|
||||
err() { printf '%s xx%s %s\n' "$_C_ERR" "$_C_OFF" "$*" >&2; }
|
||||
|
||||
# 跑命令:输出全部写进日志文件。
|
||||
# - 成功:静默(GC_VERBOSE 时回显最后几行)
|
||||
# - 失败:回显日志尾部,让人不用翻文件也能看到原因
|
||||
run_logged() {
|
||||
_rl_log="$1"; _rl_label="$2"; shift 2
|
||||
mkdir -p "$(dirname "$_rl_log")" 2>/dev/null || true
|
||||
"$@" >"$_rl_log" 2>&1
|
||||
_rl_st=$?
|
||||
if [ "$_rl_st" -ne 0 ]; then
|
||||
err "${_rl_label}失败(日志:$(_rel "$_rl_log"))"
|
||||
if [ -s "$_rl_log" ]; then
|
||||
# 只挑有信息量的行:跳过空行;超长行(编译器把整条命令行打进日志)截断,
|
||||
# 否则一屏全是 3000 字符的 swiftc 参数,真正的原因反而被淹掉。
|
||||
grep -vE '^[[:space:]]*$' "$_rl_log" | tail -12 \
|
||||
| cut -c1-200 | sed 's/^/ /' >&2
|
||||
fi
|
||||
else
|
||||
detail "${_rl_label}完成($(_rel "$_rl_log"))"
|
||||
fi
|
||||
return "$_rl_st"
|
||||
}
|
||||
|
||||
# 人类可读大小。不用 du:某些环境(沙箱/迷你工具箱)的 du 会报块占用而非文件大小
|
||||
_hsize() {
|
||||
_hb=$(wc -c < "$1" 2>/dev/null | tr -d ' ')
|
||||
[ -n "$_hb" ] || _hb=0
|
||||
if [ "$_hb" -ge 1048576 ]; then printf '%dM' $((_hb / 1048576))
|
||||
elif [ "$_hb" -ge 1024 ]; then printf '%dK' $((_hb / 1024))
|
||||
else printf '%dB' "$_hb"; fi
|
||||
}
|
||||
|
||||
# 计时(秒):_t0=$(timer_start) ... timer_span "$_t0" -> 3m12s
|
||||
timer_start() { date +%s; }
|
||||
timer_span() {
|
||||
_ts=$(( $(date +%s) - $1 ))
|
||||
if [ "$_ts" -ge 60 ]; then printf '%dm%02ds' $((_ts / 60)) $((_ts % 60)); else printf '%ds' "$_ts"; fi
|
||||
}
|
||||
@@ -0,0 +1,258 @@
|
||||
#!/bin/sh
|
||||
# buildsh/lib/package.sh —— 组装 .app / 生成发布 zip
|
||||
#
|
||||
# 打包策略(相对旧实现的收益):
|
||||
# 旧:publish 到 dist/<平台> → cp -R 整个目录到暂存区 → zip → rm -rf 两处
|
||||
# 每个平台白白多搬一份 200MB,还要删两次上万文件。
|
||||
# 新:publish 到 build/stage/<平台> → 就地改名/裁剪 → 直接从 stage 压缩
|
||||
# → 目录挪进 trash。零冗余复制,删除也不再是批量递归删。
|
||||
|
||||
# 剔除与目标平台无关 / 只在调试时才加载的组件。
|
||||
# Windows 用 Kestrel 自托管,不经 IIS/HttpSys;Avalonia 在 Windows 上只走 Win32 后端;
|
||||
# DAC/DBI/DiaSymReader 只在调试器与读 PDB 时需要,而发布包 DebugType=none、不带 PDB。
|
||||
prune_package() {
|
||||
_dir="$1"; _plat="$2"
|
||||
[ -d "$_dir" ] || return 0
|
||||
rm -f "$_dir"/mscordaccore*.dll \
|
||||
"$_dir"/mscordbi.dll \
|
||||
"$_dir"/Microsoft.DiaSymReader.Native*.dll \
|
||||
"$_dir"/web.config \
|
||||
"$_dir"/aspnetcorev2_inprocess.dll \
|
||||
"$_dir"/Microsoft.AspNetCore.Server.IIS.dll \
|
||||
"$_dir"/Microsoft.AspNetCore.Server.IISIntegration.dll \
|
||||
"$_dir"/Microsoft.AspNetCore.Server.HttpSys.dll
|
||||
case "$_plat" in
|
||||
win)
|
||||
# ProjectReference 会把后端 exe 的 runtimeconfig 一起拷过来;后端已编入启动器
|
||||
rm -f "$_dir"/GC.UI.Server.exe "$_dir"/GC.UI.Server.dll \
|
||||
"$_dir"/GC.UI.Server.deps.json "$_dir"/GC.UI.Server.runtimeconfig.json
|
||||
rm -f "$_dir"/Avalonia.X11.dll "$_dir"/Avalonia.Native.dll \
|
||||
"$_dir"/Avalonia.FreeDesktop.dll "$_dir"/Tmds.DBus.Protocol.dll
|
||||
;;
|
||||
linux)
|
||||
rm -f "$_dir"/Avalonia.Win32.dll "$_dir"/Avalonia.Win32.Automation.dll
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# 发布目录只放程序本体:.GC 与 model 都由首次启动自行创建(AppPaths.EnsureCreated)
|
||||
prepare_runtime_layout() {
|
||||
_dir="$1"
|
||||
[ -d "$_dir" ] || return 0
|
||||
rm -rf "$_dir/model" "$_dir/examples" "$_dir/.GC"
|
||||
}
|
||||
|
||||
_zip_dir() { # <父目录> <目录名> <zip>
|
||||
if [ "$(uname -s)" = Darwin ] && command -v ditto >/dev/null 2>&1; then
|
||||
ditto -c -k --sequesterRsrc --keepParent "$1/$2" "$3" # 保留权限与符号链接
|
||||
else
|
||||
( cd "$1" && zip -qryX "$3" "$2" -x "*.DS_Store" )
|
||||
fi
|
||||
}
|
||||
|
||||
_zip_file() { # <文件> <zip>
|
||||
( cd "$(dirname "$1")" && zip -qX "$2" "$(basename "$1")" )
|
||||
}
|
||||
|
||||
# 组装 GC.app:把 stage 目录里的所有产物收进 Contents/MacOS(GC-UI.app 作为子应用嵌入)
|
||||
package_mac_app() {
|
||||
_dist="$1"
|
||||
_app="$_dist/GC.app"
|
||||
_trash "$_app"
|
||||
mkdir -p "$_app/Contents/MacOS" "$_app/Contents/Resources"
|
||||
|
||||
cat > "$_app/Contents/Info.plist" <<PLIST
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleName</key><string>GC</string>
|
||||
<key>CFBundleDisplayName</key><string>GC</string>
|
||||
<key>CFBundleIdentifier</key><string>com.xhmcl.GC</string>
|
||||
<key>CFBundleVersion</key><string>${VERSION}</string>
|
||||
<key>CFBundleShortVersionString</key><string>${VERSION}</string>
|
||||
<key>CFBundlePackageType</key><string>APPL</string>
|
||||
<key>CFBundleExecutable</key><string>GC</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key><string>6.0</string>
|
||||
<key>LSMinimumSystemVersion</key><string>11.0</string>
|
||||
<key>NSHighResolutionCapable</key><true/>
|
||||
<!-- 启动器只承担后端宿主,界面在 GC-UI.app:不出现在 Dock,避免出现两个图标 -->
|
||||
<key>LSUIElement</key><true/>
|
||||
</dict>
|
||||
</plist>
|
||||
PLIST
|
||||
|
||||
for _f in "$_dist"/*; do
|
||||
_base=$(basename "$_f")
|
||||
case "$_base" in GC.app|.DS_Store) continue ;; esac
|
||||
mv "$_f" "$_app/Contents/MacOS/"
|
||||
done
|
||||
|
||||
# 图标:从 icon-1024.png 生成 .icns。生成一次就缓存(原来每次构建都跑十几遍 sips)
|
||||
_icon="$GC_ROOT/GC/src/Assets/icon-1024.png"
|
||||
_icns="$GC_ROOT/build/cache/AppIcon.icns"
|
||||
if [ -f "$_icon" ] && command -v iconutil >/dev/null 2>&1; then
|
||||
if [ ! -f "$_icns" ] || [ "$_icon" -nt "$_icns" ]; then
|
||||
_set="$GC_ROOT/build/cache/AppIcon.iconset"
|
||||
rm -rf "$_set"; mkdir -p "$_set"
|
||||
for _sz in 16 32 64 128 256 512; do
|
||||
sips -z "$_sz" "$_sz" "$_icon" --out "$_set/icon_${_sz}x${_sz}.png" >/dev/null 2>&1
|
||||
_d=$((_sz * 2))
|
||||
sips -z "$_d" "$_d" "$_icon" --out "$_set/icon_${_sz}x${_sz}@2x.png" >/dev/null 2>&1
|
||||
done
|
||||
mkdir -p "$GC_ROOT/build/cache"
|
||||
iconutil -c icns "$_set" -o "$_icns" 2>/dev/null || true
|
||||
rm -rf "$_set"
|
||||
detail "生成 AppIcon.icns"
|
||||
else
|
||||
detail "复用缓存 AppIcon.icns"
|
||||
fi
|
||||
if [ -f "$_icns" ]; then
|
||||
cp "$_icns" "$_app/Contents/Resources/AppIcon.icns"
|
||||
/usr/libexec/PlistBuddy -c "Delete :CFBundleIconFile" "$_app/Contents/Info.plist" 2>/dev/null || true
|
||||
/usr/libexec/PlistBuddy -c "Add :CFBundleIconFile string AppIcon" "$_app/Contents/Info.plist" 2>/dev/null || true
|
||||
fi
|
||||
fi
|
||||
|
||||
# .GC 由首次启动创建;包里只保留 pack_launcher 后补的 .GC/bin
|
||||
rm -rf "$_app/Contents/MacOS/.GC"
|
||||
chmod +x "$_app/Contents/MacOS/GC" 2>/dev/null || true
|
||||
}
|
||||
|
||||
# 生成全部发布 zip。数据源是 build/stage/<平台>;
|
||||
# 若 stage 不存在则回落到 dist/<平台>(支持单独跑 ./build.sh pack-launcher)
|
||||
pack_launcher() {
|
||||
say "生成发布包"
|
||||
_pkgroot="$GC_ROOT/build/pkg"
|
||||
_trash "$_pkgroot"
|
||||
mkdir -p "$_pkgroot"
|
||||
|
||||
# ---------- Windows / Linux:整目录打包 ----------
|
||||
# 只打包本次构建的「非 mac」平台;mac 走下面的 .app 流程。
|
||||
# 单独跑 pack-launcher 时(没有 GC_PACK_LABELS)按全部标签处理。
|
||||
_labels=""
|
||||
for _l in ${GC_PACK_LABELS:-win-amd64 win-arm64 linux-arm64}; do
|
||||
case "$_l" in mac-*) continue ;; esac
|
||||
_labels="$_labels $_l"
|
||||
done
|
||||
for _label in $_labels; do
|
||||
_src="$GC_STAGE/$_label"
|
||||
_name="GCL-${VERSION}-${_label}"
|
||||
_pkg="$_pkgroot/$_name"
|
||||
|
||||
if [ -d "$_src" ]; then
|
||||
mv "$_src" "$_pkg" 2>/dev/null || cp -R "$_src" "$_pkg" # 同分区 rename,零拷贝
|
||||
elif [ -z "${GC_PACK_LABELS:-}" ] && [ -d "$GC_ROOT/dist/$_label" ]; then
|
||||
cp -R "$GC_ROOT/dist/$_label" "$_pkg" # 兼容旧布局
|
||||
else
|
||||
continue
|
||||
fi
|
||||
|
||||
rm -f "$_pkg"/*.zip "$_pkg"/.DS_Store 2>/dev/null || true
|
||||
case "$_label" in
|
||||
win-*) prune_package "$_pkg" win ;;
|
||||
linux-*) prune_package "$_pkg" linux ;;
|
||||
esac
|
||||
|
||||
# 启动器改名成包名;后端与前端是随包产物,不能当成启动器
|
||||
_exe="$_pkg/GC.exe"
|
||||
[ -f "$_exe" ] || _exe=$(ls "$_pkg"/*.exe 2>/dev/null | grep -v 'GC-SAVEDOG\|GC.UI.Server\|GC-UI' | head -1)
|
||||
if [ -n "$_exe" ] && [ -f "$_exe" ]; then
|
||||
mv "$_exe" "$_pkg/$_name.exe"
|
||||
chmod +x "$_pkg/$_name.exe" 2>/dev/null || true
|
||||
elif [ -f "$_pkg/GC" ]; then
|
||||
mv "$_pkg/GC" "$_pkg/$_name"
|
||||
chmod +x "$_pkg/$_name" 2>/dev/null || true
|
||||
else
|
||||
_trash "$_pkg"; continue
|
||||
fi
|
||||
|
||||
# 非本体文件统一收进 .GC/bin:安装目录根只留 GC 本体(首次启动复制到 .GC/safedog)
|
||||
for _osd in GC-SAVEDOG.exe GC-SAVEDOG; do
|
||||
if [ -f "$_pkg/$_osd" ]; then
|
||||
mkdir -p "$_pkg/.GC/bin"
|
||||
mv "$_pkg/$_osd" "$_pkg/.GC/bin/"
|
||||
fi
|
||||
done
|
||||
[ -f "$_pkg/GC-SAVEDOG.exe" ] || [ -f "$_pkg/.GC/bin/GC-SAVEDOG" ] || \
|
||||
[ -f "$_pkg/.GC/bin/GC-SAVEDOG.exe" ] || warn "$_label 缺少守护进程,该平台将退回旧脚本更新"
|
||||
[ -f "$_pkg/GC-UI.exe" ] || [ -f "$_pkg/GC-UI" ] || \
|
||||
note "$_label 包内没有 Flutter 前端,启动器将使用内置 Avalonia 界面"
|
||||
|
||||
_zip="$GC_ROOT/dist/$_label/$_name.zip"
|
||||
mkdir -p "$GC_ROOT/dist/$_label"
|
||||
# 旧布局会在 dist/<平台>/ 里留裸产物(GC、GC-SAVEDOG、GC-UI.app…),只保留 zip
|
||||
for _old in "$GC_ROOT/dist/$_label"/*; do
|
||||
[ -e "$_old" ] || continue
|
||||
case "$_old" in *.zip) continue ;; esac
|
||||
_trash "$_old"
|
||||
done
|
||||
rm -f "$_zip"
|
||||
case "$_label" in
|
||||
win-*) _zip_dir "$_pkgroot" "$_name" "$_zip" || return 1 ;;
|
||||
*) ( cd "$_pkgroot" && zip -qryX "$_zip" "$_name" ) || return 1 ;;
|
||||
esac
|
||||
[ -s "$_zip" ] || { err "$_label 压缩产物为空"; return 1; }
|
||||
_trash "$_pkg"
|
||||
step_ok "dist/$_label/$_name.zip($(_hsize "$_zip"))"
|
||||
done
|
||||
|
||||
# ---------- macOS:.app 目录 + ditto 压缩 ----------
|
||||
_want_mac=1
|
||||
if [ -n "${GC_PACK_LABELS:-}" ]; then
|
||||
_want_mac=0
|
||||
case " ${GC_PACK_LABELS} " in *" mac-arm64 "*) _want_mac=1 ;; esac
|
||||
fi
|
||||
_stage_mac="$GC_STAGE/mac-arm64"
|
||||
if [ "$_want_mac" = 1 ] && [ -d "$_stage_mac/GC.app" ]; then
|
||||
_name="GCL-${VERSION}-mac-arm64"
|
||||
_app="$_pkgroot/$_name.app"
|
||||
mv "$_stage_mac/GC.app" "$_app" 2>/dev/null || cp -R "$_stage_mac/GC.app" "$_app"
|
||||
|
||||
chmod +x "$_app/Contents/MacOS/GC" 2>/dev/null || true
|
||||
_plist="$_app/Contents/Info.plist"
|
||||
if [ -f "$_plist" ]; then
|
||||
/usr/libexec/PlistBuddy -c "Set :CFBundleName Morris GC" "$_plist" 2>/dev/null || true
|
||||
/usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName Morris GC" "$_plist" 2>/dev/null || true
|
||||
fi
|
||||
# 与 Windows 布局一致:守护进程收进 .GC/bin,首次启动复制到 .GC/safedog
|
||||
if [ -f "$_app/Contents/MacOS/GC-SAVEDOG" ]; then
|
||||
mkdir -p "$_app/Contents/MacOS/.GC/bin"
|
||||
mv "$_app/Contents/MacOS/GC-SAVEDOG" "$_app/Contents/MacOS/.GC/bin/"
|
||||
chmod +x "$_app/Contents/MacOS/.GC/bin/GC-SAVEDOG" 2>/dev/null || true
|
||||
fi
|
||||
xattr -cr "$_app" 2>/dev/null || true
|
||||
|
||||
_zip="$GC_ROOT/dist/mac-arm64/$_name.zip"
|
||||
mkdir -p "$GC_ROOT/dist/mac-arm64"
|
||||
for _old in "$GC_ROOT/dist/mac-arm64"/*; do
|
||||
[ -e "$_old" ] || continue
|
||||
case "$_old" in *.zip) continue ;; esac
|
||||
_trash "$_old"
|
||||
done
|
||||
rm -f "$_zip"
|
||||
_zip_dir "$_pkgroot" "$_name.app" "$_zip" || return 1
|
||||
[ -s "$_zip" ] || { err "压缩产物为空"; return 1; }
|
||||
_trash "$_app"
|
||||
step_ok "dist/mac-arm64/$_name.zip($(_hsize "$_zip"))"
|
||||
fi
|
||||
|
||||
# stage 里剩下的(UI 副本、已搬空的平台目录)一次性挪走
|
||||
for _left in "$GC_STAGE"/*; do
|
||||
[ -e "$_left" ] || continue
|
||||
_trash "$_left"
|
||||
done
|
||||
find "$GC_ROOT/dist" -name ".DS_Store" -delete >/dev/null 2>&1 || true
|
||||
|
||||
stamp_launcher_only
|
||||
}
|
||||
|
||||
# 把 model/ 里的模型数据单独打包(与启动器分开分发)
|
||||
pack_models() {
|
||||
_zip="$GC_ROOT/dist/models-$VERSION.zip"
|
||||
mkdir -p "$GC_ROOT/dist"
|
||||
rm -f "$_zip"
|
||||
say "打包模型数据"
|
||||
( cd "$GC_ROOT" && zip -qrX "$_zip" model -x "*.DS_Store" "*/bin/*" "*/obj/*" "*.user" ) || return 1
|
||||
step_ok "dist/models-$VERSION.zip($(_hsize "$_zip"))"
|
||||
}
|
||||
+61
-53
@@ -1,82 +1,80 @@
|
||||
#!/bin/sh
|
||||
# buildsh/lib/progress.sh —— apt 风格底部实时进度条
|
||||
# buildsh/lib/progress.sh —— 进度显示
|
||||
#
|
||||
# 底部一行:任务 当前任务进度 总进度 剩余时间
|
||||
# 编译MacOS 95% 30% 10s
|
||||
# 终端:底部单行实时进度条 [####....] 编译Mac 45% 30% 1m20s
|
||||
# 非终端(重定向 / CI / 日志):逐行打印步骤,不打 \r,不刷屏
|
||||
#
|
||||
# 用法:
|
||||
# progress_init <总步骤数> <每步权重...>
|
||||
# progress_step <步骤名> # 开始某步骤
|
||||
# progress_tick <0-100> # 更新当前步骤完成度
|
||||
# progress_done # 结束
|
||||
# progress_init <总权重> <每步权重...>
|
||||
# progress_step <步骤名>
|
||||
# progress_tick <0-100> # 当前步骤完成度
|
||||
# progress_done
|
||||
#
|
||||
# GC_NO_PROGRESS=1 可强制关闭进度条(但保留步骤行)
|
||||
|
||||
PROGRESS_TOTAL=1
|
||||
PROGRESS_WEIGHTS=""
|
||||
PROGRESS_IDX=0
|
||||
PROGRESS_CUR=0
|
||||
PROGRESS_STARTED=0
|
||||
PROGRESS_LAST=0
|
||||
PROGRESS_HISTORY=""
|
||||
PROGRESS_TASK="准备"
|
||||
_P_OVERALL=0
|
||||
_P_ETA="--"
|
||||
|
||||
_now() { date +%s; }
|
||||
GC_PROGRESS_TTY=0
|
||||
if [ -t 1 ] && [ -z "${GC_NO_PROGRESS:-}" ] && [ "${GC_QUIET:-0}" != 1 ]; then
|
||||
GC_PROGRESS_TTY=1
|
||||
fi
|
||||
|
||||
# 加权总进度:前序步骤权重之和 + 当前步骤权重*完成度
|
||||
_progress_overall() {
|
||||
# 一次算出整体百分比 + 剩余时间(原来每帧要循环两遍、fork 三次 date)
|
||||
_progress_refresh() {
|
||||
_sum=0; _i=1
|
||||
for _w in $PROGRESS_WEIGHTS; do
|
||||
if [ "$_i" -lt "$PROGRESS_IDX" ]; then
|
||||
_sum=$((_sum + _w)) # 已完成的步骤:全额
|
||||
_sum=$((_sum + _w))
|
||||
elif [ "$_i" -eq "$PROGRESS_IDX" ]; then
|
||||
_sum=$((_sum + _w * PROGRESS_CUR / 100)) # 当前步骤:按完成度
|
||||
_sum=$((_sum + _w * PROGRESS_CUR / 100))
|
||||
fi
|
||||
_i=$((_i + 1))
|
||||
done
|
||||
_p=$((_sum * 100 / PROGRESS_TOTAL))
|
||||
[ "$_p" -gt 100 ] && _p=100
|
||||
echo "$_p"
|
||||
_P_OVERALL=$((_sum * 100 / PROGRESS_TOTAL))
|
||||
[ "$_P_OVERALL" -gt 100 ] && _P_OVERALL=100
|
||||
|
||||
_t=$(( $(date +%s) - PROGRESS_STARTED ))
|
||||
if [ "$_P_OVERALL" -le 3 ] || [ "$_t" -le 0 ]; then
|
||||
_sec=240 # 前期按经验值粗估 4 分钟
|
||||
else
|
||||
_sec=$(( _t * (100 - _P_OVERALL) / _P_OVERALL ))
|
||||
fi
|
||||
if [ "$_sec" -ge 60 ]; then
|
||||
_P_ETA="$((_sec / 60))m$((_sec % 60))s"
|
||||
else
|
||||
_P_ETA="${_sec}s"
|
||||
fi
|
||||
}
|
||||
|
||||
# 剩余时间:基于「已完成总进度 / 已用时间」线性外推
|
||||
_progress_eta() {
|
||||
_p=$(_progress_overall)
|
||||
_t=$(( $(_now) - PROGRESS_STARTED ))
|
||||
# 前期用「预估总时长」估算(按各步骤经验权重),后期用实测速率外推,更稳
|
||||
if [ "$_p" -le 3 ] || [ "$_t" -le 0 ]; then
|
||||
_eta=$(( PROGRESS_TOTAL * 8 / 100 )) # 粗估:每 1% 约 8 秒 -> 总约 800s? 见下
|
||||
_eta=$(( 240 )) # 默认预估 4 分钟
|
||||
else
|
||||
_eta=$(( _t * (100 - _p) / _p ))
|
||||
fi
|
||||
if [ "$_eta" -ge 60 ]; then echo "$(( _eta / 60 ))m$((_eta % 60))s"; else echo "${_eta}s"; fi
|
||||
_progress_bar() {
|
||||
_filled=$((_P_OVERALL * 20 / 100))
|
||||
_bar=""; _i=0
|
||||
while [ "$_i" -lt 20 ]; do
|
||||
if [ "$_i" -lt "$_filled" ]; then _bar="$_bar#"; else _bar="$_bar."; fi
|
||||
_i=$((_i + 1))
|
||||
done
|
||||
printf '%s' "$_bar"
|
||||
}
|
||||
|
||||
progress_draw() {
|
||||
_task="$PROGRESS_TASK"
|
||||
_cur=$PROGRESS_CUR
|
||||
_overall=$(_progress_overall)
|
||||
_eta=$(_progress_eta)
|
||||
|
||||
# 进度条(20 格)
|
||||
_filled=$((_overall * 20 / 100))
|
||||
_bar=""
|
||||
_i=0
|
||||
while [ "$_i" -lt 20 ]; do
|
||||
if [ "$_i" -lt "$_filled" ]; then _bar="${_bar}#"; else _bar="${_bar}."; fi
|
||||
_i=$((_i + 1))
|
||||
done
|
||||
|
||||
# 底部一行:任务 当前任务进度 总进度 剩余时间
|
||||
printf '\r\033[K[%s] %-14s %3d%% %3d%% %s' \
|
||||
"$_bar" "$_task" "$_cur" "$_overall" "$_eta"
|
||||
[ "$GC_PROGRESS_TTY" = 1 ] || return 0
|
||||
_progress_refresh
|
||||
printf '\r\033[K[%s] %-16s %3d%% %3d%% %s' \
|
||||
"$(_progress_bar)" "$PROGRESS_TASK" "$PROGRESS_CUR" "$_P_OVERALL" "$_P_ETA"
|
||||
}
|
||||
|
||||
progress_init() {
|
||||
PROGRESS_TOTAL=$1
|
||||
shift
|
||||
PROGRESS_TOTAL=$1; shift
|
||||
PROGRESS_WEIGHTS="$*"
|
||||
PROGRESS_IDX=0
|
||||
PROGRESS_CUR=0
|
||||
PROGRESS_STARTED=$(_now)
|
||||
PROGRESS_STARTED=$(date +%s)
|
||||
PROGRESS_TASK="准备"
|
||||
progress_draw
|
||||
}
|
||||
@@ -85,16 +83,26 @@ progress_step() {
|
||||
PROGRESS_TASK="$1"
|
||||
PROGRESS_CUR=0
|
||||
PROGRESS_IDX=$((PROGRESS_IDX + 1))
|
||||
progress_draw
|
||||
if [ "$GC_PROGRESS_TTY" = 1 ]; then
|
||||
progress_draw
|
||||
else
|
||||
# 非终端:一行一步,冒号后给个序号,日志里能看清阶段划分
|
||||
[ "${GC_QUIET:-0}" = 1 ] && return 0
|
||||
printf '==> [%d] %s\n' "$PROGRESS_IDX" "$1"
|
||||
fi
|
||||
}
|
||||
|
||||
progress_tick() {
|
||||
# 非终端不需要刷新,直接返回(省掉每秒几次无用计算)
|
||||
[ "$GC_PROGRESS_TTY" = 1 ] || return 0
|
||||
PROGRESS_CUR=$1
|
||||
progress_draw
|
||||
}
|
||||
|
||||
progress_done() {
|
||||
PROGRESS_CUR=100
|
||||
progress_tick 100
|
||||
printf '\n'
|
||||
if [ "$GC_PROGRESS_TTY" = 1 ]; then
|
||||
progress_draw
|
||||
printf '\n'
|
||||
fi
|
||||
}
|
||||
@@ -0,0 +1,148 @@
|
||||
#!/bin/sh
|
||||
# buildsh/lib/publish.sh —— 环境预检 / 工具程序集缓存 / dotnet 发布
|
||||
#
|
||||
# 两个关键设计:
|
||||
# 1. dt_tool:工具类程序(VersionStamp / PreviewGen / GC-SAVEDOG 签名)只 build 一次,
|
||||
# 之后直接 dotnet <dll> 运行。原来每次 dotnet run 都要走一遍 MSBuild 评估
|
||||
# (即便没有任何改动),一次构建里能省下好几秒和一屏还原输出。
|
||||
# 2. _trash:大目录一律"挪进 build/trash"而不是递归删除。几百个文件的 rm -rf
|
||||
# 既慢又不可逆,挪走更安全(下次构建开始时会整体移到 TMPDIR)。
|
||||
|
||||
# ---------------------------------------------------------------- 环境预检
|
||||
|
||||
need() { command -v "$1" >/dev/null 2>&1; }
|
||||
|
||||
# 一次性检查所有依赖,缺什么全部列出来立刻退出。
|
||||
# 目的:不要跑到第 5 步(交叉编译)才发现没装 cmake,白白浪费前面几分钟。
|
||||
preflight() {
|
||||
_miss=""
|
||||
_add() { _miss="$_miss
|
||||
- $1($2)"; }
|
||||
|
||||
need dotnet || _add dotnet "安装 .NET 8 SDK:https://dot.net"
|
||||
need zip || _add zip "Linux: apt install zip;macOS: 系统自带"
|
||||
|
||||
if [ "$BUILD_MAC" = 1 ] || [ "$BUILD_WIN" = 1 ]; then
|
||||
need "${FLUTTER_BIN:-flutter}" || _add flutter "设置 FLUTTER_BIN=<路径> 或加入 PATH"
|
||||
fi
|
||||
|
||||
# Windows 前端交叉编译(非 Windows 主机)
|
||||
if [ "$BUILD_WIN" = 1 ] && [ "$GC_HOST" != windows ]; then
|
||||
need cmake || _add cmake "Linux: apt install cmake;macOS: brew install cmake"
|
||||
need ninja || _add ninja "Linux: apt install ninja-build;macOS: brew install ninja"
|
||||
need unzip || _add unzip "Linux: apt install unzip"
|
||||
need curl || _add curl "Linux: apt install curl"
|
||||
need x86_64-w64-mingw32-windres \
|
||||
|| _add mingw-w64 "Linux: apt install g++-mingw-w64-x86-64-posix;macOS: brew install mingw-w64"
|
||||
need wine || need wine64 \
|
||||
|| _add wine "Linux: apt install wine;macOS: 见 buildsh/cross/build-ui-win-cross.sh 顶部说明"
|
||||
fi
|
||||
|
||||
if [ -n "$_miss" ]; then
|
||||
err "构建环境不完整,缺少:$_miss"
|
||||
note "装好后重试。只需要 macOS 版可用:./build.sh build --targets=mac"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------- 工具程序集
|
||||
|
||||
# 源码比产物新?用于决定是否重新构建工具
|
||||
_any_newer() {
|
||||
[ -n "$(find "$1" \( -name bin -o -name obj \) -prune -o \
|
||||
\( -name '*.cs' -o -name '*.csproj' -o -name '*.props' \) \
|
||||
-newer "$2" -print -quit 2>/dev/null)" ]
|
||||
}
|
||||
|
||||
# dt_tool <缓存名> <项目相对路径> <程序集名> [参数...]
|
||||
dt_tool() {
|
||||
_tn="$1"; _tp="$2"; _ta="$3"; shift 3
|
||||
_tout="$GC_ROOT/build/tools/$_tn"
|
||||
_tdll="$_tout/$_ta.dll"
|
||||
mkdir -p "$GC_ROOT/build/tools"
|
||||
|
||||
if [ ! -f "$_tdll" ] || _any_newer "$GC_ROOT/$(dirname "$_tp")" "$_tdll"; then
|
||||
detail "构建工具 $_tn"
|
||||
run_logged "$GC_ROOT/build/logs/tool-$_tn.log" "构建 $_tn" \
|
||||
dotnet build "$GC_ROOT/$_tp" -c Release -o "$_tout" --nologo -v:q || return 1
|
||||
fi
|
||||
dotnet "$_tdll" "$@"
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------- 目录清理
|
||||
|
||||
# 把目录挪进 build/trash(同分区 rename,几乎零成本),避免批量递归删除
|
||||
_trash() {
|
||||
[ -e "$1" ] || return 0
|
||||
_tr="$GC_ROOT/build/trash"
|
||||
mkdir -p "$_tr" 2>/dev/null || true
|
||||
mv "$1" "$_tr/$(basename "$1")-$(date +%s)-$$" 2>/dev/null || rm -rf "$1"
|
||||
return 0
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------- 发布
|
||||
|
||||
# publish_rid <RID> <标签>
|
||||
# 产物落 build/stage/<标签>/,后续打包直接就地改名 + 压缩,
|
||||
# 不再 dist → 暂存目录 的整份复制(原来每个平台白白多搬 200MB)。
|
||||
publish_rid() {
|
||||
_rid="$1"; _label="$2"
|
||||
_out="$GC_STAGE/$_label"
|
||||
|
||||
_trash "$_out"
|
||||
mkdir -p "$_out"
|
||||
|
||||
run_logged "$GC_ROOT/build/logs/publish-$_label.log" "$_rid 启动器 " \
|
||||
dotnet publish "$GC_ROOT/$APP_PROJ" \
|
||||
-c Release -r "$_rid" --self-contained true \
|
||||
-p:Version="$VERSION" -p:DebugType=none \
|
||||
-p:PublishSingleFile=true \
|
||||
-p:IncludeNativeLibrariesForSelfExtract=true \
|
||||
-p:EnableCompressionInSingleFile=true \
|
||||
-p:PublishTrimmed=false \
|
||||
--nologo -v:m -o "$_out" || return 1
|
||||
|
||||
# 守护进程:单独的发布目录,只把单文件本体取出来放进包
|
||||
# (同目录发布会把两套运行时文件混在一起,也没法并行)
|
||||
if [ -n "${SAVEDOG_PROJ:-}" ] && [ -f "$GC_ROOT/$SAVEDOG_PROJ" ]; then
|
||||
_sd="$GC_ROOT/build/tmp/savedog-$_label"
|
||||
_trash "$_sd"
|
||||
mkdir -p "$_sd"
|
||||
# 裁剪 + 压缩单文件:70MB -> 14MB。JSON 全走源生成(GC-SAVEDOG/SavedogJson.cs),
|
||||
# 新增类型忘注册只会在发布产物里炸,所以 update-test 会跑一次真实 apply 兜底。
|
||||
run_logged "$GC_ROOT/build/logs/publish-savedog-$_label.log" "$_rid 守护进程 " \
|
||||
dotnet publish "$GC_ROOT/$SAVEDOG_PROJ" \
|
||||
-c Release -r "$_rid" --self-contained true \
|
||||
-p:Version="$VERSION" -p:DebugType=none \
|
||||
-p:PublishSingleFile=true \
|
||||
-p:IncludeNativeLibrariesForSelfExtract=true \
|
||||
-p:EnableCompressionInSingleFile=true \
|
||||
-p:PublishTrimmed=true -p:TrimMode=full \
|
||||
-p:JsonSerializerIsReflectionEnabledByDefault=false \
|
||||
--nologo -v:m -o "$_sd" || return 1
|
||||
for _f in "$_sd/GC-SAVEDOG" "$_sd/GC-SAVEDOG.exe"; do
|
||||
[ -f "$_f" ] && cp "$_f" "$_out/"
|
||||
done
|
||||
_trash "$_sd"
|
||||
fi
|
||||
|
||||
rm -rf "$_out/model" "$_out/examples"
|
||||
step_ok "$_rid"
|
||||
}
|
||||
|
||||
# _run_phase <预估秒数> <函数> [参数...]
|
||||
# 在后台跑一个阶段,前台每秒刷新进度条;阶段退出码如实返回。
|
||||
_run_phase() {
|
||||
_rp_est="$1"; shift
|
||||
( "$@" ) &
|
||||
_rp_pid=$!
|
||||
_rp_t0=$(date +%s)
|
||||
while kill -0 "$_rp_pid" 2>/dev/null; do
|
||||
_rp_p=$(( ($(date +%s) - _rp_t0) * 100 / _rp_est ))
|
||||
[ "$_rp_p" -gt 96 ] && _rp_p=96
|
||||
progress_tick "$_rp_p"
|
||||
sleep 1
|
||||
done
|
||||
wait "$_rp_pid" || return 1
|
||||
progress_tick 100
|
||||
}
|
||||
+9
-14
@@ -10,33 +10,28 @@
|
||||
|
||||
bs_verify_release() {
|
||||
ROOT_DIR="$1"; shift
|
||||
GC_ROOT="${GC_ROOT:-$ROOT_DIR}"; export GC_ROOT
|
||||
TAG="${1:-$VERSION}"
|
||||
if [ "$#" -gt 0 ]; then shift; fi
|
||||
|
||||
WORK="$ROOT_DIR/build/release-verify"
|
||||
mkdir -p "$WORK"
|
||||
|
||||
echo "==> 核对 Release ${TAG}"
|
||||
rc=0
|
||||
say "核对 Release ${TAG}"
|
||||
_rc=0
|
||||
python3 "$ROOT_DIR/buildsh/lib/verify_release.py" \
|
||||
--tag "$TAG" \
|
||||
--manifest "$ROOT_DIR/version.json" \
|
||||
--dump-manifest "$WORK/$TAG.json" \
|
||||
"$@" || rc=$?
|
||||
|
||||
if [ "$rc" -ne 0 ]; then
|
||||
return "$rc"
|
||||
fi
|
||||
"$@" || _rc=$?
|
||||
[ "$_rc" -eq 0 ] || return "$_rc"
|
||||
|
||||
# 资产对得上还不够:清单本身必须是我签的,否则客户端一样会拒
|
||||
echo ""
|
||||
echo "==> 校验 tag 清单签名"
|
||||
if dotnet run --project "$ROOT_DIR/GC-SAVEDOG/GC-SAVEDOG.csproj" -c Release -- \
|
||||
verify --manifest "$WORK/$TAG.json"; then
|
||||
echo "结论: 签名可信,可以发布 / 已经发布正确"
|
||||
say "校验 tag 清单签名"
|
||||
if dt_tool savedog "$SAVEDOG_PROJ" GC-SAVEDOG verify --manifest "$WORK/$TAG.json"; then
|
||||
step_ok "签名可信,可以发布 / 已经发布正确"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo "!! 签名校验未通过,客户端会拒绝这次更新"
|
||||
err "签名校验未通过,客户端会拒绝这次更新"
|
||||
return 1
|
||||
}
|
||||
+23
-12
@@ -1,8 +1,11 @@
|
||||
#!/bin/sh
|
||||
# buildsh/tools.sh —— 实用工具:模型、版本戳、清理、运行、医生、打开目录
|
||||
# buildsh/tools.sh —— 实用工具:模型、版本戳、打包、清理、运行、医生
|
||||
|
||||
bs_tools() {
|
||||
ROOT_DIR="$1"; TASK="$2"
|
||||
ROOT_DIR="$1"; TASK="${2:-}"
|
||||
GC_ROOT="${GC_ROOT:-$ROOT_DIR}"; export GC_ROOT
|
||||
GC_STAGE="${GC_STAGE:-$ROOT_DIR/build/stage}"; export GC_STAGE
|
||||
|
||||
case "$TASK" in
|
||||
models)
|
||||
build_models ;;
|
||||
@@ -11,23 +14,31 @@ bs_tools() {
|
||||
pack-models)
|
||||
build_models; pack_models ;;
|
||||
pack-launcher)
|
||||
# 单独打包:数据源优先 build/stage,缺失时回落到 dist
|
||||
mkdir -p "$GC_ROOT/build/logs"
|
||||
pack_launcher ;;
|
||||
run)
|
||||
dotnet run --project "$APP_PROJ" -c Debug ;;
|
||||
test)
|
||||
dotnet run --project "$TEST_PROJ" -c Debug -- "$ROOT_DIR/build/screenshots" ;;
|
||||
update-test)
|
||||
dotnet run --project "$TEST_PROJ" -c Debug -- --update-test "$ROOT_DIR" ;;
|
||||
clean)
|
||||
rm -rf "$ROOT_DIR/build" "$ROOT_DIR/dist"
|
||||
find "$ROOT_DIR/src" -type d \( -name bin -o -name obj \) -prune -exec rm -rf {} + 2>/dev/null || true
|
||||
echo "==> 已清理" ;;
|
||||
say "清理构建产物"
|
||||
_trash "$ROOT_DIR/build"
|
||||
_trash "$ROOT_DIR/dist"
|
||||
find "$ROOT_DIR/src" -type d \( -name bin -o -name obj \) -prune -exec rm -rf {} + >/dev/null 2>&1 || true
|
||||
step_ok "已清理" ;;
|
||||
doctor)
|
||||
dotnet --info | head -20 ;;
|
||||
dist)
|
||||
echo "==> dist 产物:"
|
||||
ls -lh "$ROOT_DIR"/dist/*/GCL-*.zip 2>/dev/null || ls -lh "$ROOT_DIR"/dist 2>/dev/null || true ;;
|
||||
say "dist 产物"
|
||||
_found=0
|
||||
for _z in "$ROOT_DIR"/dist/*/*.zip; do
|
||||
[ -f "$_z" ] || continue
|
||||
_found=1
|
||||
printf ' %6s %s\n' "$(_hsize "$_z")" "$(_rel "$_z")"
|
||||
done
|
||||
[ "$_found" = 1 ] || note "(暂无产物)" ;;
|
||||
*)
|
||||
echo "未知工具: $TASK"; return 1 ;;
|
||||
err "未知工具:${TASK:-(空)}"
|
||||
note "可用:models / stamp / pack-models / pack-launcher / run / clean / doctor / dist"
|
||||
return 1 ;;
|
||||
esac
|
||||
}
|
||||
Reference in new issue
Block a user