use foundry

Author: sonnyp

.eslintignore

@@ -1,4 +1,3 @@
 src/lib
 troll
-flatpak
 demos

.foundry/.gitignore

@@ -0,0 +1,3 @@
+tmp/
+user/
+cache/

.gitignore

@@ -1,23 +1 @@
-.flatpak
-.flatpak-builder
-build
-builddir
-/flatpak
 node_modules
-repo
-install
-.eslintcache
-*~
-*.compiled
-*.flatpak
-.fenv
-.venv
-__pycache__
-*.pyc
-*.gresource
-.frun
-
-# IDEs / editors
-.idea
-
-target

CONTRIBUTING.md

@@ -65,16 +65,6 @@ See also
 
 Workbench doesn't currently support translations for its user interface. GNOME documentation is only available in English and we do not want to mislead non-English speakers.
 
-<!--
-If you'd like to help translating Workbench into your language, please head over to [Weblate](https://hosted.weblate.org/engage/workbench/).
-
-<a href="https://hosted.weblate.org/engage/workbench/">
-  <img src="https://hosted.weblate.org/widgets/workbench/-/workbench/multi-auto.svg" alt="Translation status" />
-</a>
-
-Thank you for your help!
--->
-
 ## Troubleshooting
 
 ### The app won't build/run anymore - even on clean `main`

Makefile

@@ -1,4 +1,5 @@
 SHELL:=/bin/bash -O globstar
+ROOT := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
 .PHONY: setup build lint unit test ci sandbox flatpak
 .DEFAULT_GOAL := setup
 
@@ -13,41 +14,38 @@ setup:
 	@echo "✅ You can use "make build" to build Workbench"
 
 stable:
-# flatpak --user run org.flatpak.Builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.json
-	flatpak-builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.json
+	foundry build build-aux/re.sonny.Workbench.json
 
 devel:
-# flatpak --user run org.flatpak.Builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
-	flatpak-builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
-
+	foundry build build-aux/re.sonny.Workbench.json build-aux/re.sonny.Workbench.Devel.json
 
 build: devel
 
 cli:
 	./troll/gjspack/bin/gjspack src/cli/main.js --appid=re.sonny.Workbench.cli --prefix=/re/sonny/Workbench --resource-root=src/ --no-executable flatpak/files/share/re.sonny.Workbench.cli/
-	cp src/cli/bin.js flatpak/files/bin/workbench-cli
+	cp src/cli/bin.js flatpak/files/bin/workbench-cli # FIXME
 
 lint:
 # JavaScript
 	./node_modules/.bin/eslint --max-warnings=0 src
 # Rust
-	./build-aux/fun rustfmt --check --edition 2021 src/**/*.rs
+	foundry devenv -- rustfmt --check --edition 2021 $(ROOT)/src/**/*.rs
 # Python
-	./build-aux/fun ruff check --config=src/langs/python/ruff.toml src/**/*.py
-	./build-aux/fun ruff format --config=src/langs/python/ruff.toml --check src/**/*.py
+	foundry devenv -- ruff check --config=$(ROOT)/src/langs/python/ruff.toml $(ROOT)/src/**/*.py
+	foundry devenv -- ruff format --config=$(ROOT)/src/langs/python/ruff.toml --check $(ROOT)/src/**/*.py
 # Blueprint
-	./build-aux/fun blueprint-compiler format src/**/*.blp
-	./build-aux/fun workbench-cli check blueprint src/**/*.blp
+	foundry devenv -- blueprint-compiler format $(ROOT)/src/**/*.blp
+	foundry devenv -- workbench-cli check blueprint $(ROOT)/src/**/*.blp
 # Vala
-# ./build-aux/fun workbench-cli check vala src/**/*.vala
+	# foundry run -- workbench-cli check vala src/**/*.vala
 # CSS
-	./build-aux/fun workbench-cli check css src/**/*.css
+	foundry run -- workbench-cli check css $(ROOT)/src/**/*.css
 # Flatpak manifests
 	flatpak run --user --command=flatpak-builder-lint org.flatpak.Builder manifest --exceptions --user-exceptions ./build-aux/exceptions.json build-aux/re.sonny.Workbench.json
 	flatpak run --user --command=flatpak-builder-lint org.flatpak.Builder manifest --exceptions --user-exceptions ./build-aux/exceptions.json build-aux/re.sonny.Workbench.Devel.json
 
 unit:
