From 5e0b46b3f3cd9800af177571c7809a7cdc8e9249 Mon Sep 17 00:00:00 2001
From: 2509_92447106 <2509_92447106@noreply.gitcode.com>
Date: Sun, 8 Nov 2026 17:36:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E7=B3=BB=E7=BB=9F=E9=87=8D?=
=?UTF-8?q?=E6=9E=84:=20buildsh=20=E6=A8=A1=E5=9D=97=E5=8C=96=20+=20apt=20?=
=?UTF-8?q?=E9=A3=8E=E6=A0=BC=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
build.ps1 | 237 +++++-----------------------
build.sh | 331 +++-------------------------------------
buildsh/lib/progress.sh | 29 ++--
3 files changed, 84 insertions(+), 513 deletions(-)
diff --git a/build.ps1 b/build.ps1
index 5c9eef3..4645ed4 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,228 +1,75 @@
# ---------------------------------------------------------------------------
-# Earth Model Studio 构建脚本(Windows PowerShell)
-#
-# .\build.ps1 编译
-# .\build.ps1 run 运行
-# .\build.ps1 test 离屏渲染校验
-# .\build.ps1 models 编译模型 dll + 生成封面 + 自动打版本
-# .\build.ps1 stamp 只重新生成 version.json 与模型版本
-# .\build.ps1 publish 编译三个平台启动器(不内置模型)+ 建立 .GC 运行目录
-# .\build.ps1 pack-models 单独打包模型数据(含 version.json)
-# .\build.ps1 pack-launcher 生成三个平台的启动器更新包 zip
-# .\build.ps1 update-test 离线验证自动更新链路
-# .\build.ps1 clean 清理
-#
-# 分层:src\ 只是启动器;模型全部在 model\;**发布包不内置模型**。
-#
-# 运行目录(发布包里就长这样):
-# <安装目录>\
-# EarthModelStudio.exe
-# .GC\settings.json
-# .GC\model\ 启动时从 gitcode 下载的模型
-# .GC\cache\ 下载暂存
-# .GC\update\ 待下次启动应用的启动器更新
+# Earth Model Studio 构建入口(Windows PowerShell,薄封装)
+# 实际代码在 buildsh/ 里。Windows 上若无 sh,则走内置的最小实现。
+# .\build.ps1 build | check | models | stamp | run | test | clean | doctor
# ---------------------------------------------------------------------------
param(
[Parameter(Position = 0)]
- [ValidateSet('build', 'run', 'test', 'publish', 'models', 'stamp', 'pack-models',
- 'pack-launcher', 'update-test', 'bundle', 'clean', 'doctor')]
+ [ValidateSet('build','check','models','stamp','pack-models','pack-launcher',
+ 'run','test','update-test','clean','doctor','dist')]
[string]$Task = 'build'
)
$ErrorActionPreference = 'Stop'
$Root = $PSScriptRoot
Set-Location $Root
-
-# Avalonia 遥测任务在只读用户目录/CI/沙箱会因写日志失败而中断编译(MSB4018)。
-# 官方 opt-out;Directory.Build.targets 里还有一层项目内的兜底。
$env:AVALONIA_TELEMETRY_OPTOUT = '1'
-$AppProj = 'src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj'
+$AppProj = 'src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj'
$TestProj = 'src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.csproj'
-$PreviewProj = 'model/_engine/PreviewGen/PreviewGen.csproj'
-$StampProj = 'model/_engine/VersionStamp/VersionStamp.csproj'
-$Sln = 'EarthModelStudio.sln'
-$Version = '1.0.3'
+$StampProj= 'model/_engine/VersionStamp/VersionStamp.csproj'
+$Sln = 'EarthModelStudio.sln'
+$Version = ([regex]::Match((Get-Content Directory.Build.props -Raw), '(.*?)')).Groups[1].Value
+if (-not $Version) { $Version = '1.0.0' }
+New-Item -ItemType Directory -Force -Path "$Root/build/logs" | Out-Null
-function Stamp-Versions {
- Write-Host '==> 自动计算模型版本并生成 version.json'
- dotnet run --project $StampProj -c Release -- $Root $Version
+# 优先复用 buildsh 的 shell 实现(Git Bash / WSL / sh 可用时)
+$sh = Get-Command sh -ErrorAction SilentlyContinue
+if ($sh) {
+ & $sh.Source "$Root/build.sh" $Task
+ exit $LASTEXITCODE
}
+function Stamp { dotnet run --project $StampProj -c Release -- $Root $Version }
function Build-Models {
- Write-Host '==> 编译模型功能程序集(源码就在各模型目录的 src\ 里)'
Get-ChildItem "$Root/model" -Directory | ForEach-Object {
$id = $_.Name
$src = Join-Path $_.FullName 'src'
if (-not (Test-Path $src)) { return }
$proj = Get-ChildItem $src -Filter *.csproj | Select-Object -First 1
- if ($null -eq $proj) { return }
+ if (-not $proj) { return }
dotnet build $proj.FullName -c Release
- $data = Join-Path $_.FullName "$id.model"
- if (Test-Path $data) {
- Get-ChildItem (Join-Path $src 'bin/Release/net8.0') -Filter *.dll | ForEach-Object {
- if ($_.Name -eq 'EarthModelStudio.ModelSdk.dll') { return }
- Copy-Item -Force $_.FullName $data
- Write-Host " -> model/$id/$id.model/$($_.Name)"
- }
- }
}
- Write-Host '==> 用模型自己的渲染器生成封面'
- dotnet run --project $PreviewProj -c Release -- $Root
- Stamp-Versions
-}
-
-# 发布目录只放启动器 + 空的 .GC 运行骨架,绝不放模型
-function Prepare-RuntimeLayout([string]$RelDir) {
- $dest = "$Root/$RelDir"
- if (-not (Test-Path $dest)) { return }
- foreach ($old in @("$dest/model", "$dest/examples")) {
- if (Test-Path $old) { Remove-Item -Recurse -Force $old }
- }
- foreach ($dir in @("$dest/.GC/model", "$dest/.GC/cache", "$dest/.GC/update")) {
- New-Item -ItemType Directory -Force -Path $dir | Out-Null
- }
- $readme = @'
-模型库目录(.GC/model/)
-启动时程序会读取 gitcode 仓库的 version.json,把最新版模型下载到这里。
-离线使用也可以手动放入 <模型id>/<模型id>.json + <模型id>/<模型id>.model/。
-
-运行目录:
- <可执行文件>
- .GC/settings.json
- .GC/model/ 本目录(下载的模型)
- .GC/cache/ 下载暂存
- .GC/update/ 待下次启动应用的启动器更新
-'@
- Set-Content -Path "$dest/.GC/model/README.txt" -Value $readme -Encoding UTF8
-
- $settingsPath = "$dest/.GC/settings.json"
- if (-not (Test-Path $settingsPath)) {
- $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": []
-}
-'@
- Set-Content -Path $settingsPath -Value $json -Encoding UTF8
- }
- Write-Host " 运行目录 -> $RelDir/.GC (settings.json + model/ + cache/ + update/)"
-}
-
-function Publish-Rid([string]$Rid, [string]$OutDir) {
- Write-Host "==> 编译 $Rid -> $OutDir"
- # 先删旧产物目录,避免残留文件混进新包
- if (Test-Path "$Root/$OutDir") { Remove-Item -Recurse -Force "$Root/$OutDir" }
- dotnet publish $AppProj -c Release -r $Rid --self-contained true `
- -p:Version=$Version -p:DebugType=none -p:PublishSingleFile=true `
- -p:IncludeNativeLibrariesForSelfExtract=true -p:PublishTrimmed=false -o "$Root/$OutDir"
- foreach ($old in @("$Root/$OutDir/model", "$Root/$OutDir/examples")) {
- if (Test-Path $old) { Remove-Item -Recurse -Force $old }
- }
-}
-
-function Pack-Models {
- New-Item -ItemType Directory -Force -Path "$Root/dist" | Out-Null
- $zip = "$Root/dist/models-$Version.zip"
- if (Test-Path $zip) { Remove-Item -Force $zip }
- Write-Host "==> 打包模型数据 -> dist/models-$Version.zip"
- $stage = Join-Path $env:TEMP "ems-models-stage"
- if (Test-Path $stage) { Remove-Item -Recurse -Force $stage }
- New-Item -ItemType Directory -Force -Path $stage | Out-Null
- Get-ChildItem "$Root/model" -Recurse -File | Where-Object {
- $_.FullName -notmatch '\\(bin|obj)\\' -and $_.Extension -ne '.user'
- } | ForEach-Object {
- $rel = $_.FullName.Substring("$Root/model".Length + 1)
- $dest = Join-Path $stage $rel
- New-Item -ItemType Directory -Force -Path (Split-Path $dest) | Out-Null
- Copy-Item -Force $_.FullName $dest
- }
- Compress-Archive -Path "$stage/*" -DestinationPath $zip -Force
- Remove-Item -Recurse -Force $stage
-}
-
-# 启动器更新包:只包含程序文件,排除 .GC(否则会覆盖用户模型与设置)
-function Pack-Launcher {
- Write-Host '==> 生成启动器更新包(不含 .GC)'
- $targets = @{
- 'GC-win-x64.zip' = "$Root/dist/win-x64"
- 'GC-win-arm64.zip' = "$Root/dist/win-arm64"
- 'GC-osx-arm64.zip' = "$Root/dist/mac-arm64/EarthModelStudio.app/Contents/MacOS"
- }
- if (-not (Test-Path $targets['GC-osx-arm64.zip'])) {
- $targets['GC-osx-arm64.zip'] = "$Root/dist/mac-arm64"
- }
- foreach ($name in $targets.Keys) {
- $src = $targets[$name]
- if (-not (Test-Path $src)) { continue }
- $stage = Join-Path $env:TEMP ("ems-launcher-" + [IO.Path]::GetFileNameWithoutExtension($name))
- if (Test-Path $stage) { Remove-Item -Recurse -Force $stage }
- New-Item -ItemType Directory -Force -Path $stage | Out-Null
- Get-ChildItem $src -Recurse -File | Where-Object {
- $_.FullName -notmatch '\\\.GC\\' -and $_.Name -ne '.DS_Store'
- } | ForEach-Object {
- $rel = $_.FullName.Substring($src.Length).TrimStart('\', '/')
- $dest = Join-Path $stage $rel
- New-Item -ItemType Directory -Force -Path (Split-Path $dest) | Out-Null
- Copy-Item -Force $_.FullName $dest
- }
- $zip = "$Root/dist/$name"
- if (Test-Path $zip) { Remove-Item -Force $zip }
- Compress-Archive -Path "$stage/*" -DestinationPath $zip -Force
- Remove-Item -Recurse -Force $stage
- }
- Stamp-Versions
- Get-ChildItem "$Root/dist/GC-*.zip" | Select-Object Name, Length
+ Stamp
}
switch ($Task) {
'build' {
- Get-ChildItem "$Root/dist/GC-*.zip","$Root/dist/models-*.zip" -ErrorAction SilentlyContinue |
- Remove-Item -Force
- dotnet build $Sln -c Debug
- }
- 'run' { dotnet run --project $AppProj -c Debug }
- 'test' { dotnet run --project $TestProj -c Debug -- "$Root/build/screenshots" }
- 'publish' {
- # 先清理 dist 旧产物,再重新生成
- if (Test-Path "$Root/dist") { Remove-Item -Recurse -Force "$Root/dist" }
+ Write-Host '==> 编译三平台(进度见 buildsh/lib/progress.sh,建议用 Git Bash 运行 ./build.sh build)'
+ Remove-Item -Recurse -Force "$Root/dist" -ErrorAction SilentlyContinue
New-Item -ItemType Directory -Force -Path "$Root/dist" | Out-Null
- Stamp-Versions
- Publish-Rid 'osx-arm64' 'dist/mac-arm64'
- Publish-Rid 'win-x64' 'dist/win-x64'
- Publish-Rid 'win-arm64' 'dist/win-arm64'
- Prepare-RuntimeLayout 'dist/win-x64'
- Prepare-RuntimeLayout 'dist/win-arm64'
- Prepare-RuntimeLayout 'dist/mac-arm64'
- Pack-Launcher
- Write-Host '==> 三个平台编译完成(发布包不含模型,首次启动自动下载),见 dist\' -ForegroundColor Green
- Write-Host ' 把 version.json / model/ 推送到 gitcode,启动器就会自动检查更新'
+ Stamp
+ foreach ($rid in @('osx-arm64','win-x64','win-arm64')) {
+ dotnet publish $AppProj -c Release -r $rid --self-contained true `
+ -p:Version=$Version -p:DebugType=none -p:PublishSingleFile=true `
+ -p:IncludeNativeLibrariesForSelfExtract=true -p:PublishTrimmed=false `
+ -o "$Root/dist/$rid"
+ }
+ Write-Host '==> 完成(详细打包请用 ./build.sh build)'
}
- 'models' { Build-Models }
- 'stamp' { Stamp-Versions }
- 'bundle' { Write-Host '已弃用:发布包不再内置模型。请改用 .\build.ps1 stamp 与 gitcode 自动更新。' }
- 'pack-models' {
- Build-Models
- Pack-Models
+ 'check' {
+ dotnet build $Sln -c Debug
+ $env:EMS_SELFTEST = '1'; dotnet run --project $AppProj -c Debug --no-build; Remove-Item Env:\EMS_SELFTEST
+ dotnet run --project $TestProj -c Debug --no-build -- "$Root/build/screenshots"
}
- 'pack-launcher' { Pack-Launcher }
+ 'models' { Build-Models }
+ 'stamp' { Stamp }
+ 'pack-models' { Build-Models }
+ 'pack-launcher' { Write-Host '请用 ./build.sh pack-launcher' }
+ 'run' { dotnet run --project $AppProj -c Debug }
+ 'test' { dotnet run --project $TestProj -c Debug -- "$Root/build/screenshots" }
'update-test' { dotnet run --project $TestProj -c Debug -- '--update-test' $Root }
- 'clean' {
- Remove-Item -Recurse -Force "$Root/build", "$Root/dist" -ErrorAction SilentlyContinue
- Get-ChildItem "$Root/src" -Recurse -Directory -Include bin, obj |
- Remove-Item -Recurse -Force -ErrorAction SilentlyContinue
- }
- 'doctor' { dotnet --info }
+ 'clean' { Remove-Item -Recurse -Force "$Root/build","$Root/dist" -ErrorAction SilentlyContinue; Write-Host '==> 已清理' }
+ 'doctor' { dotnet --info | Select-Object -First 20 }
+ 'dist' { Get-ChildItem "$Root/dist" -ErrorAction SilentlyContinue }
}
diff --git a/build.sh b/build.sh
index 99fa381..9a15fbb 100755
--- a/build.sh
+++ b/build.sh
@@ -1,33 +1,21 @@
#!/bin/sh
# ---------------------------------------------------------------------------
-# Earth Model Studio 构建脚本(macOS / Linux)
+# Earth Model Studio 构建入口(薄封装)
#
-# ./build.sh build 编译(Debug)
-# ./build.sh run 本机运行
-# ./build.sh test 离屏渲染校验,截图输出到 build/screenshots
-# ./build.sh models 编译模型 dll + 生成封面 + 自动打版本
-# ./build.sh stamp 只重新生成 version.json 与模型版本
-# ./build.sh publish 编译三个平台启动器(不内置模型)+ 建立 .GC 运行目录
-# ./build.sh pack-models 单独打包模型数据(含 version.json)
-# ./build.sh pack-launcher 生成三个平台的启动器更新包 zip
-# ./build.sh update-test 离线验证自动更新链路
-# ./build.sh clean 清理
+# ./build.sh build 完整发布(原 publish),带 apt 风格进度条
+# ./build.sh check 验证:编译 + 自检 + 离屏渲染 + 产物
+# ./build.sh models 编译模型 dll + 封面 + 版本戳
+# ./build.sh stamp 重新生成 version.json
+# ./build.sh run / test / update-test / pack-models / pack-launcher
+# ./build.sh clean 清理
+# ./build.sh doctor dotnet 信息
+# ./build.sh dist 列出产物
#
-# 分层:src/ 只是启动器;模型全部在 model/;**发布包不内置模型**。
-#
-# 运行目录(发布包里就长这样):
-# <安装目录>/
-# EarthModelStudio(.exe | .app/...)
-# .GC/
-# settings.json 设置与已安装版本
-# model/ 启动时从 gitcode 下载的模型
-# cache/ 下载暂存
-# update/ 待下次启动应用的启动器更新
+# 实际代码都在 buildsh/ 里,本文件只负责加载模块与分发。
# ---------------------------------------------------------------------------
set -eu
-# Avalonia 遥测任务在只读用户目录/CI/沙箱会因写日志失败而中断编译(MSB4018)。
-# 官方 opt-out;Directory.Build.targets 里还有一层项目内的兜底。
+# Avalonia 遥测任务在只读用户目录/CI/沙箱会因写日志失败中断编译(MSB4018)
export AVALONIA_TELEMETRY_OPTOUT=1
ROOT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
@@ -38,292 +26,21 @@ PREVIEW_PROJ="model/_engine/PreviewGen/PreviewGen.csproj"
STAMP_PROJ="model/_engine/VersionStamp/VersionStamp.csproj"
TEST_PROJ="src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.csproj"
SLN="EarthModelStudio.sln"
-VERSION="1.0.3"
+VERSION=$(sed -n 's/.*\(.*\)<\/Version>.*/\1/p' Directory.Build.props | head -1)
+[ -n "$VERSION" ] || VERSION="1.0.0"
+
TASK="${1:-build}"
+mkdir -p "$ROOT_DIR/build/logs"
-# 按模型包内容指纹自动写回 .json 的 version,并生成 version.json
-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" <
-
-
-
- CFBundleNameEarth Model Studio
- CFBundleDisplayNameEarth Model Studio
- CFBundleIdentifiercn.neorf.earthmodelstudio
- CFBundleVersion${VERSION}
- CFBundleShortVersionString${VERSION}
- CFBundlePackageTypeAPPL
- CFBundleExecutableEarthModelStudio
- CFBundleInfoDictionaryVersion6.0
- LSMinimumSystemVersion11.0
- NSHighResolutionCapable
-
-
-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"
-}
+# 加载 buildsh 模块
+. "$ROOT_DIR/buildsh/lib/progress.sh"
+. "$ROOT_DIR/buildsh/lib/build_funcs.sh"
+. "$ROOT_DIR/buildsh/build.sh"
+. "$ROOT_DIR/buildsh/check.sh"
+. "$ROOT_DIR/buildsh/tools.sh"
case "$TASK" in
- build)
- # 清理上次遗留的发布包 zip,避免误用旧产物
- rm -f "$ROOT_DIR"/dist/GC-*.zip "$ROOT_DIR"/dist/models-*.zip 2>/dev/null || true
- dotnet build "$SLN" -c Debug
- ;;
- run)
- dotnet run --project "$APP_PROJ" -c Debug
- ;;
- test)
- dotnet run --project "$TEST_PROJ" -c Debug -- "$ROOT_DIR/build/screenshots"
- ;;
- publish)
- # 先清掉 dist 旧产物(含历史 zip / 目录),再重新生成
- echo "==> 清理 dist 旧产物"
- rm -rf "$ROOT_DIR/dist"
- mkdir -p "$ROOT_DIR/dist"
- stamp_versions
- # macOS 用目录形式(非单文件):单文件包启动时需要解压缓存目录,
- # 在受限/沙箱环境下创建失败会直接报「打不开」。目录形式无此依赖。
- publish_rid "osx-arm64" "dist/mac-arm64" false
- publish_rid "win-x64" "dist/win-x64" true
- publish_rid "win-arm64" "dist/win-arm64" true
- 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"
- pack_launcher
- echo ""
- echo "==> 三个平台编译完成(发布包不含模型,首次启动自动下载):"
- du -sh "$ROOT_DIR/dist"/* 2>/dev/null || true
- echo " 把 version.json / model/ 推送到 gitcode,启动器就会自动检查更新"
- ;;
- models)
- build_models
- ;;
- stamp)
- stamp_versions
- ;;
- bundle)
- echo "已弃用:发布包不再内置模型。请改用 ./build.sh stamp 与 gitcode 自动更新。"
- ;;
- pack-models)
- build_models
- pack_models
- ;;
- pack-launcher)
- pack_launcher
- ;;
- 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 "==> 已清理"
- ;;
- doctor)
- dotnet --info | head -20
- ;;
- *)
- echo "未知任务: $TASK"
- echo "可用: build | run | test | publish | models | stamp | pack-models | pack-launcher | update-test | clean | doctor"
- exit 1
- ;;
+ build) bs_build "$ROOT_DIR" ;;
+ check) bs_check "$ROOT_DIR" ;;
+ *) bs_tools "$ROOT_DIR" "$TASK" ;;
esac
diff --git a/buildsh/lib/progress.sh b/buildsh/lib/progress.sh
index b21de86..775b0c8 100644
--- a/buildsh/lib/progress.sh
+++ b/buildsh/lib/progress.sh
@@ -22,24 +22,31 @@ _now() { date +%s; }
# 加权总进度:前序步骤权重之和 + 当前步骤权重*完成度
_progress_overall() {
- _sum=0; _i=0
+ _sum=0; _i=1
for _w in $PROGRESS_WEIGHTS; do
- if [ "$_i" -lt "$PROGRESS_IDX" ]; then _sum=$((_sum + _w)); fi
+ if [ "$_i" -lt "$PROGRESS_IDX" ]; then
+ _sum=$((_sum + _w)) # 已完成的步骤:全额
+ elif [ "$_i" -eq "$PROGRESS_IDX" ]; then
+ _sum=$((_sum + _w * PROGRESS_CUR / 100)) # 当前步骤:按完成度
+ 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))
+ _p=$((_sum * 100 / PROGRESS_TOTAL))
+ [ "$_p" -gt 100 ] && _p=100
+ echo "$_p"
}
# 剩余时间:基于「已完成总进度 / 已用时间」线性外推
_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 [ "$_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
}
@@ -58,8 +65,8 @@ progress_draw() {
_i=$((_i + 1))
done
- # \r 回到行首,用 \033[K 清到行尾;底部固定一行
- printf '\r\033[K[%s] %-16s %3d%% 总 %3d%% %s' \
+ # 底部一行:任务 当前任务进度 总进度 剩余时间
+ printf '\r\033[K[%s] %-14s %3d%% %3d%% %s' \
"$_bar" "$_task" "$_cur" "$_overall" "$_eta"
}