fix(packaging): put the release recipes on v3's build
Neither packaging/arch/PKGBUILD nor the Homebrew formula had been run since Phase 1, and both were still calling v2's CLI: `wails3 build` takes -tags, -obfuscated and -garbleargs and nothing else, so `-clean -trimpath -ldflags` fails at the flag parser. Both also installed from build/bin/, which is v2's output path — v3 writes to bin/, and build/ is tracked build assets now. Three more things the tree needs that neither recipe had. The tasks invoke `wails3` by bare name, so scripts/toolbin has to be on PATH or the build dies at its first sub-task. `wails3 build` has no -ldflags at all, and build:native computes BUILD_FLAGS in its own vars: so a CLI variable cannot override it — LDFLAGS_EXTRA is appended inside the production -ldflags string instead, on linux and darwin alike, empty by default so make build-dev/build-prod are unchanged. And bundling is a separate step from building: `task build` produces a bare binary on both platforms, so the formula's macOS path runs `task package`. The build assets were the scaffold's, not this app's. Info.plist named CFBundleExecutable `yjref` and com.example.yjref, nfpm packaged ./bin/yjref, the .desktop template said "A yjref application" — an .app built from that plist would not have launched. They generate from build/config.yml, whose info block had never been filled from wails.json either; `wails3 task common:update:build-assets` is the fix. nfpm's homepage and license are not derived from it and are set by hand, which is noted in place, and the refresh regenerates build/ios and build/android, which this repo does not carry. arch-package.yml's pacman list moves to webkitgtk-6.0/gtk4 to match the PKGBUILD's depends(): makepkg installs nothing itself, so a mismatch fails at link time rather than at check time. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UDCbcCZQepnpSQYJ6SxxZm
This commit is contained in:
@@ -59,7 +59,15 @@ tasks:
|
||||
cmds:
|
||||
- '{{if eq .OBFUSCATED "true"}}garble {{.GARBLE_ARGS}} build{{else}}go build{{end}} {{.BUILD_FLAGS}} -o {{.OUTPUT}}'
|
||||
vars:
|
||||
BUILD_FLAGS: '{{if eq .DEV "true"}}{{if or .EXTRA_TAGS (eq .OBFUSCATED "true")}}-tags {{if eq .OBFUSCATED "true"}}wails_obfuscated{{if .EXTRA_TAGS}},{{end}}{{end}}{{.EXTRA_TAGS}} {{end}}-buildvcs=false -gcflags=all="-l"{{else}}-tags production{{if eq .OBFUSCATED "true"}},wails_obfuscated{{end}}{{if .EXTRA_TAGS}},{{.EXTRA_TAGS}}{{end}} -trimpath -buildvcs=false -ldflags="-w -s"{{end}}'
|
||||
# LDFLAGS_EXTRA is this repo's one edit to the scaffold: `wails3
|
||||
# build` has no -ldflags flag of its own, and the packaging recipes
|
||||
# (packaging/arch/PKGBUILD, the Homebrew formula) need to stamp
|
||||
# main.version / main.commit. Pass it as a task variable:
|
||||
# wails3 task build LDFLAGS_EXTRA="-X 'main.version=v1.3.0'"
|
||||
# It is appended inside the production -ldflags string, so the
|
||||
# default -w -s still applies. Empty by default, which is what
|
||||
# keeps `make build-dev` / `make build-prod` unchanged.
|
||||
BUILD_FLAGS: '{{if eq .DEV "true"}}{{if or .EXTRA_TAGS (eq .OBFUSCATED "true")}}-tags {{if eq .OBFUSCATED "true"}}wails_obfuscated{{if .EXTRA_TAGS}},{{end}}{{end}}{{.EXTRA_TAGS}} {{end}}-buildvcs=false -gcflags=all="-l"{{else}}-tags production{{if eq .OBFUSCATED "true"}},wails_obfuscated{{end}}{{if .EXTRA_TAGS}},{{.EXTRA_TAGS}}{{end}} -trimpath -buildvcs=false -ldflags="-w -s{{if .LDFLAGS_EXTRA}} {{.LDFLAGS_EXTRA}}{{end}}"{{end}}'
|
||||
DEFAULT_OUTPUT: '{{.BIN_DIR}}/{{.APP_NAME}}'
|
||||
OUTPUT: '{{ .OUTPUT | default .DEFAULT_OUTPUT }}'
|
||||
env:
|
||||
|
||||
+5
-5
@@ -1,13 +1,13 @@
|
||||
[Desktop Entry]
|
||||
Version=1.0
|
||||
Name=My Product
|
||||
Comment=A yjref application
|
||||
Name=yellowjacket
|
||||
Comment=Cross-platform desktop music player — local library, MusicBrainz explore & auto-tag
|
||||
# The Exec line includes %u to pass the URL to the application
|
||||
Exec=/usr/local/bin/yjref %u
|
||||
Exec=/usr/local/bin/yellowjacket %u
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Icon=yjref
|
||||
Icon=yellowjacket
|
||||
Categories=Utility;
|
||||
StartupWMClass=yjref
|
||||
StartupWMClass=yellowjacket
|
||||
|
||||
|
||||
|
||||
+14
-11
@@ -3,26 +3,29 @@
|
||||
#
|
||||
# The lines below are called `modelines`. See `:help modeline`
|
||||
|
||||
name: "yjref"
|
||||
name: "yellowjacket"
|
||||
arch: ${GOARCH}
|
||||
platform: "linux"
|
||||
version: "0.1.0"
|
||||
version: "1.3.0"
|
||||
section: "default"
|
||||
priority: "extra"
|
||||
maintainer: ${GIT_COMMITTER_NAME} <${GIT_COMMITTER_EMAIL}>
|
||||
description: "A yjref application"
|
||||
vendor: "My Company"
|
||||
homepage: "https://wails.io"
|
||||
license: "MIT"
|
||||
description: "Cross-platform desktop music player — local library, MusicBrainz explore & auto-tag"
|
||||
vendor: "yellowjacket"
|
||||
# homepage and license are NOT derived from build/config.yml, so
|
||||
# `wails3 task common:update:build-assets` leaves them alone — everything
|
||||
# above them is regenerated from that file and hand edits there are lost.
|
||||
homepage: "https://git.ljones.me/yonlu/yellowjacket"
|
||||
license: "custom" # see the repository; packaging/arch/PKGBUILD says the same
|
||||
release: "1"
|
||||
|
||||
contents:
|
||||
- src: "./bin/yjref"
|
||||
dst: "/usr/local/bin/yjref"
|
||||
- src: "./bin/yellowjacket"
|
||||
dst: "/usr/local/bin/yellowjacket"
|
||||
- src: "./build/appicon.png"
|
||||
dst: "/usr/share/icons/hicolor/128x128/apps/yjref.png"
|
||||
- src: "./build/linux/yjref.desktop"
|
||||
dst: "/usr/share/applications/yjref.desktop"
|
||||
dst: "/usr/share/icons/hicolor/128x128/apps/yellowjacket.png"
|
||||
- src: "./build/linux/yellowjacket.desktop"
|
||||
dst: "/usr/share/applications/yellowjacket.desktop"
|
||||
|
||||
# Default dependencies for the GTK4 + WebKitGTK 6.0 stack (Ubuntu 24.04+ / Debian 13+)
|
||||
depends:
|
||||
|
||||
Reference in New Issue
Block a user