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:
Claude Opus 5
+18
-5
@@ -46,17 +46,30 @@ build() {
|
||||
local commit
|
||||
commit="$(git rev-parse --short HEAD)"
|
||||
|
||||
# `go tool wails/sqlc/templ` resolve from the tool directives in go.mod, so no
|
||||
# extra CLIs are needed. Wails runs the frontend install+build itself.
|
||||
# `go tool wails3/sqlc/templ` resolve from the tool directives in go.mod, so
|
||||
# no extra CLIs are needed. Wails runs the frontend install+build itself.
|
||||
#
|
||||
# v3's build is a Taskfile tree, and the tasks in it invoke `wails3` by bare
|
||||
# name — so the vendored tool has to be on PATH under that name or the build
|
||||
# dies at its first sub-task with "wails3: command not found". scripts/toolbin
|
||||
# is the shim the Makefile uses for the same reason; see the header there.
|
||||
export PATH="$srcdir/$pkgname/scripts/toolbin:$PATH"
|
||||
|
||||
# `wails3 build` has no -ldflags flag of its own (that was v2), so the version
|
||||
# stamp goes through the LDFLAGS_EXTRA task variable this repo added to
|
||||
# build/linux/Taskfile.yml. -trimpath and -w -s are already in the production
|
||||
# task's own flags, which is where -clean's frontend rebuild went too.
|
||||
go generate ./...
|
||||
go tool wails3 build -clean -trimpath \
|
||||
-ldflags "-s -w -X 'main.version=v$pkgver' -X 'main.commit=$commit'"
|
||||
go tool wails3 task build \
|
||||
LDFLAGS_EXTRA="-X 'main.version=v$pkgver' -X 'main.commit=$commit'"
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir/$pkgname"
|
||||
|
||||
install -Dm755 build/bin/yellowjacket "$pkgdir/usr/bin/yellowjacket"
|
||||
# v3 writes to bin/, not v2's build/bin/ — build/ is tracked build *assets*
|
||||
# now (build/config.yml, the icon, the platform Taskfiles).
|
||||
install -Dm755 bin/yellowjacket "$pkgdir/usr/bin/yellowjacket"
|
||||
install -Dm644 "$srcdir/yellowjacket.desktop" \
|
||||
"$pkgdir/usr/share/applications/yellowjacket.desktop"
|
||||
|
||||
|
||||
@@ -3,9 +3,10 @@
|
||||
|
||||
# YellowJacket — cross-platform desktop music player built with Wails (Go + Lit).
|
||||
#
|
||||
# This formula builds from source. The Wails toolchain (`go tool wails`) resolves
|
||||
# from the tool directives in go.mod, and Wails drives the frontend install/build
|
||||
# itself (pnpm), so only the Go toolchain, Node, and pnpm are needed at build time.
|
||||
# This formula builds from source. The Wails toolchain (`go tool wails3`)
|
||||
# resolves from the tool directives in go.mod, and Wails drives the frontend
|
||||
# install/build itself (pnpm), so only the Go toolchain, Node, and pnpm are
|
||||
# needed at build time.
|
||||
#
|
||||
# This file is the canonical source. On each tagged release, CI computes the
|
||||
# tarball checksum and syncs an updated copy into the homebrew-yellowjacket tap
|
||||
@@ -26,7 +27,10 @@ class Yellowjacket < Formula
|
||||
depends_on "pnpm" => :build
|
||||
|
||||
# Wails targets macOS and Linux. On Linux, Homebrew builds against the system
|
||||
# WebKitGTK/GTK stack, which must be present (webkit2gtk-4.1, gtk3, alsa-lib).
|
||||
# WebKitGTK/GTK stack, which must be present. Wails v3 resolves GTK4 +
|
||||
# WebKitGTK 6.0 by default (webkitgtk-6.0, gtk4, alsa-lib); v2's
|
||||
# webkit2gtk-4.1 + gtk3 is now only an opt-in `-tags gtk3` escape hatch and is
|
||||
# not what this formula builds.
|
||||
on_linux do
|
||||
depends_on "pkg-config" => :build
|
||||
end
|
||||
@@ -37,24 +41,34 @@ class Yellowjacket < Formula
|
||||
ENV["GOFLAGS"] = "-mod=mod"
|
||||
|
||||
commit = build.head? ? "HEAD" : "v#{version}"
|
||||
ldflags = "-s -w -X 'main.version=v#{version}' -X 'main.commit=#{commit}'"
|
||||
|
||||
# v3's build is a Taskfile tree whose tasks invoke `wails3` by bare name, so
|
||||
# the vendored tool has to be on PATH under that name — scripts/toolbin is
|
||||
# the shim the Makefile uses for the same reason. And `wails3 build` has no
|
||||
# -ldflags flag of its own (that was v2), so the version stamp goes through
|
||||
# the LDFLAGS_EXTRA task variable this repo added to the platform Taskfiles.
|
||||
# -trimpath and -w -s are already in the production task's own flags.
|
||||
ENV.prepend_path "PATH", buildpath/"scripts/toolbin"
|
||||
ldflags_extra = "-X 'main.version=v#{version}' -X 'main.commit=#{commit}'"
|
||||
|
||||
system "go", "generate", "./..."
|
||||
system "go", "tool", "wails3", "build",
|
||||
"-clean", "-trimpath",
|
||||
"-ldflags", ldflags
|
||||
|
||||
# Wails emits a .app bundle on macOS and a bare ELF binary on Linux. The
|
||||
# bundle is named after `outputfilename` in wails.json; glob for it so a
|
||||
# rename (or casing difference) can't silently break the install.
|
||||
# `task build` produces a bare binary in bin/ on both platforms; the .app
|
||||
# bundle is `task package`, which is a separate step in v3.
|
||||
if OS.mac?
|
||||
app = Dir["build/bin/*.app"].first
|
||||
odie "wails build produced no .app bundle in build/bin" if app.nil?
|
||||
system "go", "tool", "wails3", "task", "package",
|
||||
"LDFLAGS_EXTRA=#{ldflags_extra}"
|
||||
# The bundle is named after `productName` in build/config.yml; glob for it
|
||||
# so a rename (or casing difference) can't silently break the install.
|
||||
app = Dir["bin/*.app"].first
|
||||
odie "wails3 task package produced no .app bundle in bin/" if app.nil?
|
||||
prefix.install app
|
||||
exe = Dir[prefix/"*.app/Contents/MacOS/*"].find { |f| File.executable?(f) }
|
||||
bin.write_exec_script exe
|
||||
else
|
||||
bin.install "build/bin/yellowjacket"
|
||||
system "go", "tool", "wails3", "task", "build",
|
||||
"LDFLAGS_EXTRA=#{ldflags_extra}"
|
||||
bin.install "bin/yellowjacket"
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -65,12 +65,15 @@ authenticated `brew install`) for brew to fetch the release tarball.
|
||||
|
||||
- **License**: declared as `license :cannot_represent` (custom license). Replace
|
||||
with the correct SPDX identifier once the license is finalized.
|
||||
- **macOS vs Linux**: `wails build` produces a `YellowJacket.app` bundle on
|
||||
macOS (installed under the Cellar with an `exec` shim in `bin`) and a bare
|
||||
`yellowjacket` binary on Linux (installed to `bin`).
|
||||
- **macOS vs Linux**: under Wails v3 the bundling is a separate step from the
|
||||
build. `wails3 task build` produces a bare `yellowjacket` binary in `bin/` on
|
||||
both platforms; on macOS the formula runs `wails3 task package` instead, which
|
||||
wraps that binary in a `yellowjacket.app` (installed under the Cellar with an
|
||||
`exec` shim in `bin`).
|
||||
- **Linuxbrew**: building on Linux additionally needs the system WebKitGTK/GTK
|
||||
stack (`webkit2gtk-4.1`, `gtk3`, `alsa-lib`) — OS packages, not Homebrew deps.
|
||||
macOS needs only the Xcode Command Line Tools.
|
||||
stack (`webkitgtk-6.0`, `gtk4`, `alsa-lib`) — OS packages, not Homebrew deps.
|
||||
v2's `webkit2gtk-4.1`/`gtk3` is now only the `-tags gtk3` escape hatch. macOS
|
||||
needs only the Xcode Command Line Tools.
|
||||
- **Cask alternative**: if you later ship prebuilt macOS `.dmg`/`.zip` artifacts,
|
||||
a Homebrew *cask* pointing at those installs faster than this source build.
|
||||
This formula is the source-build path.
|
||||
|
||||
Reference in New Issue
Block a user