magdev
fddb70f877
Wires in the option-(a) sidecar approach: the AppImage carries a
bundled AppImageUpdate AppImage and an embedded update-info string
in the .upd_info ELF section. BackendConnection drives both the
check and the apply via QProcess.
BackendConnection:
- Q_INVOKABLE checkForUpdates()
Bundled mode only. Spawns AppImageUpdate.AppImage with
--check-for-update <APPIMAGE>. Exits 0 → noUpdatesAvailable,
1 → updatesAvailable, anything else → updateCheckFailed.
Dev mode: emits updateCheckFailed("…dev-mode only").
- Q_INVOKABLE applyUpdate()
Bundled mode only. Spawns AppImageUpdate.AppImage with
--remove-old <APPIMAGE>. Replaces the running AppImage in
place; user must restart. Emits updateApplied or
updateApplyFailed.
- Sidecar path resolves to applicationDirPath()/AppImageUpdate.AppImage
by default, overridable via BRIDGE_APPIMAGEUPDATE_BIN.
- APPIMAGE env (set by the AppImage runtime) determines the target
file. Outside an AppImage both methods fail loudly.
build-appimage.sh:
- Auto-downloads AppImageUpdate-x86_64.AppImage into the cached
tools dir and copies it into AppDir/usr/bin/AppImageUpdate.AppImage.
- New --update-info flag, forwarded to appimagetool's -u so the
.upd_info ELF section carries an "zsync|<URL>" string the sidecar
will fetch.
examples/todo Makefile forwards APPIMAGE_UPDATE_INFO env to the
script as --update-info.
release.yml:
- Builds the AppImage with APPIMAGE_UPDATE_INFO set to the canonical
Gitea Releases asset URL for this tag.
- Installs zsync, runs zsyncmake to generate Todo-x86_64.AppImage.zsync.
- Generates a JSON appcast (latest.json) with version / url / sha256 /
size / zsync URL / released_at — useful as an HTTP-fetchable
fallback for clients that prefer a structured manifest.
- SHA256SUMS now covers AppImage + zsync + latest.json.
- Uploads all four assets to the Gitea Release.
AppImage size grows from ~104 MB to ~152 MB with the sidecar bundled.
Embedding verified: objdump shows .upd_info populated with the
expected zsync URL after a local build.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
76 lines
2.6 KiB
Makefile
76 lines
2.6 KiB
Makefile
# php-qml — Todo example app — Make targets.
|
|
|
|
.DEFAULT_GOAL := help
|
|
|
|
SYMFONY_DIR := symfony
|
|
QML_SRC_DIR := qml
|
|
BUILD_DIR := build/qml
|
|
QT_BIN := $(BUILD_DIR)/todo
|
|
|
|
.PHONY: help
|
|
help: ## Show available targets
|
|
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf " %-12s %s\n", $$1, $$2}' $(MAKEFILE_LIST)
|
|
|
|
.PHONY: install
|
|
install: ## Install Composer dependencies for the Symfony app
|
|
cd $(SYMFONY_DIR) && composer install
|
|
|
|
.PHONY: build
|
|
build: ## Build the Qt host
|
|
cmake -S $(QML_SRC_DIR) -B $(BUILD_DIR) -DCMAKE_BUILD_TYPE=Debug
|
|
cmake --build $(BUILD_DIR) --parallel
|
|
|
|
.PHONY: dev
|
|
dev: build ## Run the todo app in dev mode (FrankenPHP --watch + Qt host)
|
|
./scripts/dev.sh
|
|
|
|
.PHONY: doctor
|
|
doctor: ## Run bridge:doctor inside the Symfony app
|
|
cd $(SYMFONY_DIR) && bin/console bridge:doctor
|
|
|
|
.PHONY: doctor-connect
|
|
doctor-connect: ## Run bridge:doctor with backend connectivity probe
|
|
cd $(SYMFONY_DIR) && bin/console bridge:doctor --connect
|
|
|
|
.PHONY: clean
|
|
clean: ## Remove build artefacts
|
|
rm -rf $(BUILD_DIR)
|
|
|
|
.PHONY: integration
|
|
integration: ## Run the bridge-integration test (FrankenPHP boot + HTTP/SSE round-trip + crash-recover)
|
|
./tests/integration.sh
|
|
|
|
.PHONY: appimage
|
|
appimage: build ## Package as a single-file Linux AppImage at build/Todo-x86_64.AppImage
|
|
# Composer install --no-dev in a staging copy of symfony so the
|
|
# dev tree (with maker-bundle etc.) is left untouched.
|
|
rm -rf build/staging-symfony
|
|
rsync -a --delete \
|
|
--exclude='vendor/' \
|
|
--exclude='var/cache/' --exclude='var/log/' \
|
|
$(SYMFONY_DIR)/ build/staging-symfony/
|
|
# Rewrite the path repo to absolute so composer can find the bundle
|
|
# from the staging dir (different relative depth than the source tree).
|
|
BUNDLE_ABS="$$(cd $(SYMFONY_DIR)/../../../framework/php && pwd)"; \
|
|
sed -i "s|\"../../../framework/php\"|\"$$BUNDLE_ABS\"|" build/staging-symfony/composer.json
|
|
rm -f build/staging-symfony/composer.lock
|
|
cd build/staging-symfony && composer install --no-dev --no-interaction --classmap-authoritative
|
|
../../packaging/linux/build-appimage.sh \
|
|
--app-name todo \
|
|
--host-binary $(QT_BIN) \
|
|
--symfony-dir build/staging-symfony \
|
|
--frankenphp $${FRANKENPHP:-frankenphp} \
|
|
--caddyfile Caddyfile \
|
|
--desktop packaging/todo.desktop \
|
|
--icon packaging/todo.png \
|
|
--output build/Todo-x86_64.AppImage \
|
|
$${APPIMAGE_UPDATE_INFO:+--update-info "$$APPIMAGE_UPDATE_INFO"}
|
|
@echo
|
|
@echo "AppImage built. Test with: ./build/Todo-x86_64.AppImage"
|
|
|
|
.PHONY: quality
|
|
quality: build ## Run PHPStan, php-cs-fixer (check), PHPUnit, qmllint, integration
|
|
cd ../../framework/php && composer quality
|
|
cmake --build $(BUILD_DIR) --target all_qmllint
|
|
./tests/integration.sh
|