y
This commit is contained in:
commit
1ee49b8966
1125 files changed
+32542
No files matched your search
@@ -0,0 +1,57 @@
|
||||
#!/bin/sh
|
||||
# buildsh/build.sh —— 完整发布(原 publish)
|
||||
# 步骤及权重按实测耗时设定,供进度条估算总进度与剩余时间:
|
||||
# 清理(2) 版本(3) Mac(35) WinX64(25) WinArm(25) 骨架(3) 打包(5) 收尾(2) = 100
|
||||
|
||||
bs_build() {
|
||||
ROOT_DIR="$1"
|
||||
: "${APP_PROJ:?}" "${SLN:?}" "${VERSION:?}"
|
||||
|
||||
progress_init 100 2 3 35 25 25 3 5 2
|
||||
|
||||
progress_step "清理旧产物"; progress_tick 100
|
||||
rm -rf "$ROOT_DIR/dist"; mkdir -p "$ROOT_DIR/dist"
|
||||
|
||||
progress_step "版本戳"; progress_tick 100
|
||||
stamp_versions
|
||||
|
||||
# 每个 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
|
||||
}
|
||||
|
||||
progress_step "编译 Mac"
|
||||
_run_publish mac 90 publish_rid "osx-arm64" "dist/mac-arm64" false || return 1
|
||||
|
||||
progress_step "编译 Win-x64"
|
||||
_run_publish winx64 70 publish_rid "win-x64" "dist/win-x64" true || return 1
|
||||
|
||||
progress_step "编译 Win-arm64"
|
||||
_run_publish winarm 70 publish_rid "win-arm64" "dist/win-arm64" true || return 1
|
||||
|
||||
progress_step "运行骨架"; progress_tick 100
|
||||
package_mac_app
|
||||
prepare_runtime_layout "dist/win-x64"
|
||||
prepare_runtime_layout "dist/win-arm64"
|
||||
prepare_runtime_layout "dist/mac-arm64/EarthModelStudio.app/Contents/MacOS"
|
||||
|
||||
progress_step "打包 zip"; progress_tick 100
|
||||
pack_launcher
|
||||
|
||||
progress_step "收尾"; progress_tick 100
|
||||
progress_done
|
||||
echo "==> 完成,产物:"
|
||||
ls -lh "$ROOT_DIR"/dist/GC-"$VERSION"-*.zip 2>/dev/null || true
|
||||
}
|
||||
@@ -0,0 +1,227 @@
|
||||
#!/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
|
||||
|
||||
stamp_versions() {
|
||||
echo "==> 自动计算模型版本并生成 version.json"
|
||||
dotnet run --project "$STAMP_PROJ" -c Release -- "$ROOT_DIR" "$VERSION"
|
||||
}
|
||||
|
||||
# 编译模型自己的功能程序集,并把 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" = "EarthModelStudio.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 运行骨架,绝不放模型
|
||||
prepare_runtime_layout() {
|
||||
REL="$1"
|
||||
DEST="$ROOT_DIR/$REL"
|
||||
[ -d "$DEST" ] || return 0
|
||||
rm -rf "$DEST/model" "$DEST/examples"
|
||||
mkdir -p "$DEST/.GC/model" "$DEST/.GC/cache" "$DEST/.GC/update"
|
||||
cat > "$DEST/.GC/model/README.txt" <<'TXT'
|
||||
模型库目录(.GC/model/)
|
||||
启动时程序会读取 gitcode 仓库的 version.json,把最新版模型下载到这里。
|
||||
离线使用也可以手动放入 <模型id>/<模型id>.json + <模型id>/<模型id>.model/。
|
||||
|
||||
运行目录:
|
||||
<可执行文件>
|
||||
.GC/settings.json
|
||||
.GC/model/ 本目录(下载的模型)
|
||||
.GC/cache/ 下载暂存
|
||||
.GC/update/ 待下次启动应用的启动器更新
|
||||
TXT
|
||||
if [ ! -f "$DEST/.GC/settings.json" ]; then
|
||||
cat > "$DEST/.GC/settings.json" <<'JSON'
|
||||
{
|
||||
"language": "auto",
|
||||
"theme": "light",
|
||||
"renderFps": 30,
|
||||
"memoryMb": 2048,
|
||||
"autoUpdateOnStartup": true,
|
||||
"updateRepository": "https://gitcode.com/2509_92447106/GC",
|
||||
"updateManifestUrl": "",
|
||||
"updateLocalRoot": "",
|
||||
"installedModelVersions": {},
|
||||
"launcherVersion": "",
|
||||
"pendingLauncherVersion": "",
|
||||
"lastUpdateCheck": "",
|
||||
"sources": [],
|
||||
"recentModels": []
|
||||
}
|
||||
JSON
|
||||
fi
|
||||
echo " 运行目录 -> $REL/.GC (settings.json + model/ + cache/ + update/)"
|
||||
}
|
||||
|
||||
# $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:PublishTrimmed=false \
|
||||
-o "$ROOT_DIR/$OUT"
|
||||
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 -qr "$ZIP" model \
|
||||
-x "*.DS_Store" "*/bin/*" "*/obj/*" "*.user" )
|
||||
du -sh "$ZIP"
|
||||
}
|
||||
|
||||
# 启动器更新包:只包含程序文件,排除 .GC(否则会覆盖用户已下载的模型与设置)
|
||||
# 产物命名:GC-<版本>-<系统>-<架构>.exe / GC-<版本>-<系统>-<架构>.app.zip
|
||||
# Windows: 单文件 exe 直接改名(本身就是可执行产物)
|
||||
# macOS: .app 必须打成 zip 才能作为单文件分发;文件名用 .app.zip,
|
||||
# 这样 macOS 双击会用归档工具解压出可运行的 .app。
|
||||
# 若直接命名 .app,系统会把 zip 当成应用包解析 => 报「已损坏/打不开」。
|
||||
pack_launcher() {
|
||||
echo "==> 生成启动器产物(GC-<版本>-<系统>-<架构>)"
|
||||
|
||||
# --- Windows:exe 单文件 ---
|
||||
for pair in "win-x64:win-amd64" "win-arm64:win-arm64"; do
|
||||
RID="${pair%%:*}"; LABEL="${pair##*:}"
|
||||
SRC="$ROOT_DIR/dist/$RID"
|
||||
[ -d "$SRC" ] || continue
|
||||
EXE=$(ls "$SRC"/*.exe 2>/dev/null | head -1)
|
||||
[ -n "$EXE" ] || continue
|
||||
DEST="$ROOT_DIR/dist/GC-${VERSION}-${LABEL}.exe"
|
||||
cp "$EXE" "$DEST"
|
||||
chmod +x "$DEST"
|
||||
echo " -> $(basename "$DEST")"
|
||||
done
|
||||
|
||||
# --- macOS:先得到真实 .app 目录(改名 + 同步 Info.plist)---
|
||||
MACAPP="$ROOT_DIR/dist/mac-arm64/EarthModelStudio.app"
|
||||
if [ -d "$MACAPP" ]; then
|
||||
FINAL="$ROOT_DIR/dist/GC-${VERSION}-mac-arm64.app"
|
||||
rm -rf "$FINAL"
|
||||
mv "$MACAPP" "$FINAL"
|
||||
chmod +x "$FINAL/Contents/MacOS/EarthModelStudio" 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
|
||||
xattr -cr "$FINAL" 2>/dev/null || true
|
||||
echo " -> $(basename "$FINAL")/"
|
||||
fi
|
||||
|
||||
# --- 统一压缩:每个产物都打成同名 .zip ---
|
||||
# GC-1.0.3-win-amd64.exe -> GC-1.0.3-win-amd64.zip
|
||||
# GC-1.0.3-win-arm64.exe -> GC-1.0.3-win-arm64.zip
|
||||
# GC-1.0.3-mac-arm64.app -> GC-1.0.3-mac-arm64.zip
|
||||
# 客户端下载时按「原名去掉扩展名 + .zip」取包,再解压回原名。
|
||||
echo "==> 压缩为 zip"
|
||||
for art in "$ROOT_DIR"/dist/GC-"$VERSION"-*.exe "$ROOT_DIR"/dist/GC-"$VERSION"-*.app; do
|
||||
[ -e "$art" ] || continue
|
||||
base=$(basename "$art")
|
||||
name="${base%.*}" # 去掉 .exe / .app
|
||||
ZIP="$ROOT_DIR/dist/${name}.zip"
|
||||
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 -qry "$ZIP" "$base" -x "*.DS_Store" )
|
||||
fi
|
||||
else
|
||||
( cd "$(dirname "$art")" && zip -q "$ZIP" "$base" )
|
||||
fi
|
||||
echo " -> ${name}.zip"
|
||||
done
|
||||
|
||||
# 原始产物(.exe / .app 目录)不再保留:只发布 zip
|
||||
rm -f "$ROOT_DIR"/dist/GC-"$VERSION"-*.exe
|
||||
rm -rf "$ROOT_DIR"/dist/GC-"$VERSION"-*.app
|
||||
|
||||
strip_intermediate_dirs
|
||||
stamp_versions
|
||||
echo ""
|
||||
echo "==> dist 只保留可发布的 zip:"
|
||||
ls -lh "$ROOT_DIR"/dist/GC-"$VERSION"-*.zip 2>/dev/null || true
|
||||
}
|
||||
|
||||
# 删除 publish 过程中的中间目录,dist 里只留最终附件
|
||||
strip_intermediate_dirs() {
|
||||
for d in win-x64 win-arm64 mac-arm64; do
|
||||
[ -d "$ROOT_DIR/dist/$d" ] && rm -rf "$ROOT_DIR/dist/$d"
|
||||
done
|
||||
find "$ROOT_DIR/dist" -name ".DS_Store" -delete 2>/dev/null || true
|
||||
}
|
||||
|
||||
package_mac_app() {
|
||||
DIST="$ROOT_DIR/dist/mac-arm64"
|
||||
APP="$DIST/EarthModelStudio.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>Earth Model Studio</string>
|
||||
<key>CFBundleDisplayName</key><string>Earth Model Studio</string>
|
||||
<key>CFBundleIdentifier</key><string>cn.neorf.earthmodelstudio</string>
|
||||
<key>CFBundleVersion</key><string>${VERSION}</string>
|
||||
<key>CFBundleShortVersionString</key><string>${VERSION}</string>
|
||||
<key>CFBundlePackageType</key><string>APPL</string>
|
||||
<key>CFBundleExecutable</key><string>EarthModelStudio</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" = "EarthModelStudio.app" ] && continue
|
||||
[ "$base" = ".DS_Store" ] && continue
|
||||
mv "$f" "$APP/Contents/MacOS/"
|
||||
done
|
||||
# 发布包不带 .GC 运行骨架(用户首次启动自行创建),避免覆盖用户数据
|
||||
rm -rf "$APP/Contents/MacOS/.GC"
|
||||
chmod +x "$APP/Contents/MacOS/EarthModelStudio"
|
||||
echo "==> 已打包 $APP"
|
||||
}
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
#!/bin/sh
|
||||
# buildsh/lib/progress.sh —— apt 风格底部实时进度条
|
||||
#
|
||||
# 底部一行:任务 当前任务进度 总进度 剩余时间
|
||||
# 编译MacOS 95% 30% 10s
|
||||
#
|
||||
# 用法:
|
||||
# progress_init <总步骤数> <每步权重...>
|
||||
# progress_step <步骤名> # 开始某步骤
|
||||
# progress_tick <0-100> # 更新当前步骤完成度
|
||||
# progress_done # 结束
|
||||
|
||||
PROGRESS_TOTAL=1
|
||||
PROGRESS_WEIGHTS=""
|
||||
PROGRESS_IDX=0
|
||||
PROGRESS_CUR=0
|
||||
PROGRESS_STARTED=0
|
||||
PROGRESS_LAST=0
|
||||
PROGRESS_HISTORY=""
|
||||
|
||||
_now() { date +%s; }
|
||||
|
||||
# 加权总进度:前序步骤权重之和 + 当前步骤权重*完成度
|
||||
_progress_overall() {
|
||||
_sum=0; _i=0
|
||||
for _w in $PROGRESS_WEIGHTS; do
|
||||
if [ "$_i" -lt "$PROGRESS_IDX" ]; then _sum=$((_sum + _w)); fi
|
||||
_i=$((_i + 1))
|
||||
done
|
||||
_cw=$(echo "$PROGRESS_WEIGHTS" | awk -v i="$((PROGRESS_IDX+1))" '{print $i}')
|
||||
[ -z "$_cw" ] && _cw=1
|
||||
_sum=$((_sum + _cw * PROGRESS_CUR / 100))
|
||||
echo $((_sum * 100 / PROGRESS_TOTAL))
|
||||
}
|
||||
|
||||
# 剩余时间:基于「已完成总进度 / 已用时间」线性外推
|
||||
_progress_eta() {
|
||||
_p=$(_progress_overall)
|
||||
[ "$_p" -le 0 ] && { echo "--"; return; }
|
||||
_t=$(( $(_now) - PROGRESS_STARTED ))
|
||||
[ "$_t" -le 0 ] && { echo "--"; return; }
|
||||
_eta=$(( _t * (100 - _p) / _p ))
|
||||
if [ "$_eta" -ge 60 ]; then echo "$(( _eta / 60 ))m$((_eta % 60))s"; else echo "${_eta}s"; fi
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
# \r 回到行首,用 \033[K 清到行尾;底部固定一行
|
||||
printf '\r\033[K[%s] %-16s %3d%% 总 %3d%% %s' \
|
||||
"$_bar" "$_task" "$_cur" "$_overall" "$_eta"
|
||||
}
|
||||
|
||||
progress_init() {
|
||||
PROGRESS_TOTAL=$1
|
||||
shift
|
||||
PROGRESS_WEIGHTS="$*"
|
||||
PROGRESS_IDX=0
|
||||
PROGRESS_CUR=0
|
||||
PROGRESS_STARTED=$(_now)
|
||||
PROGRESS_TASK="准备"
|
||||
progress_draw
|
||||
}
|
||||
|
||||
progress_step() {
|
||||
PROGRESS_TASK="$1"
|
||||
PROGRESS_CUR=0
|
||||
PROGRESS_IDX=$((PROGRESS_IDX + 1))
|
||||
progress_draw
|
||||
}
|
||||
|
||||
progress_tick() {
|
||||
PROGRESS_CUR=$1
|
||||
progress_draw
|
||||
}
|
||||
|
||||
progress_done() {
|
||||
PROGRESS_CUR=100
|
||||
progress_tick 100
|
||||
printf '\n'
|
||||
}
|
||||
Reference in new issue
Block a user