All tests pass

Author: virtuald

src/semiwrap/cmd_gen_pkgconf.py

@@ -0,0 +1,65 @@
+"""
+Generates a pkg-config file for this extension
+"""
+
+import argparse
+import inspect
+import pathlib
+
+from .pkgconf_cache import INITPY_VARNAME
+from .pyproject import PyProject
+
+
+def main():
+    parser = argparse.ArgumentParser(usage=inspect.cleandoc(__doc__ or ""))
+    parser.add_argument("package_name")
+    parser.add_argument("name")
+    parser.add_argument("pyproject_toml", type=pathlib.Path)
+    parser.add_argument("pcfile", type=pathlib.Path)
+    parser.add_argument("--libinit-py")
+    args = parser.parse_args()
+
+    package_name = args.package_name
+    project = PyProject(args.pyproject_toml)
+
+    module = project.get_extension(package_name)
+    depends = project.get_extension_deps(module)
+
+    pc_install_path = project.package_root / pathlib.Path(*package_name.split("."))
+
+    pc_content = [
+        "# automatically generated by semiwrap",
+        "prefix=${pcfiledir}",
+    ]
+
+    if args.libinit_py:
+        pc_content.append(f"{INITPY_VARNAME}={args.libinit_py}")
+
+    cflags = ["-I${prefix}"]
+
+    for i, inc in enumerate(module.includes):
+        includedir = project.root / pathlib.PurePosixPath(inc)
+        rel = includedir.relative_to(pc_install_path.parent)
+        pc_content.append(f"inc{i}=${{prefix}}/{rel.as_posix()}")
+        cflags.append(f"-I${{inc{i}}}")
+
+    pc_content += [
+        "",
+        f"Name: {package_name}",
+        f"Description: semiwrap pybind11 module",
+        "Version:",  # TODO put in correct version
+        "Cflags: " + " ".join(cflags),
+    ]
+
+    if depends:
+        requires = " ".join(depends)
+        pc_content.append(f"Requires: {requires}")
+
+    pc_content.append("")
+
+    with open(args.pcfile, "w") as fp:
+        fp.write("\n".join(pc_content))
+
+
+if __name__ == "__main__":
+    main()

src/semiwrap/cmd_genmeson.py

