Skip to content

emrg: Phase 4 补 packaging/assets 图标资产 + 打包链路收尾(rant #12 §13 验收遗漏) - #367

Merged
argszero merged 4 commits into
masterfrom
feature/phase4-packaging-assets
Aug 4, 2026
Merged

emrg: Phase 4 补 packaging/assets 图标资产 + 打包链路收尾(rant #12 §13 验收遗漏)#367
argszero merged 4 commits into
masterfrom
feature/phase4-packaging-assets

Conversation

@argszero

@argszero argszero commented Aug 4, 2026

Copy link
Copy Markdown
Owner

改动内容

修复 Phase 4(rant #12 §13 验收项)遗漏的打包资产缺口:

  1. packaging/gen-assets.sh(新增)— 纯 stdlib 图标生成脚本(无 PIL/ImageMagick 依赖):
    • Python stdlib 绘制 1024x1024 EMRG 图标(深色底 + 绿色电路环 + E 字)
    • 缩放 512/256 PNG、iconutil → icon.icns(macOS)、多尺寸 icon.ico(Windows)
  2. packaging/assets/(新增 5 文件)— icon.png / icon-512.png / icon-256.png / icon.icns / icon.ico
    • GUI package.json build.icon 指向 ../packaging/assets/(electron-builder 缺此目录会报错)
  3. emrg/gui/package.json — mac/win target 改 dir(配合 make-installer 组装完整安装包)
  4. packaging/make-installer.sh — 打包链路收尾(R97):
    • macOS pkg 组装 GUI EMRG.app + 卸载 EMRG.app(R30)
    • Windows Inno Setup 完整脚本(R55/R87/R97):user-level 安装、PATH 注册、快捷方式、UninstallRun 调 emrg-uninstall
    • Linux tar.gz 兜底

原因

PR #364 合并时 packaging/assets/ 未提交(rant #12 §13 要求 assets/ 图标),GUI build.icon 指向不存在目录 → electron-builder 打包失败。本 PR 补齐该缺口并完善打包链路。

验证

  • uv run pytest tests/ -v → 464 passed
  • import check → OK
  • gen-assets.sh 本机运行成功,产出全部 5 个资产文件

@argszero argszero left a comment

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ LGTM — cycle 20260804-2320

审查内容:

  1. packaging/assets/(5 图标文件)—— 修复 rant #12 §13 验收遗漏:PR #364 未提交 assets/ 目录,而 GUI package.json build.icon 指向 ../packaging/assets/,electron-builder 打包必失败。本 PR 补齐。
  2. packaging/gen-assets.sh(247 行)—— 纯 stdlib 图标生成(PNG/ICNS/ICO 全平台),无 PIL/ImageMagick 依赖,CI 可跑。
  3. emrg/gui/package.json —— mac/win target 改 dir(配合 make-installer 组装完整安装包,R97)。
  4. packaging/make-installer.sh —— macOS pkg 组装 EMRG.app + 卸载 app(R30)、Windows Inno Setup 完整脚本(R55/R87/R97:user-level 安装 + PATH 注册 + 快捷方式 + UninstallRun 调 emrg-uninstall)、Linux tar.gz 兜底。

验证:pytest 464 passed;CI Test 499f00f success。

@argszero argszero left a comment

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ LGTM — cycle 20260804-2322

复核确认:diff 内容与上轮审查一致(packaging/assets 5 图标 + gen-assets.sh + GUI target dir + make-installer R97 收尾),CI Test 499f00f success,pytest 464 passed。无新增问题。

@argszero argszero left a comment

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ LGTM — cycle 20260804-2325

本轮审查新增内容(push 后 diff 更新):

  1. c4a82d2 Phase 4 packaging 补全:requirements-.lock ×4(uv pip compile 按平台生成,R100)、build-runtime.sh source/ 去冗余(不再重复复制 bin/)+ 排除 pycache + LICENSE、bundle-git-gh.sh CI 源码编译 git(R59)、make-installer.sh 补 mkdir -p scripts(修复 postinstall 目录缺失 bug)
  2. .gitignore 补 /emrg/gui/dist/(electron-builder 234MB 构建产物不入库)

合并条件达成:3 个不同 cycle 的 ✅(2320 / 2322 / 2325),无 ❌。

@argszero
argszero merged commit b23afde into master Aug 4, 2026
1 check passed
@argszero
argszero deleted the feature/phase4-packaging-assets branch August 4, 2026 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant