skeleton: bring AppImage parity, scaffolded apps inherit the packaging flow
The v0.1.0 shakedown fixes for AppImage assembly (path-repo
symlink:false sed, writable-cache redirect) all landed in
examples/todo. The skeleton — which is what bin/php-qml-init copies
when scaffolding a new app — had no `appimage` target at all, so every
scaffolded app would have to either copy the example's Makefile by
hand or re-discover the same shakedown bugs.
Brings parity:
- framework/skeleton/Makefile gains `staging-symfony` and `appimage`
targets, mirroring the example's. Two new variables (BUNDLE_SRC,
PACKAGING) parameterise the framework-tree paths so bin/php-qml-init
can rewrite them at scaffold time without sed-touching the recipe.
- framework/skeleton/packaging/skeleton.{desktop,png} added — minimum
surface for the AppImage assembly to succeed without the user
needing to author them.
- framework/skeleton/Makefile's staging-symfony recipe handles both
relative (framework default `../../php`) and absolute (post-scaffold)
BUNDLE_SRC values via a case statement.
- bin/php-qml-init renames packaging/skeleton.* → packaging/$NAME.*,
rewrites the .desktop file's Name/Exec/Icon, and updates the
Makefile's --app-name / --output / --desktop / --icon flags +
BUNDLE_SRC + PACKAGING variables. For --vendor mode, framework's
packaging/linux/ is also vendored to .bridge-packaging/ alongside
the existing .bridge/ + .bridge-qml/.
Verified by scaffolding both modes:
- non-vendored: BUNDLE_SRC + PACKAGING absolute paths
- --vendor: BUNDLE_SRC=../.bridge, PACKAGING=.bridge-packaging,
.bridge-packaging/ contains build-appimage.sh
Skeleton's `make quality` still green; staging-symfony works locally
(vendor/php-qml/bridge resolves to a real directory, not a symlink).
Closes the v0.1.1 follow-up "bin/php-qml-init parity" tracked in
PLAN.md §13.
Bundled drive-by: docs/makers.md picked up two markdownlint auto-fixes
(blank lines around lists) when the IDE saved.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -6,6 +6,11 @@ SYMFONY_DIR := symfony
|
||||
QML_SRC_DIR := qml
|
||||
BUILD_DIR := build/qml
|
||||
QT_BIN := $(BUILD_DIR)/skeleton
|
||||
# Path to framework/php (path-repo source) and packaging/linux (build-appimage.sh).
|
||||
# Both are framework-tree relative; bin/php-qml-init rewrites them at scaffold time
|
||||
# to either an absolute framework path (default) or a vendored copy under .bridge/.
|
||||
BUNDLE_SRC := ../../php
|
||||
PACKAGING := ../../packaging/linux
|
||||
|
||||
.PHONY: help
|
||||
help: ## Show available targets
|
||||
@@ -34,7 +39,43 @@ doctor-connect: ## Run bridge:doctor with backend connectivity probe
|
||||
|
||||
.PHONY: clean
|
||||
clean: ## Remove build artefacts
|
||||
rm -rf $(BUILD_DIR)
|
||||
rm -rf $(BUILD_DIR) build/staging-symfony
|
||||
|
||||
.PHONY: staging-symfony
|
||||
staging-symfony: ## Stage a --no-dev composer copy of symfony for AppImage assembly
|
||||
# See examples/todo/Makefile for the rationale; same logic, mirrored here
|
||||
# so scaffolded apps inherit a working AppImage flow without copy-paste.
|
||||
# BUNDLE_SRC may be absolute (after `php-qml-init` rewrites it for a
|
||||
# scaffolded app) or relative-to-symfony (framework default `../../php`);
|
||||
# the case-statement handles both.
|
||||
rm -rf build/staging-symfony
|
||||
rsync -a --delete \
|
||||
--exclude='vendor/' \
|
||||
--exclude='var/cache/' --exclude='var/log/' \
|
||||
$(SYMFONY_DIR)/ build/staging-symfony/
|
||||
set -e; case "$(BUNDLE_SRC)" in \
|
||||
/*) BUNDLE_ABS="$(BUNDLE_SRC)" ;; \
|
||||
*) BUNDLE_ABS="$$(cd $(SYMFONY_DIR)/$(BUNDLE_SRC) && pwd)" ;; \
|
||||
esac; \
|
||||
sed -i "s|\"$(BUNDLE_SRC)\"|\"$$BUNDLE_ABS\"|" build/staging-symfony/composer.json
|
||||
sed -i 's|"symlink": true|"symlink": false|' build/staging-symfony/composer.json
|
||||
rm -f build/staging-symfony/composer.lock
|
||||
cd build/staging-symfony && composer install --no-dev --no-interaction --classmap-authoritative
|
||||
|
||||
.PHONY: appimage
|
||||
appimage: build staging-symfony ## Package as a single-file Linux AppImage at build/Skeleton-x86_64.AppImage
|
||||
$(PACKAGING)/build-appimage.sh \
|
||||
--app-name skeleton \
|
||||
--host-binary $(QT_BIN) \
|
||||
--symfony-dir build/staging-symfony \
|
||||
--frankenphp $${FRANKENPHP:-frankenphp} \
|
||||
--caddyfile Caddyfile \
|
||||
--desktop packaging/skeleton.desktop \
|
||||
--icon packaging/skeleton.png \
|
||||
--output build/Skeleton-x86_64.AppImage \
|
||||
$${APPIMAGE_UPDATE_INFO:+--update-info "$$APPIMAGE_UPDATE_INFO"}
|
||||
@echo
|
||||
@echo "AppImage built. Test with: ./build/Skeleton-x86_64.AppImage"
|
||||
|
||||
.PHONY: quality
|
||||
quality: build ## Run PHPStan, php-cs-fixer (check), PHPUnit, qmllint, maker snapshots
|
||||
|
||||
8
framework/skeleton/packaging/skeleton.desktop
Normal file
8
framework/skeleton/packaging/skeleton.desktop
Normal file
@@ -0,0 +1,8 @@
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=php-qml Skeleton
|
||||
Comment=php-qml application scaffold (replace with your own)
|
||||
Exec=skeleton
|
||||
Icon=skeleton
|
||||
Categories=Utility;
|
||||
Terminal=false
|
||||
BIN
framework/skeleton/packaging/skeleton.png
Normal file
BIN
framework/skeleton/packaging/skeleton.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 209 B |
Reference in New Issue
Block a user