Merge pull request #830 from davidgiven/dtrg-ab

Update ab.

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 = []

build/ab.py

@@ -388,6 +388,10 @@ def _filetarget(value, cwd):
     return t
 
 
+def getcwd():
+    return cwdStack[-1]
+
+
 def targetof(value, cwd=None):
     if not cwd:
         cwd = cwdStack[-1]
@@ -544,12 +548,14 @@ def shell(*args):
 
 def add_commanddb_entry(commands, file):
     global commandsDb
-    commandsDb += [{
-        "directory": os.getcwd(),
-                "command": (" && ".join(commands)),
-                "file": file
-    }
-        ]
+    commandsDb += [
+        {
+            "directory": os.getcwd(),
+            "command": (" && ".join(commands)),
+            "file": file,
+        }
+    ]
+
 
 def emit_rule(self, ins, outs, cmds=[], label=None):
     name = self.name

build/utils.py

@@ -4,16 +4,19 @@
     Targets,
     filenameof,
     filenamesof,
-    cwdStack,
+    getcwd,
     error,
     simplerule,
-    G
+    G,
 )
-from os.path import relpath, splitext, join, basename, isfile
+from os.path import relpath, splitext, join, basename, isfile, normpath
+from os import walk
 from glob import iglob
 import fnmatch
 import subprocess
 import shutil
+import re
+import functools
 
 
 def filenamesmatchingof(xs, pattern):
@@ -35,9 +38,61 @@ def collectattrs(*, targets, name, initial=[]):
     return sorted(s)
 
 
+@functools.cache
+def _glob_to_re(glob_str):
+    opts = re.compile('([.]|[*][*]/|[*]|[?])|(.)')
+    out = ''
+    for (pattern_match, literal_text) in opts.findall(glob_str):
+        if pattern_match == '.':
+            out += '[.]'
+        elif pattern_match == '**/':
+            out += '(?:.*/)?'
+        elif pattern_match == '*':
+            out += '[^/]*'
+        elif pattern_match == '?':
+            out += '.'
+        elif literal_text:
+            out += literal_text
+    return re.compile(out)
+
+def _glob_filter(paths, pattern):
+    r = _glob_to_re(pattern)
+    for f in paths:
+        if r.match(f):
+            yield f
+
+def _glob_matches(path, pattern):
+    r = _glob_to_re(pattern)
+    return r.match(path)
+
+def glob(include=["*"], exclude=[], dir=None, relative_to="."):
+    if not dir:
+        dir = getcwd()
+    if dir.startswith("./"):
+        dir = normpath(join(getcwd(), dir))
+    if relative_to.startswith("./"):
+        relative_to = normpath(join(getcwd(), relative_to))
+
+    def iterate():
+        for dirpath, dirnames, filenames in walk(
+            dir, topdown=True, followlinks=True
+        ):
+            dirpath = relpath(dirpath, dir)
+            filenames = [normpath(join(dirpath, f)) for f in filenames]
+            matching = set()
+            for p in include:
+                matching.update(_glob_filter(filenames, p))
+            for p in exclude:
+               matching = [n for n in matching if not _glob_matches(n, p)]
+            for f in matching:
+                yield normpath(relpath(join(dir, f), relative_to))
+
+    return list(iterate())
+
+
 def itemsof(pattern, root=None, cwd=None):
     if not cwd:
-        cwd = cwdStack[-1]
+        cwd = getcwd()
     if not root:
         root = "."
 

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",
+            )
         },
     )
 

src/gui2/build.py

@@ -1,7 +1,7 @@
 from build.c import cxxprogram, cxxlibrary, simplerule, clibrary
 from build.ab import simplerule
 from build.pkg import package
-from glob import glob
+from build.utils import glob
 from functools import reduce
 import operator
 from os.path import *
@@ -26,17 +26,14 @@
 
 def headers_from(path):
     hdrs = {
-        k: f"{path}/{k}" for k in glob("**/*.h*", root_dir=path, recursive=True)
+        k: f"{path}/{k}" for k in glob(["**/*.h*"], dir=path, relative_to=path)
     }
     assert hdrs, f"path {path} contained no headers"
     return hdrs
 
 
 def sources_from(path, except_for=[]):
-    srcs = [
-        join(path, f) for f in glob("**/*.[ch]*", root_dir=path, recursive=True)
-    ]
-    srcs = [f for f in srcs if f not in except_for]
+    srcs = glob(["**/*.[ch]*"], exclude=except_for, dir=path)
     assert srcs, f"path {path} contained no sources"
     return srcs
 
@@ -352,7 +349,7 @@ def romfs(name, id, dir):
 
     simplerule(
         name=name,
-        ins=[f for f in glob(dir + "/**", recursive=True) if isfile(f)],
+        ins=glob(dir=dir),
         outs=["=romfs.cc"],
         deps=[f".+{id}_mkromfs"],
         commands=[
@@ -429,9 +426,9 @@ def plugin(name, id, srcs, hdrs, romfsdir, deps):
             "dep/imhex/plugins/builtin/source/content/welcome_screen.cpp",
         ]
         + glob(
-            "dep/imhex/plugins/builtin/source/content/data_processor_nodes/*"
+            dir="dep/imhex/plugins/builtin/source/content/data_processor_nodes"
         )
-        + glob("dep/imhex/plugins/builtin/source/content/tutorials/*"),
+        + glob(dir="dep/imhex/plugins/builtin/source/content/tutorials"),
     )
     + [
         "./imhex_overrides/main_menu_items.cpp",