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
@@ -46,18 +46,44 @@ dependencies {
|
||||
implementation(project(":composeApp"))
|
||||
}
|
||||
|
||||
// Packaging works (proven in Phase 0), but per-OS installers and icons are
|
||||
// milestone M5. Version is pinned numerically here because jpackage only
|
||||
// accepts major.minor.patch; M5 wires it to the app's version scheme.
|
||||
// Packaging works (proven in Phase 0), M5 wires it: version derived from
|
||||
// the app's versionName, distribution icon shipped, per-OS installers need
|
||||
// per-OS runners (§7: jpackage cannot cross-compile — CI matrix, M5.4).
|
||||
// jpackage accepts major.minor.patch ONLY, so the app's 4-segment
|
||||
// versionName (0.4.2.0 — validator in app/build.gradle.kts is the source of
|
||||
// truth) maps to its first three segments; the emergency segment lives in
|
||||
// the git tag, exactly like the APK release flow.
|
||||
val appVersionName: String = run {
|
||||
val appBuild = rootProject.file("app/build.gradle.kts").readText()
|
||||
Regex("versionName\\s*=\\s*\"([0-9.]+)\"").find(appBuild)?.groupValues?.get(1)
|
||||
?: error("M5.3: could not read versionName from app/build.gradle.kts")
|
||||
}
|
||||
|
||||
compose.desktop {
|
||||
application {
|
||||
mainClass = "org.incido.desktop.MainKt"
|
||||
nativeDistributions {
|
||||
targetFormats(TargetFormat.Deb, TargetFormat.Rpm, TargetFormat.AppImage)
|
||||
packageName = "incido"
|
||||
packageVersion = "0.4.2"
|
||||
packageVersion = appVersionName.split(".").take(3).joinToString(".")
|
||||
vendor = "Incido"
|
||||
description = "Incido — offline-first notes (desktop)."
|
||||
// The jlink runtime needs jdk.unsupported: DataStore's bundled
|
||||
// protobuf touches sun.misc.Unsafe (M5.3 image smoke caught it —
|
||||
// :desktopApp:run never notices, the host JDK has the module).
|
||||
modules.add("jdk.unsupported")
|
||||
// API delta (M5.3): the 1.7.3 Compose DSL exposes NO iconFile
|
||||
// property (jpackage's --icon is unreachable from here). The
|
||||
// icon vehicle is packaging/incido.desktop (app-image) and the
|
||||
// CI install step (deb/rpm, M5.4) — packaging/icon.png ships
|
||||
// beside them.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Derivation is visible (and CI-readable) without parsing jpackage logs.
|
||||
tasks.register("printPackageVersion") {
|
||||
doLast {
|
||||
println("PACKAGE-VERSION ${appVersionName.split(".").take(3).joinToString(".")}")
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 489 KiB |
@@ -0,0 +1,28 @@
|
||||
# Incido desktop entry — M5.3.
|
||||
#
|
||||
# deb/rpm installs get their own auto-generated .desktop from jpackage;
|
||||
# this file is for the app-image directory (build/compose/binaries/main/
|
||||
# app/incido). Install with the Exec/Icon paths pointed at wherever the
|
||||
# image lives, e.g.:
|
||||
#
|
||||
# mkdir -p ~/.local/share/applications ~/apps/incido
|
||||
# cp -r build/compose/binaries/main/app/incido/* ~/apps/incido/
|
||||
# cp desktopApp/packaging/icon.png ~/apps/incido/icon.png
|
||||
# sed -e "s|@PREFIX@|$HOME/apps/incido|" desktopApp/packaging/incido.desktop \
|
||||
# > ~/.local/share/applications/incido.desktop
|
||||
#
|
||||
# StartupWMClass=incido groups the AWT window (class "incido" under the
|
||||
# jpackage launcher) with its taskbar entry.
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Version=1.0
|
||||
Name=Incido
|
||||
GenericName=Notes
|
||||
Comment=Offline-first private notes
|
||||
Exec=@PREFIX@/bin/incido %U
|
||||
Icon=@PREFIX@/icon.png
|
||||
Terminal=false
|
||||
Categories=Office;TextEditor;Utility;
|
||||
Keywords=notes;offline;private;markdown;
|
||||
StartupNotify=true
|
||||
StartupWMClass=incido
|
||||
Reference in new issue
Block a user