omdev 0.0.35__tar.gz → 0.0.37__tar.gz

{omdev-0.0.35/omdev.egg-info → omdev-0.0.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.35
+Version: 0.0.37
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -13,10 +13,10 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omcore==0.0.35
+Requires-Dist: omcore==0.0.37
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.35; extra == "all"
-Requires-Dist: omllm==0.0.35; extra == "all"
+Requires-Dist: ominfra==0.0.37; extra == "all"
+Requires-Dist: omllm==0.0.37; extra == "all"
 Requires-Dist: black~=26.5; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -35,9 +35,9 @@ Requires-Dist: textual~=8.2; extra == "all"
 Requires-Dist: textual-dev~=1.8; extra == "all"
 Requires-Dist: textual-speedups~=0.2; extra == "all"
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.35; extra == "ominfra"
+Requires-Dist: ominfra==0.0.37; extra == "ominfra"
 Provides-Extra: omllm
-Requires-Dist: omllm==0.0.35; extra == "omllm"
+Requires-Dist: omllm==0.0.37; extra == "omllm"
 Provides-Extra: black
 Requires-Dist: black~=26.5; extra == "black"
 Provides-Extra: c

{omdev-0.0.35 → omdev-0.0.37}/omdev/.om-manifests.json

@@ -27,7 +27,7 @@
     "module": ".cexts.cmake",
     "attr": "_CLI_MODULE",
     "file": "omdev/cexts/cmake.py",
-    "line": 374,
+    "line": 442,
     "value": {
       "!.cli.types.CliModule": {
         "name": "cmake",

{omdev-0.0.35 → omdev-0.0.37}/omdev/cexts/cmake.py

@@ -4,7 +4,6 @@ FIXME:
  - use relapths in cml.txt
 
 TODO:
- - symlink headers, included src files (hamt_impl, ...)
  - point / copy output to dst dirs
  - libs
   - FindPackages? FetchContent? built_ext won't have that
@@ -40,11 +39,14 @@ import typing as ta
 
 from omcore import check
 from omcore import lang
+from omcore.lite.marshal import unmarshal_obj
 from omcore.logs import all as logs
 
 from .. import cmake
 from .. import magic
 from ..cli import CliModule
+from .configs import CextConfig
+from .configs import resolve_cext_config_file
 from .magic import CextMagic
 
 
@@ -211,11 +213,65 @@ class CmakeProjectGen:
         def py(self) -> CmakeProjectGen.PyInfo:
             return self.p.py_info()
 
+        def _get_ext_file_config(self, src_file: str) -> CextConfig:
+            source_file = os.path.join(self.p.prj_root, src_file)
+            with open(source_file) as f:
+                src = f.read()
+
+            src_magics = magic.find_magic(
+                magic.C_MAGIC_STYLE,
+                src.splitlines(),
+                file=source_file,
+                preparer=magic.json_magic_preparer,
+            )
+
+            cext_magic = check.single(m for m in src_magics if m.key == CextMagic.KEY)
+
+            if cext_magic.prepared is None:
+                return CextConfig()
+
+            return unmarshal_obj(cext_magic.prepared, CextConfig)
+
+        @staticmethod
+        def _resolve_ext_config_file(ext_src: str, config_file: str) -> str:
+            return resolve_cext_config_file(ext_src, config_file)
+
+        def _symlink_source_file(self, src_file: str) -> str:
+            source_file = os.path.abspath(os.path.join(self.p.prj_root, src_file))
+            if not os.path.isfile(source_file):
+                raise FileNotFoundError(source_file)
+
+            link_file = os.path.join(self.p.cmake_dir(), src_file)
+            link_dir = os.path.dirname(link_file)
+            os.makedirs(link_dir, exist_ok=True)
+
+            if os.path.lexists(link_file):
+                if os.path.realpath(link_file) != source_file:
+                    raise FileExistsError(link_file)
+            else:
+                os.symlink(os.path.relpath(source_file, link_dir), link_file)
+
+            return link_file
+
+        @staticmethod
+        def _get_ext_libraries(ext_cfg: CextConfig) -> list[str]:
+            out = []
+            for ext_lib in ext_cfg.libraries or ():
+                if isinstance(ext_lib, str):
+                    out.append(ext_lib)
+                else:
+                    ext_lib_name, ext_lib_platform = ext_lib
+                    if ext_lib_platform == sys.platform:
+                        out.append(ext_lib_name)
+            return out
+
         def _add_ext(self, ext_src: str) -> None:
             ext_name = ext_src.rpartition('.')[0].replace('/', '__')
 
             log.info('Adding cmake c extension: %s -> %s', ext_src, ext_name)
 
+            ext_cfg = self._get_ext_file_config(ext_src)  # noqa
+
             so_name = ''.join([
                 os.path.basename(ext_src).split('.')[0],
                 '.',
@@ -223,29 +279,41 @@ class CmakeProjectGen:
                 sysconfig.get_config_var('SHLIB_SUFFIX'),
             ])
 
-            sl = os.path.join(self.p.cmake_dir(), ext_src)
-            sal = os.path.abspath(sl)
-            sd = os.path.dirname(sal)
-            os.makedirs(sd, exist_ok=True)
-            rp = os.path.relpath(os.path.abspath(ext_src), sd)
-            os.symlink(rp, sal)
+            extra_sources = [
+                self._resolve_ext_config_file(ext_src, src_file)
+                for src_file in ext_cfg.extra_sources or ()
+            ]
+            extra_headers = [
+                self._resolve_ext_config_file(ext_src, header_file)
+                for header_file in ext_cfg.extra_headers or ()
+            ]
+
+            src_files = [
+                self._symlink_source_file(src_file)
+                for src_file in [ext_src, *extra_sources, *extra_headers]
+            ]
 
             ml = cmake.ModuleLibrary(
                 ext_name,
-                src_files=[
-                    sl,
-                ],
+                src_files=src_files,
                 include_dirs=[
                     f'${{{self.var_prefix}_INCLUDE_DIRECTORIES}}',
                 ],
+                compile_defs=[
+                    f'{name}={value}'
+                    for name, value in (ext_cfg.define_macros or {}).items()
+                ],
                 compile_opts=[
                     f'${{{self.var_prefix}_COMPILE_OPTIONS}}',
+                    *(ext_cfg.extra_compile_args or ()),
                 ],
                 link_dirs=[
                     f'${{{self.var_prefix}_LINK_DIRECTORIES}}',
                 ],
+                link_opts=ext_cfg.extra_link_args,
                 link_libs=[
                     f'${{{self.var_prefix}_LINK_LIBRARIES}}',
+                    *self._get_ext_libraries(ext_cfg),
                 ],
                 extra_cmds=[
                     cmake.Command(

omdev-0.0.37/omdev/cexts/configs.py

@@ -0,0 +1,34 @@
+# ruff: noqa: UP045
+# @om-lite
+import dataclasses as dc
+import os.path
+import typing as ta
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class CextConfig:
+    extra_sources: ta.Optional[ta.Sequence[str]] = None
+    extra_headers: ta.Optional[ta.Sequence[str]] = None
+
+    extra_compile_args: ta.Optional[ta.Sequence[str]] = None
+    extra_link_args: ta.Optional[ta.Sequence[str]] = None
+
+    define_macros: ta.Optional[ta.Mapping[str, str]] = None
+
+    libraries: ta.Optional[ta.Sequence[ta.Any]] = None  # list[str | tuple[str, str]] | None
+
+
+def resolve_cext_config_file(ext_src: str, config_file: str) -> str:
+    if os.path.isabs(config_file):
+        raise ValueError(config_file)
+
+    ext_src = os.path.normpath(ext_src)
+    package_dir = ext_src.partition(os.sep)[0]
+    resolved_file = os.path.normpath(os.path.join(os.path.dirname(ext_src), config_file))
+    if os.path.commonpath([package_dir, resolved_file]) != package_dir:
+        raise ValueError(config_file)
+
+    return resolved_file

{omdev-0.0.35 → omdev-0.0.37}/omdev/cmake.py

@@ -27,6 +27,7 @@ class Target(lang.Abstract):
     src_files: ta.Sequence[str]
 
     include_dirs: ta.Sequence[str] | None = None
+    compile_defs: ta.Sequence[str] | None = None
     compile_opts: ta.Sequence[str] | None = None
     link_dirs: ta.Sequence[str] | None = None
     link_opts: ta.Sequence[str] | None = None
@@ -135,6 +136,8 @@ class CmakeGen:
 
         if target.include_dirs:
             self.write_cmd(Command('target_include_directories', [target.name, 'PRIVATE'], target.include_dirs))
+        if target.compile_defs:
+            self.write_cmd(Command('target_compile_definitions', [target.name, 'PRIVATE'], target.compile_defs))
         if target.compile_opts:
             self.write_cmd(Command('target_compile_options', [target.name, 'PRIVATE'], target.compile_opts))
 

{omdev-0.0.35 → omdev-0.0.37}/omdev/dockerdev/resources/depsets/system.toml

@@ -43,7 +43,8 @@ deps = [
   'make',
   'pkg-config',
 
-  # libs
+  # dev libs
+  'libdebuginfod-dev',
   'libncurses5-dev',
   'libreadline6-dev',
   'libssl-dev',
@@ -75,6 +76,8 @@ deps = [
 
   # data formats
   'jq',
+  'libxml2-dev',
+  'libxslt-dev',
   'libyaml-dev',
 
   # databases

{omdev-0.0.35 → omdev-0.0.37}/omdev/pyproject/pkg.py

@@ -42,11 +42,17 @@ from omcore.formats.toml.writer import TomlWriter
 from omcore.lite.abstract import Abstract
 from omcore.lite.cached import cached_nullary
 from omcore.lite.check import check
+from omcore.lite.marshal import unmarshal_obj
 from omcore.logs.modules import get_module_logger
 from omcore.subprocesses.sync import subprocesses
 
+from ..cexts.configs import CextConfig
+from ..cexts.configs import resolve_cext_config_file
 from ..cexts.magic import CextMagic
+from ..magic.find import find_magic
 from ..magic.find import find_magic_files
+from ..magic.prepare import json_magic_preparer
+from ..magic.styles import C_MAGIC_STYLE
 from ..packaging.revisions import GitRevisionAdder
 
 
@@ -512,6 +518,7 @@ class _PyprojectExtensionPackageGenerator(BasePyprojectPackageGenerator, Abstrac
     class FileContents:
         pyproject_dct: ta.Mapping[str, ta.Any]
         setup_py: str
+        manifest_in: ta.Optional[ta.Sequence[str]] = None
 
     @abc.abstractmethod
     def file_contents(self) -> FileContents:
@@ -528,6 +535,10 @@ class _PyprojectExtensionPackageGenerator(BasePyprojectPackageGenerator, Abstrac
         with open(os.path.join(self._pkg_dir(), 'setup.py'), 'w') as f:
             f.write(fc.setup_py)
 
+        if fc.manifest_in:
+            with open(os.path.join(self._pkg_dir(), 'MANIFEST.in'), 'w') as f:
+                f.write('\n'.join(fc.manifest_in))  # noqa
+
 
 class _PyprojectCextPackageGenerator(_PyprojectExtensionPackageGenerator):
     @cached_nullary
@@ -540,6 +551,24 @@ class _PyprojectCextPackageGenerator(_PyprojectExtensionPackageGenerator):
 
     #
 
+    def _get_ext_file_config(self, src_file: str) -> CextConfig:
+        with open(src_file) as f:
+            src = f.read()
+
+        src_magics = find_magic(
+            C_MAGIC_STYLE,
+            src.splitlines(),
+            file=src_file,
+            preparer=json_magic_preparer,
+        )
+
+        cext_magic = check.single(m for m in src_magics if m.key == CextMagic.KEY)
+
+        if cext_magic.prepared is None:
+            return CextConfig()
+
+        return unmarshal_obj(cext_magic.prepared, CextConfig)
+
     @cached_nullary
     def file_contents(self) -> _PyprojectExtensionPackageGenerator.FileContents:
         prj = self._build_project_dict()
@@ -565,28 +594,102 @@ class _PyprojectCextPackageGenerator(_PyprojectExtensionPackageGenerator):
 
         ext_lines = []
 
-        for ext_src in self.find_cext_srcs():
+        needs_sys = False
+
+        ext_srcs = self.find_cext_srcs()
+
+        manifest_in: ta.List[str] = []
+
+        for ext_src in ext_srcs:
+            ext_cfg = self._get_ext_file_config(ext_src)
+
             ext_lang = ext_src.rpartition('.')[2]
+
             compile_args = {
                 'c': ['-std=c11'],
                 'cc': ['-std=c++20'],
             }.get(ext_lang, [])
+
             ext_name = ext_src.rpartition('.')[0].replace(os.sep, '.')
+            ext_arg_lines = [
+                f"name='{ext_name}',",
+            ]
+
+            ext_arg_lines.extend([
+                'sources=[',
+                *[f'    {sf!r},' for sf in [
+                    ext_src,
+                    *[
+                        resolve_cext_config_file(ext_src, extra_source)
+                        for extra_source in ext_cfg.extra_sources or ()
+                    ],
+                ]],
+                '],',
+            ])
+
+            manifest_in.extend([
+                f'include {resolve_cext_config_file(ext_src, extra_header)}'
+                for extra_header in ext_cfg.extra_headers or ()
+            ])
+
+            ext_arg_lines.extend([
+                'extra_compile_args=[',
+                *[f'    {ca!r},' for ca in [*compile_args, *(ext_cfg.extra_compile_args or [])]],
+                '],',
+            ])
+
+            if ext_ela := ext_cfg.extra_link_args:
+                ext_arg_lines.extend([
+                    'extra_link_args=[',
+                    *[f'    {la!r},' for la in ext_ela],
+                    '],',
+                ])
+
+            if ext_dms := ext_cfg.define_macros:
+                ext_arg_lines.extend([
+                    'define_macros=[',
+                    *[f'    ({k!r}, {v!r}),' for k, v in ext_dms.items()],
+                    '],',
+                ])
+
+            if ext_libs := ext_cfg.libraries:
+                ext_arg_lines.append(
+                    'libraries=[',
+                )
+                for ext_lib in ext_libs:
+                    if isinstance(ext_lib, str):
+                        ext_arg_lines.append(
+                            f'    {ext_lib!r},',
+                        )
+                    else:
+                        needs_sys = True
+                        ext_lib_name, ext_lib_plat = ext_lib
+                        ext_arg_lines.append(
+                            f'    *([{ext_lib_name!r}] if sys.platform == {ext_lib_plat!r} else []),',
+                        )
+                ext_arg_lines.append(
+                    '],',
+                )
+
             ext_lines.extend([
+                '',
                 'st.Extension(',
-                f"    name='{ext_name}',",
-                f"    sources=['{ext_src}'],",
-                f'    extra_compile_args={compile_args!r},',
+                *['    ' + l for l in ext_arg_lines],
                 '),',
             ])
 
         src = '\n'.join([
+            *([
+                'import sys',
+                '',
+            ] if needs_sys else []),
             'import setuptools as st',
             '',
             '',
             'st.setup(',
             '    ext_modules=[',
-            *['        ' + l for l in ext_lines],
+            *[('        ' + l) if l else '' for l in ext_lines],
+            *([''] if ext_srcs else []),
             '    ],',
             ')',
             '',
@@ -597,6 +700,7 @@ class _PyprojectCextPackageGenerator(_PyprojectExtensionPackageGenerator):
         return self.FileContents(
             pyp_dct,
             src,
+            manifest_in or None,
         )