davidgiven · davidgiven · Mar 16, 2025 · Nov 10, 2024 · Mar 15, 2025 · Mar 16, 2025
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -38,38 +38,38 @@ jobs:
         name: ${{ github.event.repository.name }}.osx.${{ github.sha }}
         path: bin/WordGrinder-0.9-setup.pkg
 
-  build-haiku:
-    runs-on: ubuntu-latest
-    container: 'docker.io/hectorm/qemu-haiku:latest'
-    steps:
-      - name: vmstart
-        run: 'container-init & timeout 600 vmshell exit 0'
+  #build-haiku:
+  #  runs-on: ubuntu-latest
+  #  container: 'docker.io/hectorm/qemu-haiku:latest'
+  #  steps:
+  #    - name: vmstart
+  #      run: 'container-init & timeout 600 vmshell exit 0'
 
-      - name: pkgman
-        run: 'vmshell pkgman install -y make glfw_devel pkgconfig zlib_devel ncurses6_devel vim gcc pillow_python310'
+  #    - name: pkgman
+  #      run: 'vmshell pkgman install -y make glfw_devel pkgconfig zlib_devel ncurses6_devel vim gcc pillow_python310'
 
-      - uses: 'actions/checkout@main'
+  #    - uses: 'actions/checkout@main'
 
-      - name: "copy to VM"
-        run: 'vmshell mkdir ./src/; tar -cf - ./ | vmshell tar -xf - -C ./src/'
+  #    - name: "copy to VM"
+  #      run: 'vmshell mkdir ./src/; tar -cf - ./ | vmshell tar -xf - -C ./src/'
 
-      - name: build
-        run: 'vmshell make -C ./src/ -j1'
+  #    - name: build
+  #      run: 'vmshell make -C ./src/ -j1'
 
   build-windows:
     runs-on: windows-latest
 
     steps:
     - name: setup WSL
       run: |
-        curl -L https://github.com/WhitewaterFoundry/Fedora-Remix-for-WSL/releases/download/39.0.1/Fedora-Remix-for-WSL-SL_39.0.1.0_x64_arm64.msixbundle -o fedora.msixbundle
-        unzip fedora.msixbundle Fedora-Remix-for-WSL-SL_39.0.1.0_x64.msix
-        unzip Fedora-Remix-for-WSL-SL_39.0.1.0_x64.msix install.tar.gz
+        curl -L https://github.com/WhitewaterFoundry/Fedora-Remix-for-WSL/releases/download/41.0.0/Fedora-Remix-for-WSL-SL_41.0.0.0_x64_arm64.msixbundle -o fedora.msixbundle
+        unzip fedora.msixbundle Fedora-Remix-for-WSL-SL_41.0.0.0_x64.msix
+        unzip Fedora-Remix-for-WSL-SL_41.0.0.0_x64.msix install.tar.gz
         wsl --update
         wsl --import fedora fedora install.tar.gz
         wsl --set-default fedora
-        wsl sh -c 'dnf -y install https://github.com/rpmsphere/noarch/raw/master/r/rpmsphere-release-38-1.noarch.rpm'
-        wsl sh -c 'dnf -y install --setop=install_weak_deps=False gcc gcc-c++ mingw32-gcc mingw32-gcc-c++ mingw32-zlib-static mingw32-nsis python3-pillow'
+        wsl sh -c 'dnf -y install https://github.com/rpmsphere/noarch/raw/master/r/rpmsphere-release-40-1.noarch.rpm'
+        wsl sh -c 'dnf -y install --setopt=install_weak_deps=False gcc gcc-c++ mingw32-gcc mingw32-gcc-c++ mingw32-zlib-static mingw32-nsis python3-pillow'
 
     - name: fix line endings
       run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,14 +17,14 @@ jobs:
     steps:
     - name: setup WSL
       run: |
