feat(phase-1/m5.3): packaging wired — derived version, icon/.desktop, image smoke, HiDPI+Wayland verdicts
packageVersion derived from app versionName (0.4.2.0 -> 0.4.2; printPackageVersion task). packaging/icon.png + packaging/incido.desktop template ship the icon (1.7.3 DSL exposes no iconFile — recorded). Image smoke caught a REAL bug: jlink runtime lacked jdk.unsupported, DataStore protobuf died on sun/misc.Unsafe only inside the image; fixed via modules.add. createDistributable re-verified: 171 MB image, bin/incido --self-test inside it rc=0. HiDPI: sun.java2d.uiScale=2 doubles requested geometry (screen-clamp proves it). Native Wayland: AWT probe on JDK17 AND 27 both resolve X11 XToolkit — stays XWayland; JBR bundling is Phase 2. New §3 traps + M5.3 run log recorded. Verify: :desktopApp:createDistributable (SUCCESSFUL, 171 MB); image bin/incido --data-dir /tmp/incido-img-smoke --self-test --exit-after 6 (SELFTEST id=1, RENDER notes=1, rc=0); :desktopApp:run --keys-smoke KEYS ALL-OK; :core:data-jvm:smoke M1a PASS; assembleDebug SUCCESSFUL.
This commit is contained in:
1 parent
0cad7729aa
commit
c894321fdf
5 files changed
+117
-4
No files matched your search
@@ -896,6 +896,57 @@ M5.2 suite:
|
||||
`.desktop` entry, createDistributable re-verify + size, Wayland/HiDPI
|
||||
verdict.
|
||||
|
||||
**M5.3 — packaging: DONE.**
|
||||
|
||||
- **Version wiring:** `packageVersion` now DERIVED — desktopApp's build
|
||||
script regexes `versionName` out of `app/build.gradle.kts` (the
|
||||
validator-protected source of truth) and maps 0.4.2.0 → 0.4.2 for
|
||||
jpackage (4th segment lives in the tag, like the APK flow).
|
||||
`:desktopApp:printPackageVersion` prints `PACKAGE-VERSION 0.4.2`.
|
||||
- **Icons/.desktop:** `packaging/icon.png` (1024, from
|
||||
`incido_flat_icon.png`) + `packaging/incido.desktop` template
|
||||
(@PREFIX@ substitution; StartupWMClass=incido). API delta found: the
|
||||
1.7.3 Compose DSL has NO `iconFile` property — the .desktop template
|
||||
(app-image) and the CI install step (deb) are the icon vehicles.
|
||||
- **The image run found a REAL packaging bug:** `NoClassDefFoundError:
|
||||
sun/misc/Unsafe` from DataStore's bundled protobuf — the jlink runtime
|
||||
lacked `jdk.unsupported` (invisible under the full JDK that
|
||||
`:desktopApp:run` uses; the spike never hit it because it had no
|
||||
DataStore). Fixed with `modules.add("jdk.unsupported")`. **New §3
|
||||
trap: any new JVM module a dependency secretly needs only shows up
|
||||
inside the image — smoke the image, not just the run task.**
|
||||
- **createDistributable re-verified:** BUILD SUCCESSFUL, app-image
|
||||
**171 MB** (168 → 169 → 171 MB across the phase: metadata-extractor +
|
||||
M5 code); `bin/incido --data-dir … --self-test --exit-after 6`
|
||||
INSIDE the image: `SELFTEST wrote note id=1 → RENDER notes=1`, rc=0.
|
||||
- **HiDPI verdict:** `-Dsun.java2d.uiScale=2.0` (via `JAVA_TOOL_OPTIONS`,
|
||||
respected by the jpackage launcher) doubles the requested window
|
||||
geometry — 1090x730 → clamped at 1920x1016 by the screen (requested
|
||||
2180px-wide; the compositor's cap PROVES the scale applied). Font
|
||||
crispness at scale not machine-verified; that part is pending-manual.
|
||||
- **Native-Wayland verdict:** A probe compiled+run on BOTH installed
|
||||
JDKs (Arch 17.0.20.1 and 27) with `WAYLAND_DISPLAY=wayland-0`
|
||||
present resolves `sun.awt.X11.XToolkit` either way — this stack has no
|
||||
native-Wayland AWT backend; skiko stays on XWayland. Real fix =
|
||||
bundling JetBrains Runtime (Wayland-capable) in the distribution →
|
||||
Phase 2 (needs Compose ≥1.8 `runtimeDirs` work + a JBR to verify
|
||||
against).
|
||||
|
||||
```
|
||||
M5.3 suite:
|
||||
:desktopApp:printPackageVersion PACKAGE-VERSION 0.4.2
|
||||
:desktopApp:createDistributable BUILD SUCCESSFUL — 171 MB image
|
||||
image bin/incido … --self-test SELFTEST id=1 → RENDER notes=1, rc=0
|
||||
(pre-fix image run) NoClassDefFoundError sun/misc/Unsafe → fixed
|
||||
uiScale 1 vs 2 window geometry 1090x730 → 1920x1016 (clamp) = scaling applied
|
||||
AwtProbe on JDK17 / JDK27 (Wayland env) both sun.awt.X11.XToolkit (no native Wayland here)
|
||||
:desktopApp:run … --keys-smoke KEYS ALL-OK
|
||||
:core:data-jvm:smoke RESULT: M1a PASS
|
||||
assembleDebug BUILD SUCCESSFUL
|
||||
```
|
||||
|
||||
**Next up: M5.4** — CI packaging job on the Gitea runner.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user