Fix tooling

Author: virtuald

src/semiwrap/tool/__main__.py

@@ -39,8 +39,8 @@ def main():
     else:
         retval = 0
 
-    return retval
+    sys.exit(retval)
 
 
 if __name__ == "__main__":
-    sys.exit(main())
+    main()

src/semiwrap/tool/create_gen.py

@@ -1,4 +1,6 @@
+import os
 import pathlib
+import typing as T
 
 from ..autowrap.generator_data import MissingReporter
 from ..cmd.header2dat import make_argparser, generate_wrapper
@@ -22,6 +24,28 @@ def add_subparser(cls, parent_parser, subparsers):
     def run(self, args):
         project_root = pathlib.Path.cwd()
 
+        # Problem: if another hatchling plugin sets PKG_CONFIG_PATH to include a .pc
+        # file, makeplan() will fail to find it, which prevents a semiwrap program
+        # from consuming those .pc files.
+        #
+        # We search for .pc files in the project root by default and add anything found
+        # to the PKG_CONFIG_PATH to allow that to work. Probably won't hurt anything?
+
+        pcpaths: T.Set[str] = set()
+        for pcfile in project_root.glob("**/*.pc"):
+            pcpaths.add(str(pcfile.parent))
+
+        if pcpaths:
+            # Add to PKG_CONFIG_PATH so that it can be resolved by other hatchling
+            # plugins if desired
+            pkg_config_path = os.environ.get("PKG_CONFIG_PATH")
+            if pkg_config_path is not None:
+                os.environ["PKG_CONFIG_PATH"] = os.pathsep.join(
+                    (pkg_config_path, *pcpaths)
+                )
+            else:
+                os.environ["PKG_CONFIG_PATH"] = os.pathsep.join(pcpaths)
+
         plan = makeplan(project_root, missing_yaml_ok=True)
 
         for item in plan:

src/semiwrap/tool/create_imports.py

@@ -127,7 +127,7 @@ def add_subparser(cls, parent_parser, subparsers):
     def run(self, args):
         project = PyProject().project
 
-        if not project.update_init:
+        if project.update_init is None:
             print("[tool.semiwrap].update_init not set", file=sys.stderr)
             return 1
 

src/semiwrap/tool/scan_headers.py

@@ -18,6 +18,7 @@ def add_subparser(cls, parent_parser, subparsers):
             parents=[parent_parser],
         )
         parser.add_argument("--all", default=False, action="store_true")
+        parser.add_argument("--as-ignore", default=False, action="store_true", help="Emit scan_headers_ignore instead")
         return parser
 
     def _make_search_paths(self, pyproject: PyProject) -> T.Dict[str, T.List[Path]]:
@@ -117,18 +118,26 @@ def _should_ignore(f):
 
             files.sort()
 
+            if args.as_ignore:
+                comment = "    #"
+            else:
+                comment = "#"
+
             lastdir = None
             for f in files:
                 thisdir = f.parent
                 if lastdir is None:
                     if thisdir:
-                        print("#", thisdir)
+                        print(comment, thisdir)
                 elif lastdir != thisdir:
                     print()
                     if thisdir:
-                        print("#", thisdir)
+                        print(comment, thisdir)
                 lastdir = thisdir
 
                 base = f.stem
-                print(f'{base} = "{f.as_posix()}"')
+                if args.as_ignore:
+                    print(f'    "{f.as_posix()}",')
+                else:
+                    print(f'{base} = "{f.as_posix()}"')
             print()