-        curl -L https://github.com/WhitewaterFoundry/Fedora-Remix-for-WSL/releases/download/39.0.1/Fedora-Remix-for-WSL-SL_39.0.1.0_x64_arm64.msixbundle -o fedora.msixbundle
-        unzip fedora.msixbundle Fedora-Remix-for-WSL-SL_39.0.1.0_x64.msix
-        unzip Fedora-Remix-for-WSL-SL_39.0.1.0_x64.msix install.tar.gz
+        curl -L https://github.com/WhitewaterFoundry/Fedora-Remix-for-WSL/releases/download/41.0.0/Fedora-Remix-for-WSL-SL_41.0.0.0_x64_arm64.msixbundle -o fedora.msixbundle
+        unzip fedora.msixbundle Fedora-Remix-for-WSL-SL_41.0.0.0_x64.msix
+        unzip Fedora-Remix-for-WSL-SL_41.0.0.0_x64.msix install.tar.gz
         wsl --update
         wsl --import fedora fedora install.tar.gz
         wsl --set-default fedora
-        wsl sh -c 'dnf -y install https://github.com/rpmsphere/noarch/raw/master/r/rpmsphere-release-38-1.noarch.rpm'
-        wsl sh -c 'dnf -y install --setop=install_weak_deps=False gcc gcc-c++ mingw32-gcc mingw32-gcc-c++ mingw32-zlib-static mingw32-nsis python3-pillow'
+        wsl sh -c 'dnf -y install https://github.com/rpmsphere/noarch/raw/master/r/rpmsphere-release-40-1.noarch.rpm'
+        wsl sh -c 'dnf -y install --setopt=install_weak_deps=False gcc gcc-c++ mingw32-gcc mingw32-gcc-c++ mingw32-zlib-static mingw32-nsis python3-pillow'
 
     - name: fix line endings
       run: |

diff --git a/Makefile b/Makefile
@@ -27,6 +27,10 @@ ifeq ($(BUILDTYPE),windows)
 	MAKENSIS = makensis
 	EXT = .exe
 else
+	ifeq ($(BUILDTYPE),osx)
+		export BREW := $(shell brew --prefix)/opt
+	endif
+
 	export CC = gcc
 	export CXX = g++ -std=c++20
 	export CFLAGS

diff --git a/build.py b/build.py
@@ -15,7 +15,11 @@
     items={
         "bin/wordgrinder$(EXT)": TEST_BINARY,
     }
