More fiddling to make work on 3.9.

Author: davidgiven

.github/workflows/ccpp.yml

@@ -66,7 +66,8 @@ jobs:
         path: 'fluxengine-testdata'
     - name: brew
       run: |
-        brew install sqlite pkg-config libusb protobuf wxwidgets fmt make coreutils dylibbundler libjpeg libmagic nlohmann-json cli11 boost glfw3 md4c ninja python freetype2 mbedtls
+        brew install sqlite pkg-config libusb protobuf wxwidgets fmt make coreutils dylibbundler libjpeg libmagic nlohmann-json cli11 boost glfw3 md4c ninja python freetype2 mbedtls@3
+        brew link mbedtls@3
         brew upgrade
     - name: make
       run: gmake -C fluxengine

arch/build.py

@@ -4,7 +4,7 @@
 from glob import glob
 import sys
 
-archs = [f for f in glob("*", root_dir="arch") if isfile(f"arch/{f}/{f}.proto")]
+archs = {basename(dirname(f)) for f in glob("arch/*/*.proto")}
 
 ps = []
 pls = []

dep/lexy/build.py

@@ -1,11 +1,13 @@
 from build.c import cxxlibrary
-from glob import glob
+from build.utils import glob
 
 cxxlibrary(
     name="lexy",
     srcs=[],
     hdrs={
         h: f"./include/{h}"
-        for h in glob("**/*.hpp", root_dir="dep/lexy/include", recursive=True)
+        for h in glob(
+            ["**/*.hpp"], dir="dep/lexy/include", relative_to="dep/lexy/include"
+        )
     },
 )

extras/build.py

@@ -1,8 +1,7 @@
 from build.ab import simplerule, simplerule
-from build.utils import objectify
+from build.utils import objectify, glob
 from build.c import clibrary
 from build.zip import zip
-from glob import glob
 from os.path import *
 import config
 
@@ -31,16 +30,14 @@
         label="ICONSET",
     )
 
-    template_files = [
-        f
-        for f in glob("**", recursive=True, root_dir="extras/FluxEngine.app.template")
-        if isfile(join("extras/FluxEngine.app.template", f))
-    ]
     zip(
         name="fluxengine_template",
         items={
             join("FluxEngine.app", k): join("extras/FluxEngine.app.template", k)
-            for k in template_files
+            for k in glob(
+                dir="extras/FluxEngine.app.template",
+                relative_to="extras/FluxEngine.app.template",
+            )
         },
     )