2025-01-10T16:20:06Z

Author: wrmsr

omdev/.manifests.json

@@ -231,7 +231,7 @@
     "module": ".tools.cc",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/cc.py",
-    "line": 76,
+    "line": 136,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cc",

omdev/cache/data/cache.py

@@ -27,7 +27,7 @@
 from omlish.formats import json
 from omlish.os.files import touch
 
-from ...git.subtrees import git_clone_subtree
+from ...git.shallow import git_shallow_clone
 from .actions import Action
 from .actions import ExtractAction
 from .manifests import Manifest
@@ -141,14 +141,11 @@ def _fetch_into(self, spec: Spec, data_dir: str) -> None:
                 self._fetch_url(url, os.path.join(data_dir, out_file))
 
         elif isinstance(spec, GitSpec):
-            if not spec.subtrees:
-                raise NotImplementedError
-
             tmp_dir = tempfile.mkdtemp()
 
             log.info('Cloning git repo: %s -> %s', spec.url, tmp_dir)
 
-            git_clone_subtree(
+            git_shallow_clone(
                 base_dir=tmp_dir,
                 repo_url=spec.url,
                 repo_dir='data',

omdev/cache/data/specs.py

@@ -50,7 +50,7 @@ class GitSpec(Spec):
     branch: str | None = dc.field(default=None, kw_only=True)
     rev: str | None = dc.field(default=None, kw_only=True)
 
-    subtrees: ta.Sequence[str] = dc.xfield(default=None, kw_only=True, coerce=_maybe_sorted_strs)
+    subtrees: ta.Sequence[str] | None = dc.xfield(default=None, kw_only=True, coerce=_maybe_sorted_strs)
 
 
 ##

omdev/git/subtrees.py renamed to omdev/git/shallow.py

@@ -8,7 +8,7 @@
 
 
 @dc.dataclass(frozen=True)
-class GitSubtreeCloner:
+class GitShallowCloner:
     base_dir: str
     repo_url: str
     repo_dir: str
@@ -37,14 +37,14 @@ def build_commands(self) -> ta.Iterator[Command]:
             '-c', 'advice.detachedHead=false',
         ]
 
-        yield GitSubtreeCloner.Command(
+        yield GitShallowCloner.Command(
             cmd=(
                 'git',
                 *git_opts,
                 'clone',
                 '-n',
                 '--depth=1',
-                '--filter=tree:0',
+                *(['--filter=tree:0'] if self.repo_subtrees is not None else []),
                 *(['-b', self.branch] if self.branch else []),
                 '--single-branch',
                 self.repo_url,
@@ -54,19 +54,20 @@ def build_commands(self) -> ta.Iterator[Command]:
         )
 
         rd = os.path.join(self.base_dir, self.repo_dir)
-        yield GitSubtreeCloner.Command(
-            cmd=(
-                'git',
-                *git_opts,
-                'sparse-checkout',
-                'set',
-                '--no-cone',
-                *(self.repo_subtrees or []),
-            ),
-            cwd=rd,
-        )
+        if self.repo_subtrees is not None:
+            yield GitShallowCloner.Command(
+                cmd=(
+                    'git',
+                    *git_opts,
+                    'sparse-checkout',
+                    'set',
+                    '--no-cone',
+                    *self.repo_subtrees,
+                ),
+                cwd=rd,
+            )
 
-        yield GitSubtreeCloner.Command(
+        yield GitShallowCloner.Command(
             cmd=(
                 'git',
                 *git_opts,
@@ -77,7 +78,7 @@ def build_commands(self) -> ta.Iterator[Command]:
         )
 
 
-def git_clone_subtree(
+def git_shallow_clone(
         *,
         base_dir: str,
         repo_url: str,
@@ -86,7 +87,7 @@ def git_clone_subtree(
         rev: ta.Optional[str] = None,
         repo_subtrees: ta.Optional[ta.Sequence[str]] = None,
 ) -> None:
-    for cmd in GitSubtreeCloner(
+    for cmd in GitShallowCloner(
         base_dir=base_dir,
         repo_url=repo_url,
         repo_dir=repo_dir,

omdev/git/tests/test_subtree.py renamed to omdev/git/tests/test_shallow.py

@@ -1,13 +1,13 @@
 import tempfile
 
-from ..subtrees import git_clone_subtree
+from ..shallow import git_shallow_clone
 
 
-def test_subtree():
+def test_shallow_subtree():
     td = tempfile.mkdtemp()
     print(td)
 
-    git_clone_subtree(
+    git_shallow_clone(
         base_dir=td,
         repo_url='https://github.com/wrmsr/flaskthing',
         repo_dir='flaskthing',
@@ -20,7 +20,7 @@ def test_subtree():
     td = tempfile.mkdtemp()
     print(td)
 
-    git_clone_subtree(
+    git_shallow_clone(
         base_dir=td,
         repo_url='https://github.com/wrmsr/flaskthing',
         repo_dir='flaskthing',

omdev/tools/cc.py

@@ -18,11 +18,13 @@
 import shutil
 import subprocess
 import tempfile
+import typing as ta
 
 from omlish import check
 from omlish.argparse import all as ap
 
 from .. import magic
+from ..cache import data as dcache
 from ..cli import CliModule
 
 
@@ -40,14 +42,32 @@ def run(self) -> int:
         with open(src_file) as f:
             src = f.read()
 
-        src_magic = magic.find_magic(  # noqa
+        src_magics = magic.find_magic(  # noqa
             magic.C_MAGIC_STYLE,
             src.splitlines(),
             file=src_file,
             preparer=magic.json_magic_preparer,
         )
 
-        # print(src_magic)
+        include_dirs: list[str] = []
+
+        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']
+                    dep_spec = dcache.GitSpec(
+                        url=dep_git['url'],
+                        rev=dep_git['rev'],
+                        subtrees=dep_git.get('subtrees'),
+                    )
+                    dep_dir = dcache.default().get(dep_spec)
+                    for dep_inc in dep.get('include', []):
+                        inc_dir = os.path.join(dep_dir, dep_inc)
+                        check.state(os.path.isdir(inc_dir))
+                        include_dirs.append(inc_dir)
+
+            else:
+                raise KeyError(src_magic.key)
 
         #
 
@@ -57,6 +77,9 @@ def run(self) -> int:
             'clang++',
         ]
 
+        for inc_dir in include_dirs:
+            sh_parts.append(f'-I{shlex.quote(inc_dir)}')
+
         if cflags := os.environ.get('CFLAGS'):
             sh_parts.append(cflags)  # Explicitly shell-unquoted
 

ominfra/manage/deploy/git.py

@@ -10,7 +10,7 @@
 import os.path
 import typing as ta
 
-from omdev.git.subtrees import GitSubtreeCloner
+from omdev.git.shallow import GitShallowCloner
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.cached import async_cached_nullary
 from omlish.lite.check import check
@@ -154,7 +154,7 @@ async def shallow_clone(
         ) as dst_swap:
             tdn = '.omlish-git-shallow-clone'
 
-            for cmd in GitSubtreeCloner(
+            for cmd in GitShallowCloner(
                     base_dir=dst_swap.tmp_path,
                     repo_url=self.make_repo_url(spec.repo),
                     repo_dir=tdn,

ominfra/scripts/manage.py

@@ -968,6 +968,7 @@ def __init__(
         self._payload_z = zlib.compress(self._prepared_payload_src.encode('utf-8'))
 
         self._options_json = json.dumps(dc.asdict(options), indent=None, separators=(',', ':')).encode('utf-8')  # noqa
+
     #
 
     @classmethod
@@ -8349,11 +8350,11 @@ async def try_output_str(
 
 
 ########################################
-# ../../../omdev/git/subtrees.py
+# ../../../omdev/git/shallow.py
 
 
 @dc.dataclass(frozen=True)
-class GitSubtreeCloner:
+class GitShallowCloner:
     base_dir: str
     repo_url: str
     repo_dir: str
@@ -8382,14 +8383,14 @@ def build_commands(self) -> ta.Iterator[Command]:
             '-c', 'advice.detachedHead=false',
         ]
 
-        yield GitSubtreeCloner.Command(
+        yield GitShallowCloner.Command(
             cmd=(
                 'git',
                 *git_opts,
                 'clone',
                 '-n',
                 '--depth=1',
-                '--filter=tree:0',
+                *(['--filter=tree:0'] if self.repo_subtrees is not None else []),
                 *(['-b', self.branch] if self.branch else []),
                 '--single-branch',
                 self.repo_url,
@@ -8399,19 +8400,20 @@ def build_commands(self) -> ta.Iterator[Command]:
         )
 
         rd = os.path.join(self.base_dir, self.repo_dir)
-        yield GitSubtreeCloner.Command(
-            cmd=(
-                'git',
-                *git_opts,
-                'sparse-checkout',
-                'set',
-                '--no-cone',
-                *(self.repo_subtrees or []),
-            ),
-            cwd=rd,
-        )
+        if self.repo_subtrees is not None:
+            yield GitShallowCloner.Command(
+                cmd=(
+                    'git',
+                    *git_opts,
+                    'sparse-checkout',
+                    'set',
+                    '--no-cone',
+                    *self.repo_subtrees,
+                ),
+                cwd=rd,
+            )
 
-        yield GitSubtreeCloner.Command(
+        yield GitShallowCloner.Command(
             cmd=(
                 'git',
                 *git_opts,
@@ -8422,7 +8424,7 @@ def build_commands(self) -> ta.Iterator[Command]:
         )
 
 
-def git_clone_subtree(
+def git_shallow_clone(
         *,
         base_dir: str,
         repo_url: str,
@@ -8431,7 +8433,7 @@ def git_clone_subtree(
         rev: ta.Optional[str] = None,
         repo_subtrees: ta.Optional[ta.Sequence[str]] = None,
 ) -> None:
-    for cmd in GitSubtreeCloner(
+    for cmd in GitShallowCloner(
         base_dir=base_dir,
         repo_url=repo_url,
         repo_dir=repo_dir,
@@ -11455,7 +11457,7 @@ async def shallow_clone(
         ) as dst_swap:
             tdn = '.omlish-git-shallow-clone'
 
-            for cmd in GitSubtreeCloner(
+            for cmd in GitShallowCloner(
                     base_dir=dst_swap.tmp_path,
                     repo_url=self.make_repo_url(spec.repo),
                     repo_dir=tdn,