From 82717acd678cc4e0ab99521295e1167c18350bf7 Mon Sep 17 00:00:00 2001 From: Zsolt Tasnadi Date: Sun, 2 Aug 2026 22:07:39 +0200 Subject: [PATCH] mac targets a template-ben: .app bundle, ad-hoc codesign, mac-release flow Co-Authored-By: Claude Fable 5 --- README.md | 22 +++++++++++-- example-makefile.make | 76 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 94 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 41259ac..b00a6b2 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,26 @@ them to the release as assets (see `teletypegames/NOTES_BINARY_PLAN.md`). Binary zip layout: a single root folder (`$(PROJECT)-$(VERSION)-/`) containing the executable (plus LICENSE/README.md when present). The zips are created with unix `zip`, -so the executable bit survives on the linux binary. mac targets need a -mac runner (or osxcross) and are not part of the pipeline yet. +so the executable bit survives on the linux binary. + +## mac targets (mac-x64, mac-arm64) + +Ebitengine requires cgo on darwin (GLFW/Metal — purego does not cover +it), so the mac targets cannot be cross-compiled from the linux builder. +They are built **on a mac host** instead, packaged as a minimal +`.app` bundle (generated Info.plist, ad-hoc `codesign`): + +```sh +make mac-release VERSION=x.y.z \ + DROPAREA_SSH_PASSWORD=... UPDATE_SECRET=... +``` + +This builds both mac zips, uploads them to the droparea and re-triggers +`/update` — the updater attaches the new assets to the already existing +release, so run it after the CI pipeline has created the release. +Ad-hoc signature means Gatekeeper shows the "unidentified developer" +warning (right-click → Open); proper signing/notarization needs an +Apple Developer account. ## Builder image diff --git a/example-makefile.make b/example-makefile.make index 912cafb..ce41384 100644 --- a/example-makefile.make +++ b/example-makefile.make @@ -15,6 +15,13 @@ OUTPUT_ZIP = $(PROJECT)-$(VERSION).html.zip VERSION_FILE = .version INDEX_HTML_URL = https://git.teletypegames.org/tools/ebitengine-tools/raw/branch/master/web/index.html +# a mac-release lokális futtatásához (CI-ban a woodpecker env adja ugyanezeket) +DROPAREA_HOST ?= vps.teletype.hu +DROPAREA_PORT ?= 2223 +DROPAREA_USER ?= drop +DROPAREA_TARGET_PATH ?= /home/drop +UPDATE_SERVER ?= https://teletypegames.org + all: build build: @@ -40,7 +47,12 @@ export: wasm # --- native binaries (lásd: teletypegames/NOTES_BINARY_PLAN.md) ------------- # win-x86 / win-x64: pure Go cross-compile (Windowson nem kell cgo) # linux-x64: cgo build, linux/amd64 hoston fut (builder image, X11/GL dev libekkel) +# a CI (linux builder) ezt a hármat építi: BINARY_TARGETS = win-x86 win-x64 linux-x64 +# mac-x64 / mac-arm64: az Ebitengine darwinon cgo-t igényel (GLFW/Metal), +# ezért ezek CSAK mac hoston építhetők: `make binaries-mac VERSION=x.y.z`, +# feltöltés + release frissítés: `make mac-release VERSION=x.y.z` +MAC_TARGETS = mac-x64 mac-arm64 binaries: @if [ -z "$(VERSION)" ]; then \ @@ -50,6 +62,17 @@ binaries: $(MAKE) binary-$$target VERSION=$(VERSION) || exit 1; \ done +binaries-mac: + @if [ -z "$(VERSION)" ]; then \ + echo "ERROR: VERSION not set!"; exit 1; \ + fi + @if [ "$$(uname -s)" != "Darwin" ]; then \ + echo "ERROR: a mac targetek csak mac hoston építhetők (cgo + SDK kell)"; exit 1; \ + fi + @for target in $(MAC_TARGETS); do \ + $(MAKE) binary-$$target VERSION=$(VERSION) || exit 1; \ + done + binary-win-x86: @$(MAKE) binary-build VERSION=$(VERSION) B_GOOS=windows B_GOARCH=386 B_CGO=0 B_EXT=.exe B_TARGET=win-x86 @@ -59,10 +82,27 @@ binary-win-x64: binary-linux-x64: @$(MAKE) binary-build VERSION=$(VERSION) B_GOOS=linux B_GOARCH=amd64 B_CGO=1 B_EXT= B_TARGET=linux-x64 +binary-mac-x64: + @$(MAKE) binary-build-mac VERSION=$(VERSION) B_GOARCH=amd64 B_TARGET=mac-x64 + +binary-mac-arm64: + @$(MAKE) binary-build-mac VERSION=$(VERSION) B_GOARCH=arm64 B_TARGET=mac-arm64 + +# macről futtatandó: felépíti mindkét mac zipet, feltölti a dropareába, majd +# meghívja az /update-et, ami a meglévő release-hez hozzáfűzi az asseteket +mac-release: binaries-mac + @FILES=""; \ + for target in $(MAC_TARGETS); do FILES="$$FILES $(PROJECT)-$(VERSION)-$$target.zip"; done; \ + sshpass -p "$(DROPAREA_SSH_PASSWORD)" scp -o StrictHostKeyChecking=no -P $(DROPAREA_PORT) \ + $$FILES \ + $(DROPAREA_USER)@$(DROPAREA_HOST):$(DROPAREA_TARGET_PATH)/; \ + curl "$(UPDATE_SERVER)/update?secret=$(UPDATE_SECRET)&name=$(PROJECT)&platform=ebitengine&version=$(VERSION)" + # belső helper: egy target buildje + zip egyetlen gyökérmappával # (a zipet unixos zip készíti, így a végrehajtási bit megmarad) binary-build: - @PKG_DIR="$(PROJECT)-$(VERSION)-$(B_TARGET)"; \ + @set -e; \ + PKG_DIR="$(PROJECT)-$(VERSION)-$(B_TARGET)"; \ echo "==> Building $$PKG_DIR"; \ rm -rf "$$PKG_DIR" "$$PKG_DIR.zip"; \ mkdir -p "$$PKG_DIR"; \ @@ -73,6 +113,38 @@ binary-build: rm -rf "$$PKG_DIR"; \ echo "==> $$PKG_DIR.zip kesz" +# mac helper: .app bundle Info.plist-tel, ad-hoc aláírással, egy gyökérmappában +binary-build-mac: + @set -e; \ + PKG_DIR="$(PROJECT)-$(VERSION)-$(B_TARGET)"; \ + APP_DIR="$$PKG_DIR/$(PROJECT).app"; \ + echo "==> Building $$PKG_DIR"; \ + rm -rf "$$PKG_DIR" "$$PKG_DIR.zip"; \ + mkdir -p "$$APP_DIR/Contents/MacOS"; \ + CGO_ENABLED=1 GOOS=darwin GOARCH=$(B_GOARCH) go build -o "$$APP_DIR/Contents/MacOS/$(PROJECT)" .; \ + { \ + echo ''; \ + echo ''; \ + echo ''; \ + echo ''; \ + echo ' CFBundleExecutable$(PROJECT)'; \ + echo ' CFBundleIdentifierorg.teletypegames.$(PROJECT)'; \ + echo ' CFBundleName$(PROJECT)'; \ + echo ' CFBundlePackageTypeAPPL'; \ + echo ' CFBundleShortVersionString$(VERSION)'; \ + echo ' CFBundleVersion$(VERSION)'; \ + echo ' LSMinimumSystemVersion11.0'; \ + echo ' NSHighResolutionCapable'; \ + echo ''; \ + echo ''; \ + } > "$$APP_DIR/Contents/Info.plist"; \ + codesign --force --deep -s - "$$APP_DIR"; \ + if [ -f LICENSE ]; then cp LICENSE "$$PKG_DIR/"; fi; \ + if [ -f README.md ]; then cp README.md "$$PKG_DIR/"; fi; \ + zip -r "$$PKG_DIR.zip" "$$PKG_DIR" >/dev/null; \ + rm -rf "$$PKG_DIR"; \ + echo "==> $$PKG_DIR.zip kesz" + watch: fswatch -o . | while read; do make build; done @@ -114,4 +186,4 @@ ci-update: @VERSION=$$(cat $(VERSION_FILE)); \ curl "$(UPDATE_SERVER)/update?secret=$(UPDATE_SECRET)&name=$(PROJECT)&platform=ebitengine&version=$$VERSION" -.PHONY: all build wasm export watch clean binaries binary-win-x86 binary-win-x64 binary-linux-x64 binary-build ci-version ci-export ci-binaries ci-upload ci-update \ No newline at end of file +.PHONY: all build wasm export watch clean binaries binaries-mac mac-release binary-win-x86 binary-win-x64 binary-linux-x64 binary-mac-x64 binary-mac-arm64 binary-build binary-build-mac ci-version ci-export ci-binaries ci-upload ci-update \ No newline at end of file