From d734011601ae1eecc0e3ae334b58d07e5b4d80d3 Mon Sep 17 00:00:00 2001 From: Christian Kolset Date: Tue, 11 Aug 2026 11:36:10 -0600 Subject: Finish multi-platform release restructuring (previous commit was incomplete) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git add silently staged nothing from the previous attempt because one pathspec in that batch (scripts/release/repository, already moved) no longer existed — only the .gitignore-adjacent renames landed. This commit adds what was actually meant to go in: - core/updater.py: releases/download/updates-/ instead of a single shared updates/ tag. - labui.spec: bundles root.json from this platform's own tree. - scripts/release/repo_init.py, repo_release.py: auto-detect platform, operate inside scripts/release//. - .gitignore: per-platform ignore rules (previous commit only carried the file renames, not this). - docs/building.md, scripts/release/README.md: rewritten for the per-platform flow. - Also picks up pre-existing local TUF re-signing (new snapshot/ timestamp signatures, bumped expiry/version) that was sitting uncommitted before this restructuring started. Co-Authored-By: Claude Sonnet 5 --- labui.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'labui.spec') diff --git a/labui.spec b/labui.spec index 8468909..71d50dd 100644 --- a/labui.spec +++ b/labui.spec @@ -17,13 +17,24 @@ root_dir = Path(SPECPATH) # root.json is generated by scripts/release/repo_init.py — bundle it once it # exists so a fresh install can bootstrap tufup trust without an insecure # first fetch. Skip silently before that's ever been run (e.g. first build). +# Read from this platform's own repo tree (scripts/release//) — +# must match core.updater._platform_key()'s mapping, since a build only ever +# bundles its own platform's root.json. +def _platform_key(): + if sys.platform.startswith("win"): + return "win" + if sys.platform == "darwin": + return "mac" + return "linux" + datas = [ (str(root_dir / "ui" / "style_dark.qss"), "ui"), (str(root_dir / "ui" / "style_light.qss"), "ui"), (str(root_dir / "ui" / "style.qss"), "ui"), (str(root_dir / "plugins"), "plugins"), ] -_root_json = root_dir / "scripts" / "release" / "repository" / "metadata" / "root.json" +_root_json = (root_dir / "scripts" / "release" / _platform_key() + / "repository" / "metadata" / "root.json") if _root_json.exists(): datas.append((str(_root_json), "repository/metadata")) -- cgit v1.2.3