Merge pull request #357 from davidgiven/dtrg-ab

Update ab.

Author: davidgiven

build/utils.py

@@ -40,6 +40,9 @@ def collectattrs(*, targets, name, initial=[]):
 
 @functools.cache
 def _glob_to_re(glob_str):
+    if glob_str.startswith("./"):
+        glob_str = normpath(join(getcwd(), glob_str))
+
     opts = re.compile("([.]|[*][*]/|[*]|[?])|(.)")
     out = ""
     for pattern_match, literal_text in opts.findall(glob_str):
@@ -80,15 +83,15 @@ def iterate():
         for dirpath, dirnames, filenames in walk(
             dir, topdown=True, followlinks=True
         ):
-            dirpath = relpath(dirpath, dir)
+            dirpath = relpath(dirpath, relative_to)
             filenames = [normpath(join(dirpath, f)) for f in filenames]
             matching = set()
             for p in include:
-                matching.update(_glob_filter(filenames, p))
+                matching.update([f for f in _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))
+                yield f
 
     return list(iterate())