More

Author: virtuald

src/semiwrap/cmd_gen_pkgconf.py

@@ -12,20 +12,20 @@
 
 def main():
     parser = argparse.ArgumentParser(usage=inspect.cleandoc(__doc__ or ""))
-    parser.add_argument("package_name")
+    parser.add_argument("module_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
+    module_package_name = args.module_package_name
     project = PyProject(args.pyproject_toml)
 
-    module = project.get_extension(package_name)
+    module = project.get_extension(module_package_name)
     depends = project.get_extension_deps(module)
 
-    pc_install_path = project.package_root / pathlib.Path(*package_name.split("."))
+    pc_install_path = project.package_root / pathlib.Path(*module_package_name.split(".")[:-1])
     make_pc_file(
         project_root=project.root,
         pcfile=args.pcfile,
@@ -36,6 +36,7 @@ def main():
         includes=module.includes,
         depends=depends,
         libinit_py=args.libinit_py,
+        generator_name="semiwrap.cmd_gen_pkgconf",
     )
 
 

src/semiwrap/cmd_publish_casters.py

@@ -47,6 +47,7 @@ def main():
         includes=cfg.includedir,
         depends=cfg.requires,
         libinit_py=None,
+        generator_name="semiwrap.cmd_publish_casters",
     )
 
     #

src/semiwrap/mkpc.py

@@ -14,11 +14,13 @@ def make_pc_file(
     includes: T.List[str],
     depends: T.List[str],
     libinit_py: T.Optional[str],
+    generator_name: str,
 ):
 
     pc_content = [
-        "# automatically generated by semiwrap",
+        f"# automatically generated by {generator_name}",
         "prefix=${pcfiledir}",
+        f"# pc_install_path: {pc_install_path}"
     ]
 
     if libinit_py:
@@ -28,7 +30,7 @@ def make_pc_file(
 
     for i, inc in enumerate(includes):
         includedir = project_root / pathlib.PurePosixPath(inc)
-        rel = includedir.relative_to(pc_install_path.parent)
+        rel = includedir.relative_to(pc_install_path, walk_up=True)
         pc_content.append(f"inc{i}=${{prefix}}/{rel.as_posix()}")
         cflags.append(f"-I${{inc{i}}}")
 

src/semiwrap/pyproject.py

@@ -75,8 +75,8 @@ def project(self):
                 ) from e
         return self._project
 
-    def get_extension(self, package_name: str) -> ExtensionModuleConfig:
-        return self.project.extension_modules[package_name]
+    def get_extension(self, module_package_name: str) -> ExtensionModuleConfig:
+        return self.project.extension_modules[module_package_name]
 
     def get_extension_deps(self, extension: ExtensionModuleConfig) -> T.List[str]:
         deps = []

tests/cpp/sw-test-base/.gitignore

@@ -1,3 +1,3 @@
-/src/swtest_base/sw-caster-test-pybind11.pc
-/src/swtest_base/sw-caster-test-pybind11.pybind11.json
+/src/swtest_base/sw-caster-test-casters.pc
+/src/swtest_base/sw-caster-test-casters.pybind11.json
 /src/swtest_base/trampolines

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

@@ -20,18 +20,18 @@ packages = ['src/swtest_base']
 
 [tool.semiwrap]
 [tool.semiwrap.extension_modules."swtest_base._module"]
-depends = ["sw-test-base-pybind11"]
+depends = ["sw-test-base-casters"]
 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]
+[tool.semiwrap.export_type_casters.sw-test-base-casters]
 pypackage = "swtest_base"
 includedir = ["src/swtest_base/cpp/type_casters"]
 
-[[tool.semiwrap.export_type_casters.sw-test-base-pybind11.headers]]
+[[tool.semiwrap.export_type_casters.sw-test-base-casters.headers]]
 header = "inty_cast.h"
 types = ["inty"]

tests/cpp/sw-test/pyproject.toml

@@ -21,7 +21,7 @@ packages = ["src/swtest"]
 [tool.semiwrap]
 
 [tool.semiwrap.extension_modules."swtest.ft._ft"]
-depends = ["sw-test-pybind11"]
+depends = ["sw-test-casters"]
 wraps = ["swtest_base__module"]
 yaml_path = "wrapcfg/ft"
 includes = ["src/swtest/ft/include"]
@@ -99,16 +99,16 @@ tnested = "templates/nested.h"
 
 
 
-[tool.semiwrap.export_type_casters.sw-test-pybind11]
+[tool.semiwrap.export_type_casters.sw-test-casters]
 pypackage = "swtest.tc"
 includedir = ["src/swtest/tc/include"]
 
-[[tool.semiwrap.export_type_casters.sw-test-pybind11.headers]]
+[[tool.semiwrap.export_type_casters.sw-test-casters.headers]]
 header = "rpyint_type_caster.h"
 types = ["rpy::rpyint"]
 default_arg_cast = true
 
-[[tool.semiwrap.export_type_casters.sw-test-pybind11.headers]]
+[[tool.semiwrap.export_type_casters.sw-test-casters.headers]]
 header = "rpyint_type_caster.h"
 types = ["rpyint_plus_5"]