-    | ({"bin/xwordgrinder": "src/c+wordgrinder-glfw-x11"} if HAS_XWORDGRINDER else {})
+    | (
+        {"bin/xwordgrinder": "src/c+wordgrinder-glfw-x11"}
+        if HAS_XWORDGRINDER
+        else {}
+    )
     | (
         {"bin/wordgrinder-haiku": "src/c+wordgrinder-glfw-haiku"}
         if HAS_HAIKU
@@ -25,6 +29,7 @@
         {
             "bin/wordgrinder-osx": "src/c+wordgrinder-glfw-osx",
             "bin/wordgrinder-osx-ncurses": "src/c+wordgrinder-ncurses",
+            "bin/wordgrinder-osx.app.zip": "src/c+wordgrinder_app",
             f"bin/WordGrinder-{VERSION}-setup.pkg": "src/c+wordgrinder_pkg",
         }
         if HAS_OSX

diff --git a/build/_objectify.py b/build/_objectify.py
@@ -0,0 +1,19 @@
+import sys
+from functools import partial
+
+if len(sys.argv) != 3:
+    sys.exit("Usage: %s <file> <symbol>" % sys.argv[0])
+filename = sys.argv[1]
+symbol = sys.argv[2]
+
+print("const uint8_t " + symbol + "[] = {")
+n = 0
+with open(filename, "rb") as in_file:
+    for c in iter(partial(in_file.read, 1), b""):
+        print("0x%02X," % ord(c), end="")
+        n += 1
+        if n % 16 == 0:
+            print()
+print("};")
+
+print("const size_t " + symbol + "_len = sizeof(" + symbol + ");")
diff --git a/build/_sandbox.py b/build/_sandbox.py
@@ -0,0 +1,44 @@
+#!/usr/bin/python3
+
+from os.path import *
+import argparse
+import os
+import shutil
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-s", "--sandbox")
+    parser.add_argument("-v", "--verbose", action="store_true")
+    parser.add_argument("-l", "--link", action="store_true")
+    parser.add_argument("-e", "--export", action="store_true")
+    parser.add_argument("files", nargs="*")
+    args = parser.parse_args()
+
+    assert args.sandbox, "You must specify a sandbox directory"
+    assert args.link ^ args.export, "You can't link and export at the same time"
+
+    if args.link:
+        os.makedirs(args.sandbox, exist_ok=True)
+        for f in args.files:
+            sf = join(args.sandbox, f)
+            if args.verbose:
+                print("link", sf)
+            os.makedirs(dirname(sf), exist_ok=True)
+            try:
+                os.link(abspath(f), sf)
+            except PermissionError:
+                shutil.copy(f, sf)
+
+    if args.export:
+        for f in args.files:
+            sf = join(args.sandbox, f)
+            if args.verbose:
+                print("export", sf)
+            df = dirname(f)
+            if df:
+                os.makedirs(df, exist_ok=True)
+            os.rename(sf, f)
+
+
+main()
diff --git a/build/_zip.py b/build/_zip.py
@@ -0,0 +1,25 @@
+#!/usr/bin/python3
+
+from os.path import *
+import argparse
+import os
+from zipfile import ZipFile
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-z", "--zipfile")
+    parser.add_argument("-v", "--verbose", action="store_true")
+    parser.add_argument("-f", "--file", nargs=2, action="append")
+    args = parser.parse_args()
+
+    assert args.zipfile, "You must specify a zipfile to create"
+
+    with ZipFile(args.zipfile, mode="w") as zf:
+        for zipname, filename in args.file:
+            if args.verbose:
+                print(filename, "->", zipname)
+            zf.write(filename, arcname=zipname)
+
+
+main()
diff --git a/build/ab.mk b/build/ab.mk
@@ -51,6 +51,8 @@ ifeq ($(OS), Windows_NT)
 endif
 EXT ?=
 
+CWD=$(shell pwd)
+
 ifeq ($(PROGRESSINFO),)
 # The first make invocation here has to have its output discarded or else it
 # produces spurious 'Leaving directory' messages... don't know why.
@@ -61,12 +63,13 @@ PROGRESSINFO = "[$(ruleindex)/$(rulecount)]$(eval ruleindex := $(shell expr $(ru
 endif
 
 PKG_CONFIG_HASHES = $(OBJ)/.pkg-config-hashes/target-$(word 1, $(shell $(PKG_CONFIG) --list-all | md5sum))
+HOST_PKG_CONFIG_HASHES = $(OBJ)/.pkg-config-hashes/host-$(word 1, $(shell $(HOST_PKG_CONFIG) --list-all | md5sum))
 
-$(OBJ)/build.mk : $(PKG_CONFIG_HASHES)
-$(PKG_CONFIG_HASHES):
+$(OBJ)/build.mk : $(PKG_CONFIG_HASHES) $(HOST_PKG_CONFIG_HASHES)
+$(PKG_CONFIG_HASHES) $(HOST_PKG_CONFIG_HASHES) &:
+	$(hide) rm -rf $(OBJ)/.pkg-config-hashes
 	$(hide) mkdir -p $(OBJ)/.pkg-config-hashes
-	$(hide) rm -rf $(OBJ)/.pkg-config-hashes/target-*
-	$(hide) touch $(PKG_CONFIG_HASHES)
+	$(hide) touch $(PKG_CONFIG_HASHES) $(HOST_PKG_CONFIG_HASHES)
 
 include $(OBJ)/build.mk
 

diff --git a/build/ab.py b/build/ab.py
@@ -17,6 +17,9 @@
 import string
 import sys
 import hashlib
+import re
+import ast
+from collections import namedtuple
 
 verbose = False
 quiet = False
@@ -26,6 +29,22 @@
 materialisingStack = []
 defaultGlobals = {}
 
+RE_FORMAT_SPEC = re.compile(
+    r"(?:(?P<fill>[\s\S])?(?P<align>[<>=^]))?"
+    r"(?P<sign>[- +])?"
+    r"(?P<pos_zero>z)?"
+    r"(?P<alt>#)?"
+    r"(?P<zero_padding>0)?"
+    r"(?P<width_str>\d+)?"
+    r"(?P<grouping>[_,])?"
+    r"(?:(?P<decimal>\.)(?P<precision_str>\d+))?"
+    r"(?P<type>[bcdeEfFgGnosxX%])?"
+)
+
+CommandFormatSpec = namedtuple(
+    "CommandFormatSpec", RE_FORMAT_SPEC.groupindex.keys()
+)
+
 sys.path += ["."]
 old_import = builtins.__import__
 
@@ -80,6 +99,29 @@ def error(message):
     raise ABException(message)
 
 
+class BracketedFormatter(string.Formatter):
+    def parse(self, format_string):
+        while format_string:
+            left, *right = format_string.split("$[", 1)
+            if not right:
+                yield (left, None, None, None)
+                break
+            right = right[0]
+
+            offset = len(right) + 1
+            try:
+                ast.parse(right)
+            except SyntaxError as e:
+                if not str(e).startswith("unmatched ']'"):
+                    raise e
+                offset = e.offset
+
+            expr = right[0 : offset - 1]
+            format_string = right[offset:]
+
+            yield (left if left else None, expr, None, None)
+
+
 def Rule(func):
     sig = inspect.signature(func)
 
@@ -166,7 +208,7 @@ def __repr__(self):
         return f"Target('{self.name}')"
 
     def templateexpand(selfi, s):
-        class Formatter(string.Formatter):
+        class Formatter(BracketedFormatter):
             def get_field(self, name, a1, a2):
                 return (
                     eval(name, selfi.callback.__globals__, selfi.args),
@@ -358,10 +400,11 @@ def convert(value, target):
 def _removesuffix(self, suffix):
     # suffix='' should not call self[:-0].
     if suffix and self.endswith(suffix):
-        return self[:-len(suffix)]
+        return self[: -len(suffix)]
     else:
         return self[:]
 
+
 def loadbuildfile(filename):
     filename = _removesuffix(filename.replace("/", "."), ".py")
     builtins.__import__(filename)
@@ -413,8 +456,9 @@ def emit(*args, into=None):
         outputFp.write(s)
 
 
-def emit_rule(name, ins, outs, cmds=[], label=None):
-    fins = filenamesof(ins)
+def emit_rule(self, ins, outs, cmds=[], label=None):
+    name = self.name
+    fins = set(filenamesof(ins))
     fouts = filenamesof(outs)
     nonobjs = [f for f in fouts if not f.startswith("$(OBJ)")]
 
@@ -440,8 +484,23 @@ def emit_rule(name, ins, outs, cmds=[], label=None):
 
         if label:
             emit("\t$(hide)", "$(ECHO) $(PROGRESSINFO)", label, into=lines)
+
+        sandbox = join(self.dir, "sandbox")
+        emit("\t$(hide)", f"rm -rf {sandbox}", into=lines)
+        emit(
+                "\t$(hide)",
+            f"$(PYTHON) build/_sandbox.py --link -s {sandbox}",
+            *fins,
+            into=lines,
+        )
         for c in cmds:
-            emit("\t$(hide)", c, into=lines)
+            emit(f"\t$(hide) cd {sandbox} && (", c, ")", into=lines)
+        emit(
+            "\t$(hide)",
+            f"$(PYTHON) build/_sandbox.py --export -s {sandbox}",
+            *fouts,
+            into=lines,
+        )
     else:
         assert len(cmds) == 0, "rules with no outputs cannot have commands"
         emit(name, ":", *fins, into=lines)
@@ -486,10 +545,10 @@ def simplerule(
         cs += [self.templateexpand(c)]
 
     emit_rule(
-        name=self.name,
+        self=self,
         ins=ins + deps,
         outs=outs,
-        label=self.templateexpand("{label} {name}") if label else None,
+        label=self.templateexpand("$[label] $[name]") if label else None,
         cmds=cs,
     )
 
@@ -514,7 +573,7 @@ def export(self, name=None, items: TargetsMap = {}, deps: Targets = []):
             cwd=self.cwd,
             ins=[srcs[0]],
             outs=[destf],
-            commands=["$(CP) %s %s" % (srcs[0], destf)],
+            commands=["$(CP) -H %s %s" % (srcs[0], destf)],
             label="",
         )
         subrule.materialise()
@@ -523,7 +582,7 @@ def export(self, name=None, items: TargetsMap = {}, deps: Targets = []):
         replaces=self,
         ins=outs + deps,
         outs=["=sentinel"],
-        commands=["touch {outs[0]}"],
+        commands=["touch $[outs[0]]"],
         label="EXPORT",
     )