omdev 0.0.0.dev206__tar.gz → 0.0.0.dev208__tar.gz

{omdev-0.0.0.dev206/omdev.egg-info → omdev-0.0.0.dev208}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev206
+Version: 0.0.0.dev208
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev206
+Requires-Dist: omlish==0.0.0.dev208
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev206 → omdev-0.0.0.dev208}/omdev/cc/cli.py

@@ -16,24 +16,50 @@ Freestanding options:
 ==
 
 TODO:
- - standard deps - cdeps.toml
  - cext interop
  - gen cmake
 """
+import dataclasses as dc
 import os
 import shlex
 import shutil
 import subprocess
 import tempfile
+import tomllib
 import typing as ta
 
+from omlish import cached
 from omlish import check
+from omlish import lang
+from omlish import marshal as msh
 from omlish.argparse import all as ap
+from omlish.formats import json
 
 from .. import magic
 from ..cache import data as dcache
 
 
+@dc.dataclass(frozen=True)
+class Cdep:
+    @dc.dataclass(frozen=True)
+    class Git:
+        url: str
+        rev: str
+
+        subtrees: ta.Sequence[str] | None = None
+
+    git: Git
+
+    include: ta.Sequence[str] | None = None
+
+
+@cached.function
+def load_cdeps() -> ta.Mapping[str, Cdep]:
+    src = lang.get_relative_resources(globals=globals())['cdeps.toml'].read_text()
+    dct = tomllib.loads(src)
+    return msh.unmarshal(dct.get('deps', {}), ta.Mapping[str, Cdep])  # type: ignore
+
+
 class Cli(ap.Cli):
     @ap.cmd(
         ap.arg('--cwd'),
@@ -60,14 +86,18 @@ class Cli(ap.Cli):
         for src_magic in src_magics:
             if src_magic.key == '@omlish-cdeps':
                 for dep in check.isinstance(src_magic.prepared, ta.Sequence):
-                    dep_git = dep['git']
+                    if isinstance(dep, ta.Mapping):
+                        dep = msh.unmarshal(dep, Cdep)  # type: ignore
+                    else:
+                        dep = load_cdeps()[check.isinstance(dep, str)]
+
                     dep_spec = dcache.GitSpec(
-                        url=dep_git['url'],
-                        rev=dep_git['rev'],
-                        subtrees=dep_git.get('subtrees'),
+                        url=dep.git.url,
+                        rev=dep.git.rev,
+                        subtrees=dep.git.subtrees,
                     )
                     dep_dir = dcache.default().get(dep_spec)
-                    for dep_inc in dep.get('include', []):
+                    for dep_inc in dep.include or []:
                         inc_dir = os.path.join(dep_dir, dep_inc)
                         check.state(os.path.isdir(inc_dir))
                         include_dirs.append(inc_dir)
@@ -134,6 +164,13 @@ class Cli(ap.Cli):
     #     # //$(which true); exec om cc run "$0" "$@"
     #     print(self.args.src_file)
 
+    #
+
+    @ap.cmd()
+    def list_deps(self) -> None:
+        cdeps = load_cdeps()
+        print(json.dumps_pretty(msh.marshal(cdeps)))
+
 
 def _main() -> None:
     Cli().cli_run_and_exit()

{omdev-0.0.0.dev206 → omdev-0.0.0.dev208}/omdev/tools/json/formats.py

@@ -55,7 +55,7 @@ class Formats(enum.Enum):
 
     PY = Format(['py', 'python', 'repr'], lambda f: ast.literal_eval(f.read()))
 
-    XML = Format(['xml'], lambda f: xml.build_simple_element(xml.parse_tree(f.read()).getroot()).as_dict())
+    XML = Format(['xml'], lambda f: xml.build_simple_element(xml.parse_tree(f.read()).getroot()).se_dict())
 
     CSV = Format(['csv'], lambda f: list(csv.DictReader(f)))
     TSV = Format(['tsv'], lambda f: list(csv.DictReader(f, delimiter='\t')))

{omdev-0.0.0.dev206 → omdev-0.0.0.dev208/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev206
+Version: 0.0.0.dev208
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev206
+Requires-Dist: omlish==0.0.0.dev208
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev206 → omdev-0.0.0.dev208}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev206
+omlish==0.0.0.dev208
 
 [all]
 black~=24.10

{omdev-0.0.0.dev206 → omdev-0.0.0.dev208}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev206'
+version = '0.0.0.dev208'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev206',
+    'omlish == 0.0.0.dev208',
 ]
 
 [project.optional-dependencies]