feature/dual-mode-build #8

Merged

ergosum merged 19 commits from feature/dual-mode-build into master 2026-07-21 11:34:13 +03:00

Conversation 0 Commits 19 Files changed 10 +617 -124

ergosum commented 2026-07-20 14:43:08 +03:00

Owner

Copy link

No description provided.

ergosum added 14 commits 2026-07-20 14:43:08 +03:00

feat(build): dual-mode PyInstaller with selective Qt pruning ... 1f56c9296c

- Three-layer defense against unwanted Qt modules (WebEngine, 3D, multimedia):
  1. QT_LIB_KEEP whitelist (30 Qt .so + 10 .abi3.so stems)
  2. EXCLUDED_MODULES substring filter on collect_data_files
  3. _toc_filter post-processing to catch hook-injected entries

- Dual-mode: onefile (PORTABLE) via default, onedir via ONEDIR=1 env var
- Renamed EXE from 'main' to 'qt-hledger'
- CI produces both artifacts per platform (Linux: .bin + .tar.gz,
  Windows: .exe + .zip) uploaded to release on tag push
- Reduces onefile binary from 247 MB to 155 MB (37% savings)

fix(ci): downgrade upload-artifact to v3 for Forgejo compat 22b2e34644

fix(ci): set QT_QPA_PLATFORM_PLUGIN_PATH in runtime hook, fix Wayland filter 5b2758b163

fix: bundle Qt platform plugins and sanitize child process env ... 9e66a696cd

- Add _selective_plugins() to collect essential Qt plugin .so files
  (platforms, tls, iconengines, imageformats, wayland-*, xcbglintegrations)
- Add libQt6WaylandClient to QT_LIB_KEEP
- Narrow EXCLUDED_MODULES to only exclude compositor Wayland libs,
  not libQt6WaylandClient
- Strip LD_LIBRARY_PATH contamination from child processes (QProcess,
  subprocess) so bundled Qt libs don't shadow hledger's system deps
- Encapsulate PyInstaller bundle detection in core/bundle.py

fix: bundle QML plugin .so files missing from collect_data_files ... 80fc4b56d3

collect_data_files('PySide6') returns zero QML plugin .so files —
PyInstaller classifies them as binaries. Add _selective_qml_plugins()
to collect .so files from needed QML module dirs (QtQuick, QtCore,
QtQml, QtNetwork, Qt5Compat, Qt/labs) into the binaries list.

fix: wrap tar.gz contents in qt-hledger/ directory 6b39f234fc

feat: add update archives (binary + app internals only, no Qt/Python runtime) 5214108e74

docs: update README, AGENTS, ci/README for dual-mode builds + update archives 3a5f623ba6

fix: inline update archive paths to avoid bash variable expansion b52a629a21

fix: review fixes — CRITICAL + HIGH issues ... d0454ed962

- Remove unused VERSION from main.spec
- Guard update archive tar step with directory checks
- Extract duplicate release upload into ci/upload-release.sh
- Rewrite Windows update archive one-liner as readable multi-line heredoc
- Derive _toc_filter from EXCLUDED_MODULES (single source of truth)
- Respect existing QT_QPA_PLATFORM_PLUGIN_PATH in runtime_hook.py

fix: review fixes — MEDIUM + LOW issues ... 610e1a3913

MEDIUM:
- Extract _pyside6_root() helper to reduce duplication in main.spec
- Deduplicate _system_deps ldd inputs (seen set)
- Extract shared _exe_kwargs dict for onefile/onedir EXE blocks
- Cache clean_child_env via lru_cache (called 3x per hledger invocation)
- Defer PySide6 import in clean_qprocess_env for testability

LOW:
- Split imports to one per line in main.spec (PEP 8)
- Add comment about '3D' false-positive risk in EXCLUDED_MODULES
- Improve bundle.py docstring to describe actual purpose
- Use UUID suffix in build-windows.sh VM naming (prevents collisions)

fix: add __future__ annotations to resolve F821 in bundle.py fe141964c1

fix: revert to module-level PySide6 import in bundle.py ... 3c7fb89253

Deferred import creates unresolvable conflict with ANN return type
annotations. Module-level import is correct since this module only
runs inside a PySide6 app.

fix: wrap EXCLUDED_MODULES in set() for TOC_EXCLUDE union 0ec1ab424d

ergosum added 1 commit 2026-07-20 14:43:19 +03:00

fix: replace uuidgen with /dev/urandom for Alpine compat 69ec997a24

ergosum added 1 commit 2026-07-20 15:04:10 +03:00

fix: use .ps1 file for Windows update archive (heredoc stdin broken over SSH) c6aa7bb1ec

ergosum added 1 commit 2026-07-20 15:23:17 +03:00

fix: bypass PowerShell execution policy for remote .ps1 script 620e17fb9e

ergosum added 2 commits 2026-07-21 09:03:12 +03:00

fix: make PyInstaller spec cross-platform for Windows builds 55a4b0944a

fix: cross-platform PySide6 paths + include ShaderTools dependency ... ab76e1c7ea

- Detect .dll/.pyd on Windows instead of only .so
- Handle flat PySide6 layout on Windows (no Qt/ subdirectory)
- Skip ldd-based _system_deps on Windows
- Set PATH instead of LD_LIBRARY_PATH in runtime_hook on Windows
- Add ShaderTools to bundled Qt modules (required by Qt5Compat/GraphicalEffects)
- Remove ShaderTools from EXCLUDED_MODULES
- Add Windows variant to _TOC_EXCLUDE for WaylandEglCompositor

ergosum merged commit 1dd0c6e0f5 into master 2026-07-21 11:34:13 +03:00

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

public/qt-hledger!8

No description provided.