-	./build-aux/fun gjs -m ./troll/tst/bin.js test/*.test.js
+	foundry run -- gjs -m $(ROOT)/troll/tst/bin.js $(ROOT)/test/*.test.js
 #./build-aux/wip/run.js build-aux/re.sonny.Workbench.Devel.json -- gjs -m ./troll/tst/bin.js test/*.test.js
 
 # https://github.com/ximion/appstream/issues/398#issuecomment-1129454985
@@ -61,20 +59,20 @@ unit:
 # flatpak run --env=G_DEBUG=fatal-criticals --command=appstream-util org.flatpak.Builder validate data/app.metainfo.xml
 
 test: unit lint
-	./build-aux/fun workbench-cli ci demos/src/Welcome
+	foundry run -- workbench-cli ci $(ROOT)/demos/src/Welcome
 #	./build-aux/wip/run.js build-aux/re.sonny.Workbench.Devel.json -- workbench-cli ci demos/src/Welcome/
 
 ci: setup build test
 # See Permissions.js
 # flatpak override --user --share=network --socket=pulseaudio --device=input re.sonny.Workbench.Devel
-	./build-aux/fun workbench-cli ci demos/src/*
+	foundry run -- workbench-cli ci $(ROOT)/demos/src/*
 
-# Note that if you have Sdk extensions installed they will be used
-# make sure to test without the sdk extensions installed
-sandbox: setup
-	flatpak run org.flatpak.Builder --ccache --user --install --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
-# flatpak remove --noninteractive org.freedesktop.Sdk.Extension.rust-stable//24.08 org.freedesktop.Sdk.Extension.vala//24.08 org.freedesktop.Sdk.Extension.llvm20//24.08
-	flatpak run --command="bash" re.sonny.Workbench.Devel
+# # Note that if you have Sdk extensions installed they will be used
+# # make sure to test without the sdk extensions installed
+# sandbox: setup
+# 	flatpak run org.flatpak.Builder --ccache --user --install --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
+# # flatpak remove --noninteractive org.freedesktop.Sdk.Extension.rust-stable//24.08 org.freedesktop.Sdk.Extension.vala//24.08 org.freedesktop.Sdk.Extension.llvm20//24.08
+# 	flatpak run --command="bash" re.sonny.Workbench.Devel
 
 flatpak:
 	flatpak run org.flatpak.Builder --ccache --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
@@ -83,14 +81,3 @@ flatpak:
 	flatpak run --command="desktop-file-validate" --filesystem=host:ro org.freedesktop.Sdk//24.08 flatpak/files/share/applications/re.sonny.Workbench.Devel.desktop
 # appstreamcli validate --override=release-time-missing=info /path/to/your/app.metainfo.xml
 	flatpak run org.flatpak.Builder --run flatpak build-aux/re.sonny.Workbench.Devel.json bash
-
-# Sync with .gitignore
-clean:
-	rm -f re.sonny.Workbench.Devel.flatpak
-	rm -f re.sonny.Workbench.flatpak
-	rm -rf _build
-	rm -rf .flatpak
-	rm -rf .flatpak-builder
-	rm -rf flatpak
-	rm -rf flatpak-builder
-	rm -rf repo

Workbench.doap

@@ -23,7 +23,7 @@
   <maintainer>
     <foaf:Person>
       <foaf:name>Sonny Piers</foaf:name>
-      <foaf:mbox rdf:resource="mailto:sonnyp@gnome.org" />
+      <foaf:mbox rdf:resource="mailto:workbench@sonny.re" />
       <gnome:userid>sonnyp</gnome:userid>
       <foaf:account>
         <foaf:OnlineAccount>

build-aux/fun

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
 
 # fun stands for Flatpak Run
-flatpak-builder --run $(dirname $0)/../flatpak $(dirname $0)/re.sonny.Workbench.Devel.json "$@"
+flatpak-builder --run $(dirname $0)/../.foundry/cache/flatpak $(dirname $0)/re.sonny.Workbench.Devel.json "$@"
 # flatpak-builder --env=G_MESSAGES_DEBUG=workbench-cli --run flatpak build-aux/re.sonny.Workbench.Devel.json "$@"