@@ -270,6 +270,7 @@ def gen_meson(
         
         # internal commands for the autowrap machinery
         _sw_cmd_gen_libinit_py = [sw_py, '-m', 'semiwrap.cmd_gen_libinit']
+        _sw_cmd_gen_pkgconf = [sw_py, '-m', 'semiwrap.cmd_gen_pkgconf']
         _sw_cmd_publish_casters = [sw_py, '-m', 'semiwrap.cmd_publish_casters']
         _sw_cmd_resolve_casters = [sw_py, '-m', 'semiwrap.cmd_resolve_casters']
         _sw_cmd_header2dat = [sw_py, '-m', 'semiwrap.cmd_header2dat']

src/semiwrap/cmd_publish_casters.py

@@ -36,15 +36,11 @@ def main():
     pc_install_path = project.package_root / pathlib.Path(*cfg.pypackage.split("."))
     rel_includedir = includedir.relative_to(pc_install_path)
 
-    incstr = ""
-    if rel_includedir.parts:
-        incstr = "/" + "/".join(rel_includedir.parts)
-
     # Write the pc file
     pc_content = [
         "# automatically generated by semiwrap",
         "prefix=${pcfiledir}",
-        f"includedir=${{pcfiledir}}{incstr}",
+        f"includedir=${{prefix}}/{rel_includedir.as_posix()}",
         "",
         f"Name: {caster_name}",
         "Description: pybind11 type casters",
@@ -56,6 +52,8 @@ def main():
         requires = " ".join(cfg.requires)
         pc_content.append(f"Requires: {requires}")
 
+    pc_content.append("")
+
     with open(output_pc, "w") as fp:
         fp.write("\n".join(pc_content))
 

src/semiwrap/makeplan.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import collections
 import dataclasses
 import pathlib
 import pprint
@@ -219,7 +220,9 @@ def _process_extension_module(
             self._prepare_dependency_paths(depends, extension)
         )
 
-        includes = [self.project_root / inc for inc in extension.includes]
+        includes = [
+            self.project_root / pathlib.PurePosixPath(inc) for inc in extension.includes
+        ]
         search_path.extend(includes)
 
         # Search the package path last
@@ -240,11 +243,42 @@ def _process_extension_module(
         # Generate init.py for loading dependencies
         #
 
-        libinit_target = self._generate_libinit_file(
-            extension, module_name, package_path, libinit_modules
+        libinit_py = None
+        if libinit_modules:
+            libinit_py = extension.libinit or f"_init_{module_name}.py"
+            libinit_tgt = BuildTarget(
+                command="gen-libinit-py",
+                args=(OutputFile(libinit_py), *libinit_modules),
+                install_path=package_path,
+            )
+
+            self.pyi_args += [libinit_py, libinit_tgt]
+            yield libinit_tgt
+
+        #
+        # Publish a .pc file for this module
+        #
+
+        pc_args = [
+            package_name,
+            varname,
+            self.pyproject_input,
+            OutputFile(f"{varname}.pc"),
+        ]
+        if libinit_py:
+            pc_args += ["--libinit-py", libinit_py]
+
+        yield BuildTarget(
+            command="gen-pkgconf",
+            args=tuple(pc_args),
+            install_path=package_path,
         )
-        if libinit_target:
-            yield libinit_target
+
+        yield Entrypoint(group="pkg_config", name=varname, package=parent_package)
+
+        #
+        # Process the headers
+        #
 
         # Find and load the yaml
         if extension.yaml_path is None:
@@ -326,6 +360,31 @@ def _process_extension_module(
                 )
             )
 
+    def _locate_type_caster_json(
+        self,
+        depname: str,
+        caster_json_file: T.List[T.Union[BuildTargetOutput, pathlib.Path]],
+    ):
+        checked = set()
+        to_check = collections.deque([depname])
+        while to_check:
+            name = to_check.popleft()
+            checked.add(name)
+            print("checking", name)
+
+            entry = self.pkgcache.get(name)
+
+            if name in self.local_caster_targets:
+                caster_json_file.append(self.local_caster_targets[name])
+            else:
+                tc = entry.type_casters_path
+                if tc and tc not in caster_json_file:
+                    caster_json_file.append(tc)
+
+            for req in entry.requires:
+                if req not in checked:
+                    to_check.append(req)
+
     def _prepare_dependency_paths(
         self, depends: T.List[str], extension: ExtensionModuleConfig
     ):
@@ -347,34 +406,13 @@ def _prepare_dependency_paths(
             if dep in extension.wraps:
                 search_path.extend(entry.include_path)
 
-            if dep in self.local_caster_targets:
-                caster_json_file.append(self.local_caster_targets[dep])
-            elif entry.type_casters_path is not None:
-                caster_json_file.append(entry.type_casters_path)
+            self._locate_type_caster_json(dep, caster_json_file)
 
             if entry.libinit_py:
                 libinit_modules.append(entry.libinit_py)
 
         return search_path, include_directories_uniq, caster_json_file, libinit_modules
 
-    def _generate_libinit_file(
-        self,
-        extension: ExtensionModuleConfig,
-        module_name: str,
-        package_path: pathlib.Path,
-        libinit_modules: T.List[str],
-    ):
-        if libinit_modules:
-            libinit_py = extension.libinit or f"_init_{module_name}.py"
-            tgt = BuildTarget(
-                command="gen-libinit-py",
-                args=(OutputFile(libinit_py), *libinit_modules),
-                install_path=package_path,
-            )
-
-            self.pyi_args += [libinit_py, tgt]
-            return tgt
-
     def _process_headers(
         self,
         extension: ExtensionModuleConfig,
@@ -395,7 +433,8 @@ def _process_headers(
                 ayml = AutowrapConfigYaml.from_file(self.project_root / yml_input.path)
             except FileNotFoundError:
                 if not self.missing_yaml_ok:
-                    raise
+                    msg = f"{self.project_root / yml_input.path}: use `python3 -m semiwrap.cmd_creategen` to generate"
+                    raise FileNotFoundError(msg) from None
                 ayml = AutowrapConfigYaml()
 
             # find the source header
@@ -491,12 +530,13 @@ def _process_headers(
         return datfiles, module_sources, subpackages
 
     def _locate_header(self, hdr: str, search_path: T.List[pathlib.Path]):
+        phdr = pathlib.PurePosixPath(hdr)
         for p in search_path:
-            h_path = p / hdr
+            h_path = p / phdr
             if h_path.exists():
                 return InputFile(h_path.relative_to(self.project_root)), p
         raise FileNotFoundError(
-            f"cannot locate {hdr} in {', '.join(map(str, search_path))}"
+            f"cannot locate {phdr} in {', '.join(map(str, search_path))}"
         )
 
 

src/semiwrap/pkgconf_cache.py

@@ -21,6 +21,14 @@ def _get_pkgconf_data(self, *args) -> str:
 
         return r.stdout.decode("utf-8").strip()
 
+    @property
+    def requires(self) -> T.List[str]:
+        if not hasattr(self, "_requires"):
+            raw = self._get_pkgconf_data("--print-requires")
+            self._requires = [r for r in raw.split("\n") if r]
+
+        return self._requires
+
     @property
     def include_path(self) -> T.List[pathlib.Path]:
         """Only the include path for this package"""
@@ -92,6 +100,7 @@ def add_local(
         entry._include_path = [inc.absolute() for inc in includes]
         entry._full_include_path = entry._include_path[:]
         entry._libinit_py = None
+        entry._requires = requires[:]
         for req in requires:
             dep = self.get(req)
             entry._full_include_path.extend(dep.full_include_path)

tests/cpp/sw-caster-consumer/pyproject.toml

@@ -20,7 +20,7 @@ packages = ['src/sw_caster_consumer']
 
 [tool.semiwrap]
 [tool.semiwrap.extension_modules."sw_caster_consumer._module"]
-depends = ["swtest-base", "sw-test-base-pybind11"]
+depends = ["swtest_base__module"]
 
 [tool.semiwrap.extension_modules."sw_caster_consumer._module".headers]
-fn = "cpp/more.h"
+more = "cpp/more.h"

tests/cpp/sw-caster-consumer/wrapcfg/fn.yml renamed to tests/cpp/sw-caster-consumer/wrapcfg/more.yml

@@ -7,9 +7,6 @@ description = "Test program"
 name = "sw-test-base"
 version = "0.0.1"
 
-[project.entry-points.pkg_config]
-sw-test-base = 'swtest_base'
-
 [tool.hatch.build.targets.wheel]
 packages = ['src/swtest_base']
 
@@ -24,10 +21,11 @@ packages = ['src/swtest_base']
 [tool.semiwrap]
 [tool.semiwrap.extension_modules."swtest_base._module"]
 depends = ["sw-test-base-pybind11"]
+includes = ["src/swtest_base/cpp"]
 
 [tool.semiwrap.extension_modules."swtest_base._module".headers]
 fn = "cpp/fn.h"
-
+base_class = "cpp/baseclass.h"
 
 
 [tool.semiwrap.export_type_casters.sw-test-base-pybind11]

tests/cpp/sw-test-base/pyproject.toml

@@ -0,0 +1,14 @@
+#pragma  once
+
+#include <string>
+
+// tests trampoline across packages
+class abaseclass {
+public:
+    virtual ~abaseclass() = default;
+
+    inline virtual std::string fn() {
+        return "abaseclass";
+    }
+
+};