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:
@@ -22,9 +22,13 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Install build dependencies
|
- name: Install build dependencies
|
||||||
run: |
|
run: |
|
||||||
|
# Wails v3 resolves GTK4 + WebKitGTK 6.0 by default; webkit2gtk-4.1 +
|
||||||
|
# gtk3 was v2's stack and is now only the `-tags gtk3` escape hatch.
|
||||||
|
# These must match the PKGBUILD's depends=() — makepkg installs
|
||||||
|
# nothing itself, so a mismatch fails at link time, not at check time.
|
||||||
pacman -Syu --noconfirm --needed \
|
pacman -Syu --noconfirm --needed \
|
||||||
base-devel git go nodejs pnpm curl sudo \
|
base-devel git go nodejs pnpm curl sudo \
|
||||||
webkit2gtk-4.1 gtk3 alsa-lib
|
webkitgtk-6.0 gtk4 alsa-lib
|
||||||
|
|
||||||
- name: Create unprivileged build user
|
- name: Create unprivileged build user
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -62,3 +62,11 @@ bin/
|
|||||||
# build/config.yml on every build, and consumed by the deb/rpm/AppImage
|
# build/config.yml on every build, and consumed by the deb/rpm/AppImage
|
||||||
# packaging tasks that depend on it. A derived file with one source.
|
# packaging tasks that depend on it. A derived file with one source.
|
||||||
build/linux/yellowjacket.desktop
|
build/linux/yellowjacket.desktop
|
||||||
|
|
||||||
|
# `wails3 task common:update:build-assets` regenerates the mobile trees
|
||||||
|
# whether or not anything asks for them. This is a desktop player and
|
||||||
|
# cannot target iOS/Android, so their includes: entries are dropped from
|
||||||
|
# Taskfile.yml and the trees themselves are not carried — ignored rather
|
||||||
|
# than deleted-and-rediscovered on every asset refresh.
|
||||||
|
build/ios/
|
||||||
|
build/android/
|
||||||
|
|||||||
+7
-2
@@ -4,14 +4,19 @@
|
|||||||
version: '3'
|
version: '3'
|
||||||
|
|
||||||
# This information is used to generate the build assets.
|
# This information is used to generate the build assets.
|
||||||
|
# The version here is the one baked into the platform *metadata* assets
|
||||||
|
# (Info.plist, the .desktop file, nfpm). It is not what the app reports:
|
||||||
|
# main.version is stamped at link time from the packaging recipes, which
|
||||||
|
# derive it from the git tag. Keep it in step with packaging/arch/PKGBUILD's
|
||||||
|
# pkgver and the Homebrew formula's version when cutting a release.
|
||||||
info:
|
info:
|
||||||
companyName: "yellowjacket" # The name of the company
|
companyName: "yellowjacket" # The name of the company
|
||||||
productName: "yellowjacket" # The name of the application
|
productName: "yellowjacket" # The name of the application
|
||||||
productIdentifier: "app.yellowjacket" # The unique product identifier
|
productIdentifier: "app.yellowjacket" # The unique product identifier
|
||||||
description: "A cross-platform desktop music player" # The application description
|
description: "Cross-platform desktop music player — local library, MusicBrainz explore & auto-tag" # The application description
|
||||||
copyright: "(c) 2026, yellowjacket" # Copyright text
|
copyright: "(c) 2026, yellowjacket" # Copyright text
|
||||||
comments: "yj@yellowjacket.app" # Comments
|
comments: "yj@yellowjacket.app" # Comments
|
||||||
version: "0.0.1" # The application version
|
version: "1.3.0" # The application version
|
||||||
# cfBundleIconName: "appicon" # The macOS icon name in Assets.car icon bundles (optional)
|
# cfBundleIconName: "appicon" # The macOS icon name in Assets.car icon bundles (optional)
|
||||||
# # Should match the name of your .icon file without the extension
|
# # Should match the name of your .icon file without the extension
|
||||||
# # If not set and Assets.car exists, defaults to "appicon"
|
# # If not set and Assets.car exists, defaults to "appicon"
|
||||||
|
|||||||
+32
-31
@@ -1,34 +1,35 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
<plist version="1.0">
|
<plist version="1.0">
|
||||||
<dict>
|
<dict>
|
||||||
<key>CFBundlePackageType</key>
|
<key>CFBundleExecutable</key>
|
||||||
<string>APPL</string>
|
<string>yellowjacket</string>
|
||||||
<key>CFBundleName</key>
|
<key>CFBundleGetInfoString</key>
|
||||||
<string>My Product</string>
|
<string>yj@yellowjacket.app</string>
|
||||||
<key>CFBundleExecutable</key>
|
<key>CFBundleIconFile</key>
|
||||||
<string>yjref</string>
|
<string>icons</string>
|
||||||
<key>CFBundleIdentifier</key>
|
<key>CFBundleIconName</key>
|
||||||
<string>com.example.yjref</string>
|
<string>appicon</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleIdentifier</key>
|
||||||
<string>0.1.0</string>
|
<string>app.yellowjacket</string>
|
||||||
<key>CFBundleGetInfoString</key>
|
<key>CFBundleName</key>
|
||||||
<string>This is a comment</string>
|
<string>yellowjacket</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>0.1.0</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleIconFile</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>icons</string>
|
<string>1.3.0</string>
|
||||||
<key>CFBundleIconName</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>appicon</string>
|
<string>1.3.0</string>
|
||||||
<key>LSMinimumSystemVersion</key>
|
<key>LSMinimumSystemVersion</key>
|
||||||
<string>12.0.0</string>
|
<string>12.0.0</string>
|
||||||
<key>NSHighResolutionCapable</key>
|
<key>NSAppTransportSecurity</key>
|
||||||
<string>true</string>
|
<dict>
|
||||||
<key>NSHumanReadableCopyright</key>
|
<key>NSAllowsLocalNetworking</key>
|
||||||
<string>© 2026, My Company</string>
|
<true/>
|
||||||
<key>NSAppTransportSecurity</key>
|
</dict>
|
||||||
<dict>
|
<key>NSHighResolutionCapable</key>
|
||||||
<key>NSAllowsLocalNetworking</key>
|
<string>true</string>
|
||||||
<true/>
|
<key>NSHumanReadableCopyright</key>
|
||||||
</dict>
|
<string>(c) 2026, yellowjacket</string>
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
+27
-26
@@ -1,29 +1,30 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
<plist version="1.0">
|
<plist version="1.0">
|
||||||
<dict>
|
<dict>
|
||||||
<key>CFBundlePackageType</key>
|
<key>CFBundleExecutable</key>
|
||||||
<string>APPL</string>
|
<string>yellowjacket</string>
|
||||||
<key>CFBundleName</key>
|
<key>CFBundleGetInfoString</key>
|
||||||
<string>My Product</string>
|
<string>yj@yellowjacket.app</string>
|
||||||
<key>CFBundleExecutable</key>
|
<key>CFBundleIconFile</key>
|
||||||
<string>yjref</string>
|
<string>icons</string>
|
||||||
<key>CFBundleIdentifier</key>
|
<key>CFBundleIconName</key>
|
||||||
<string>com.example.yjref</string>
|
<string>appicon</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleIdentifier</key>
|
||||||
<string>0.1.0</string>
|
<string>app.yellowjacket</string>
|
||||||
<key>CFBundleGetInfoString</key>
|
<key>CFBundleName</key>
|
||||||
<string>This is a comment</string>
|
<string>yellowjacket</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>0.1.0</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleIconFile</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>icons</string>
|
<string>1.3.0</string>
|
||||||
<key>CFBundleIconName</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>appicon</string>
|
<string>1.3.0</string>
|
||||||
<key>LSMinimumSystemVersion</key>
|
<key>LSMinimumSystemVersion</key>
|
||||||
<string>12.0.0</string>
|
<string>12.0.0</string>
|
||||||
<key>NSHighResolutionCapable</key>
|
<key>NSHighResolutionCapable</key>
|
||||||
<string>true</string>
|
<string>true</string>
|
||||||
<key>NSHumanReadableCopyright</key>
|
<key>NSHumanReadableCopyright</key>
|
||||||
<string>© 2026, My Company</string>
|
<string>(c) 2026, yellowjacket</string>
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
@@ -43,7 +43,10 @@ tasks:
|
|||||||
cmds:
|
cmds:
|
||||||
- '{{if eq .OBFUSCATED "true"}}garble {{.GARBLE_ARGS}} build{{else}}go build{{end}} {{.BUILD_FLAGS}} -o "{{.OUTPUT}}"'
|
- '{{if eq .OBFUSCATED "true"}}garble {{.GARBLE_ARGS}} build{{else}}go build{{end}} {{.BUILD_FLAGS}} -o "{{.OUTPUT}}"'
|
||||||
vars:
|
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 — see build/linux/Taskfile.yml for why this exists.
|
||||||
|
# Kept identical on both platforms so the Homebrew formula, which
|
||||||
|
# builds on either, has one invocation rather than two.
|
||||||
|
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}}'
|
DEFAULT_OUTPUT: '{{.BIN_DIR}}/{{.APP_NAME}}'
|
||||||
OUTPUT: '{{ .OUTPUT | default .DEFAULT_OUTPUT }}'
|
OUTPUT: '{{ .OUTPUT | default .DEFAULT_OUTPUT }}'
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -59,7 +59,15 @@ tasks:
|
|||||||
cmds:
|
cmds:
|
||||||
- '{{if eq .OBFUSCATED "true"}}garble {{.GARBLE_ARGS}} build{{else}}go build{{end}} {{.BUILD_FLAGS}} -o {{.OUTPUT}}'
|
- '{{if eq .OBFUSCATED "true"}}garble {{.GARBLE_ARGS}} build{{else}}go build{{end}} {{.BUILD_FLAGS}} -o {{.OUTPUT}}'
|
||||||
vars:
|
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}}'
|
DEFAULT_OUTPUT: '{{.BIN_DIR}}/{{.APP_NAME}}'
|
||||||
OUTPUT: '{{ .OUTPUT | default .DEFAULT_OUTPUT }}'
|
OUTPUT: '{{ .OUTPUT | default .DEFAULT_OUTPUT }}'
|
||||||
env:
|
env:
|
||||||
|
|||||||
+5
-5
@@ -1,13 +1,13 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Version=1.0
|
Version=1.0
|
||||||
Name=My Product
|
Name=yellowjacket
|
||||||
Comment=A yjref application
|
Comment=Cross-platform desktop music player — local library, MusicBrainz explore & auto-tag
|
||||||
# The Exec line includes %u to pass the URL to the application
|
# 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
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
Icon=yjref
|
Icon=yellowjacket
|
||||||
Categories=Utility;
|
Categories=Utility;
|
||||||
StartupWMClass=yjref
|
StartupWMClass=yellowjacket
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+14
-11
@@ -3,26 +3,29 @@
|
|||||||
#
|
#
|
||||||
# The lines below are called `modelines`. See `:help modeline`
|
# The lines below are called `modelines`. See `:help modeline`
|
||||||
|
|
||||||
name: "yjref"
|
name: "yellowjacket"
|
||||||
arch: ${GOARCH}
|
arch: ${GOARCH}
|
||||||
platform: "linux"
|
platform: "linux"
|
||||||
version: "0.1.0"
|
version: "1.3.0"
|
||||||
section: "default"
|
section: "default"
|
||||||
priority: "extra"
|
priority: "extra"
|
||||||
maintainer: ${GIT_COMMITTER_NAME} <${GIT_COMMITTER_EMAIL}>
|
maintainer: ${GIT_COMMITTER_NAME} <${GIT_COMMITTER_EMAIL}>
|
||||||
description: "A yjref application"
|
description: "Cross-platform desktop music player — local library, MusicBrainz explore & auto-tag"
|
||||||
vendor: "My Company"
|
vendor: "yellowjacket"
|
||||||
homepage: "https://wails.io"
|
# homepage and license are NOT derived from build/config.yml, so
|
||||||
license: "MIT"
|
# `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"
|
release: "1"
|
||||||
|
|
||||||
contents:
|
contents:
|
||||||
- src: "./bin/yjref"
|
- src: "./bin/yellowjacket"
|
||||||
dst: "/usr/local/bin/yjref"
|
dst: "/usr/local/bin/yellowjacket"
|
||||||
- src: "./build/appicon.png"
|
- src: "./build/appicon.png"
|
||||||
dst: "/usr/share/icons/hicolor/128x128/apps/yjref.png"
|
dst: "/usr/share/icons/hicolor/128x128/apps/yellowjacket.png"
|
||||||
- src: "./build/linux/yjref.desktop"
|
- src: "./build/linux/yellowjacket.desktop"
|
||||||
dst: "/usr/share/applications/yjref.desktop"
|
dst: "/usr/share/applications/yellowjacket.desktop"
|
||||||
|
|
||||||
# Default dependencies for the GTK4 + WebKitGTK 6.0 stack (Ubuntu 24.04+ / Debian 13+)
|
# Default dependencies for the GTK4 + WebKitGTK 6.0 stack (Ubuntu 24.04+ / Debian 13+)
|
||||||
depends:
|
depends:
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
{
|
{
|
||||||
"fixed": {
|
"fixed": {
|
||||||
"file_version": "0.1.0"
|
"file_version": "1.3.0"
|
||||||
},
|
},
|
||||||
"info": {
|
"info": {
|
||||||
"0000": {
|
"0000": {
|
||||||
"ProductVersion": "0.1.0",
|
"ProductVersion": "1.3.0",
|
||||||
"CompanyName": "My Company",
|
"CompanyName": "yellowjacket",
|
||||||
"FileDescription": "A yjref application",
|
"FileDescription": "Cross-platform desktop music player — local library, MusicBrainz explore & auto-tag",
|
||||||
"LegalCopyright": "© 2026, My Company",
|
"LegalCopyright": "(c) 2026, yellowjacket",
|
||||||
"ProductName": "My Product",
|
"ProductName": "yellowjacket",
|
||||||
"Comments": "This is a comment"
|
"Comments": "yj@yellowjacket.app"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,19 +5,19 @@
|
|||||||
!include "FileFunc.nsh"
|
!include "FileFunc.nsh"
|
||||||
|
|
||||||
!ifndef INFO_PROJECTNAME
|
!ifndef INFO_PROJECTNAME
|
||||||
!define INFO_PROJECTNAME "yjref"
|
!define INFO_PROJECTNAME "yellowjacket"
|
||||||
!endif
|
!endif
|
||||||
!ifndef INFO_COMPANYNAME
|
!ifndef INFO_COMPANYNAME
|
||||||
!define INFO_COMPANYNAME "My Company"
|
!define INFO_COMPANYNAME "yellowjacket"
|
||||||
!endif
|
!endif
|
||||||
!ifndef INFO_PRODUCTNAME
|
!ifndef INFO_PRODUCTNAME
|
||||||
!define INFO_PRODUCTNAME "My Product"
|
!define INFO_PRODUCTNAME "yellowjacket"
|
||||||
!endif
|
!endif
|
||||||
!ifndef INFO_PRODUCTVERSION
|
!ifndef INFO_PRODUCTVERSION
|
||||||
!define INFO_PRODUCTVERSION "0.1.0"
|
!define INFO_PRODUCTVERSION "1.3.0"
|
||||||
!endif
|
!endif
|
||||||
!ifndef INFO_COPYRIGHT
|
!ifndef INFO_COPYRIGHT
|
||||||
!define INFO_COPYRIGHT "© 2026, My Company"
|
!define INFO_COPYRIGHT "(c) 2026, yellowjacket"
|
||||||
!endif
|
!endif
|
||||||
!ifndef PRODUCT_EXECUTABLE
|
!ifndef PRODUCT_EXECUTABLE
|
||||||
!define PRODUCT_EXECUTABLE "${INFO_PROJECTNAME}.exe"
|
!define PRODUCT_EXECUTABLE "${INFO_PROJECTNAME}.exe"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
|
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
|
||||||
<assemblyIdentity type="win32" name="com.example.yjref" version="0.1.0" processorArchitecture="*"/>
|
<assemblyIdentity type="win32" name="app.yellowjacket" version="1.3.0" processorArchitecture="*"/>
|
||||||
<dependency>
|
<dependency>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
|
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
|
||||||
|
|||||||
+18
-5
@@ -46,17 +46,30 @@ build() {
|
|||||||
local commit
|
local commit
|
||||||
commit="$(git rev-parse --short HEAD)"
|
commit="$(git rev-parse --short HEAD)"
|
||||||
|
|
||||||
# `go tool wails/sqlc/templ` resolve from the tool directives in go.mod, so no
|
# `go tool wails3/sqlc/templ` resolve from the tool directives in go.mod, so
|
||||||
# extra CLIs are needed. Wails runs the frontend install+build itself.
|
# 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 generate ./...
|
||||||
go tool wails3 build -clean -trimpath \
|
go tool wails3 task build \
|
||||||
-ldflags "-s -w -X 'main.version=v$pkgver' -X 'main.commit=$commit'"
|
LDFLAGS_EXTRA="-X 'main.version=v$pkgver' -X 'main.commit=$commit'"
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
cd "$srcdir/$pkgname"
|
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" \
|
install -Dm644 "$srcdir/yellowjacket.desktop" \
|
||||||
"$pkgdir/usr/share/applications/yellowjacket.desktop"
|
"$pkgdir/usr/share/applications/yellowjacket.desktop"
|
||||||
|
|
||||||
|
|||||||
@@ -3,9 +3,10 @@
|
|||||||
|
|
||||||
# YellowJacket — cross-platform desktop music player built with Wails (Go + Lit).
|
# YellowJacket — cross-platform desktop music player built with Wails (Go + Lit).
|
||||||
#
|
#
|
||||||
# This formula builds from source. The Wails toolchain (`go tool wails`) resolves
|
# This formula builds from source. The Wails toolchain (`go tool wails3`)
|
||||||
# from the tool directives in go.mod, and Wails drives the frontend install/build
|
# resolves from the tool directives in go.mod, and Wails drives the frontend
|
||||||
# itself (pnpm), so only the Go toolchain, Node, and pnpm are needed at build time.
|
# 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
|
# 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
|
# tarball checksum and syncs an updated copy into the homebrew-yellowjacket tap
|
||||||
@@ -26,7 +27,10 @@ class Yellowjacket < Formula
|
|||||||
depends_on "pnpm" => :build
|
depends_on "pnpm" => :build
|
||||||
|
|
||||||
# Wails targets macOS and Linux. On Linux, Homebrew builds against the system
|
# 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
|
on_linux do
|
||||||
depends_on "pkg-config" => :build
|
depends_on "pkg-config" => :build
|
||||||
end
|
end
|
||||||
@@ -37,24 +41,34 @@ class Yellowjacket < Formula
|
|||||||
ENV["GOFLAGS"] = "-mod=mod"
|
ENV["GOFLAGS"] = "-mod=mod"
|
||||||
|
|
||||||
commit = build.head? ? "HEAD" : "v#{version}"
|
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", "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
|
# `task build` produces a bare binary in bin/ on both platforms; the .app
|
||||||
# bundle is named after `outputfilename` in wails.json; glob for it so a
|
# bundle is `task package`, which is a separate step in v3.
|
||||||
# rename (or casing difference) can't silently break the install.
|
|
||||||
if OS.mac?
|
if OS.mac?
|
||||||
app = Dir["build/bin/*.app"].first
|
system "go", "tool", "wails3", "task", "package",
|
||||||
odie "wails build produced no .app bundle in build/bin" if app.nil?
|
"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
|
prefix.install app
|
||||||
exe = Dir[prefix/"*.app/Contents/MacOS/*"].find { |f| File.executable?(f) }
|
exe = Dir[prefix/"*.app/Contents/MacOS/*"].find { |f| File.executable?(f) }
|
||||||
bin.write_exec_script exe
|
bin.write_exec_script exe
|
||||||
else
|
else
|
||||||
bin.install "build/bin/yellowjacket"
|
system "go", "tool", "wails3", "task", "build",
|
||||||
|
"LDFLAGS_EXTRA=#{ldflags_extra}"
|
||||||
|
bin.install "bin/yellowjacket"
|
||||||
end
|
end
|
||||||
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
|
- **License**: declared as `license :cannot_represent` (custom license). Replace
|
||||||
with the correct SPDX identifier once the license is finalized.
|
with the correct SPDX identifier once the license is finalized.
|
||||||
- **macOS vs Linux**: `wails build` produces a `YellowJacket.app` bundle on
|
- **macOS vs Linux**: under Wails v3 the bundling is a separate step from the
|
||||||
macOS (installed under the Cellar with an `exec` shim in `bin`) and a bare
|
build. `wails3 task build` produces a bare `yellowjacket` binary in `bin/` on
|
||||||
`yellowjacket` binary on Linux (installed to `bin`).
|
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
|
- **Linuxbrew**: building on Linux additionally needs the system WebKitGTK/GTK
|
||||||
stack (`webkit2gtk-4.1`, `gtk3`, `alsa-lib`) — OS packages, not Homebrew deps.
|
stack (`webkitgtk-6.0`, `gtk4`, `alsa-lib`) — OS packages, not Homebrew deps.
|
||||||
macOS needs only the Xcode Command Line Tools.
|
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,
|
- **Cask alternative**: if you later ship prebuilt macOS `.dmg`/`.zip` artifacts,
|
||||||
a Homebrew *cask* pointing at those installs faster than this source build.
|
a Homebrew *cask* pointing at those installs faster than this source build.
|
||||||
This formula is the source-build path.
|
This formula is the source-build path.
|
||||||
|
|||||||
Reference in New Issue
Block a user