omdev 0.0.0.dev203__tar.gz → 0.0.0.dev205__tar.gz

{omdev-0.0.0.dev203/omdev.egg-info → omdev-0.0.0.dev205}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev203
+Version: 0.0.0.dev205
 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.dev203
+Requires-Dist: omlish==0.0.0.dev205
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev203 → omdev-0.0.0.dev205}/omdev/.manifests.json

@@ -23,11 +23,23 @@
       }
     }
   },
+  {
+    "module": ".cc.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/cc/__main__.py",
+    "line": 4,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "cc",
+        "mod_name": "omdev.cc.__main__"
+      }
+    }
+  },
   {
     "module": ".cexts.cmake",
     "attr": "_CLI_MODULE",
     "file": "omdev/cexts/cmake.py",
-    "line": 323,
+    "line": 331,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cmake",
@@ -51,7 +63,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 138,
+    "line": 156,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cli",
@@ -227,18 +239,6 @@
       }
     }
   },
-  {
-    "module": ".tools.cc",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/tools/cc.py",
-    "line": 76,
-    "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "cc",
-        "mod_name": "omdev.tools.cc"
-      }
-    }
-  },
   {
     "module": ".tools.cloc",
     "attr": "_CLI_MODULE",

{omdev-0.0.0.dev203 → omdev-0.0.0.dev205}/omdev/amalg/__main__.py

@@ -6,6 +6,6 @@ _CLI_MODULE = CliModule('amalg', __name__)
 
 
 if __name__ == '__main__':
-    from .main import _main
+    from .main import _main  # noqa
 
     _main()

{omdev-0.0.0.dev203 → omdev-0.0.0.dev205}/omdev/cache/data/cache.py

@@ -27,7 +27,7 @@ from omlish import marshal as msh
 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 @@ class Cache:
                 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-0.0.0.dev203 → omdev-0.0.0.dev205}/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-0.0.0.dev205/omdev/cc/__main__.py

@@ -0,0 +1,11 @@
+from ..cli import CliModule
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('cc', __name__)
+
+
+if __name__ == '__main__':
+    from .cli import _main  # noqa
+
+    _main()

omdev-0.0.0.dev205/omdev/cc/cli.py

@@ -0,0 +1,143 @@
+"""
+//$(which true); exec om cc run "$0" "$@"
+or
+//usr/bin/true; exec om cc run "$0" "$@"
+
+See: https://gist.github.com/jdarpinian/1952a58b823222627cc1a8b83a7aa4e2
+
+==
+
+Freestanding options:
+
+//usr/bin/env clang++ -std=c++20 -o ${X=`mktemp`} "$0" && exec -a "$0" "$X" "$@"
+//usr/bin/env clang++ -std=c++20 -o ${D=`mktemp -d`}/x "$0" && ${D}/x ${@:1}; R=$?; rm -rf ${D}; exit $R
+//$(which true); clang++ -std=c++20 -o ${D=`mktemp -d`}/x ${0} && ${D}/x ${@:1}; R=${?}; rm -rf ${D}; exit ${R}
+
+==
+
+TODO:
+ - toplevel cc dir
+ - cext interop
+ - gen cmake
+"""
+import os
+import shlex
+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
+
+
+class Cli(ap.Cli):
+    @ap.cmd(
+        ap.arg('--cwd'),
+        ap.arg('src-file'),
+        ap.arg('args', nargs=ap.REMAINDER),
+    )
+    def run(self) -> int:
+        src_file = self.args.src_file
+
+        #
+
+        with open(src_file) as f:
+            src = f.read()
+
+        src_magics = magic.find_magic(  # noqa
+            magic.C_MAGIC_STYLE,
+            src.splitlines(),
+            file=src_file,
+            preparer=magic.json_magic_preparer,
+        )
+
+        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)
+
+        #
+
+        src_file_name = os.path.basename(src_file)
+
+        sh_parts: list[str] = [
+            '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
+
+        sh_parts.extend([
+            '-std=c++20',
+            shlex.quote(os.path.abspath(src_file)),
+            '-o',
+            shlex.quote(src_file_name),
+        ])
+
+        #
+
+        tmp_dir = tempfile.mkdtemp()
+        try:
+            proc = subprocess.run(  # noqa
+                ' '.join(sh_parts),
+                cwd=tmp_dir,
+                shell=True,
+                check=False,
+            )
+
+            if rc := proc.returncode:
+                return rc
+
+            exe_file = os.path.join(tmp_dir, src_file_name)
+            check.state(os.path.isfile(exe_file))
+
+            proc = subprocess.run(
+                [
+                    exe_file,
+                    *self.args.args,
+                ],
+                cwd=self.args.cwd,
+                check=False,
+            )
+
+        finally:
+            shutil.rmtree(tmp_dir)
+
+        return proc.returncode
+
+    # @ap.cmd(
+    #     ap.arg('src-file', nargs='+'),
+    # )
+    # def add_shebang(self) -> None:
+    #     # //$(which true); exec om cc run "$0" "$@"
+    #     print(self.args.src_file)
+
+
+def _main() -> None:
+    Cli().cli_run_and_exit()
+
+
+if __name__ == '__main__':
+    _main()

{omdev-0.0.0.dev203 → omdev-0.0.0.dev205}/omdev/cexts/cmake.py

@@ -7,14 +7,22 @@ TODO:
  - symlink headers, included src files (hamt_impl, ...)
  - point / copy output to dst dirs
  - libs
-  - ..
-   - pybind
-   - catch2?
-   - json? https://github.com/nlohmann/json
   - FindPackages? FetchContent? built_ext won't have that
   - move omml git / data retriever stuff into omdev, get just the one header file from git via sha?
  - support local built pys 
 
+Libs:
+ - py
+  - pybind https://github.com/pybind/pybind11
+  - nanobind https://github.com/wjakob/nanobind
+ - test
+  - catch2 https://github.com/catchorg/Catch2
+  - ut https://github.com/boost-ext/ut
+ - json
+  - nlohmann https://github.com/nlohmann/json
+ - log
+  - spdlog https://github.com/gabime/spdlog
+
 ==
 
 Done:

{omdev-0.0.0.dev203 → omdev-0.0.0.dev205}/omdev/cli/clicli.py

@@ -1,11 +1,13 @@
 import inspect
 import os
+import subprocess
 import sys
 import typing as ta
 import urllib.parse
 import urllib.request
 
 from omlish import __about__
+from omlish import lang
 from omlish.argparse import all as ap
 
 from ..pip import get_root_dists
@@ -88,6 +90,22 @@ class CliCli(ap.Cli):
 
         #
 
+        if lang.can_import('pip'):
+            print('Checking pip install')
+            subprocess.check_call([
+                sys.executable,
+                '-m',
+                'pip',
+                'install',
+                '--dry-run',
+                *deps,
+            ])
+            print('Pip install check successful')
+        else:
+            print('Pip not present, cannot check install')
+
+        #
+
         if deps:
             print('Reinstalling with following additional dependencies:')
             print('\n'.join('  ' + d for d in deps))

omdev-0.0.0.dev203/omdev/git/subtrees.py → omdev-0.0.0.dev205/omdev/git/shallow.py

@@ -8,7 +8,7 @@ from omlish.subprocesses import subprocesses
 
 
 @dc.dataclass(frozen=True)
-class GitSubtreeCloner:
+class GitShallowCloner:
     base_dir: str
     repo_url: str
     repo_dir: str
@@ -37,14 +37,14 @@ class GitSubtreeCloner:
             '-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 @@ class GitSubtreeCloner:
         )
 
         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 @@ class GitSubtreeCloner:
         )
 
 
-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-0.0.0.dev203 → omdev-0.0.0.dev205}/omdev/pyproject/resources/python.sh

@@ -9,7 +9,10 @@ if [ -z "${VENV}" ] ; then
     fi
 fi
 
-SCRIPT_DIR=$(dirname "$0")
+SCRIPT_PATH=$(cd -- "$(dirname -- "$0")" && pwd)
+SCRIPT_PATH="$SCRIPT_PATH/$(basename -- "$0")"
+SCRIPT_DIR=$(dirname "$SCRIPT_PATH")
+
 VENV_PYTHON_PATH="$SCRIPT_DIR/.venvs/$VENV/bin/python"
 if [ -f "$VENV_PYTHON_PATH" ] ; then
     PYTHON="$VENV_PYTHON_PATH"
@@ -19,7 +22,7 @@ else
     PYTHON=python
 fi
 
-export PYTHONPATH="$PYTHONPATH:."
+export PYTHONPATH="$PYTHONPATH:$SCRIPT_DIR:."
 
 if [ $# -eq 0 ] && "$PYTHON" -c "import IPython" 2> /dev/null ; then
     exec "$PYTHON" -m IPython

{omdev-0.0.0.dev203 → omdev-0.0.0.dev205/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev203
+Version: 0.0.0.dev205
 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.dev203
+Requires-Dist: omlish==0.0.0.dev205
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev203 → omdev-0.0.0.dev205}/omdev.egg-info/SOURCES.txt

@@ -52,6 +52,9 @@ omdev/cache/data/consts.py
 omdev/cache/data/defaults.py
 omdev/cache/data/manifests.py
 omdev/cache/data/specs.py
+omdev/cc/__init__.py
+omdev/cc/__main__.py
+omdev/cc/cli.py
 omdev/cexts/__init__.py
 omdev/cexts/_boilerplate.cc
 omdev/cexts/build.py
@@ -89,8 +92,8 @@ omdev/clipboard/darwin_cf.py
 omdev/clipboard/linux_x11.py
 omdev/git/__init__.py
 omdev/git/revisions.py
+omdev/git/shallow.py
 omdev/git/status.py
-omdev/git/subtrees.py
 omdev/interp/__init__.py
 omdev/interp/__main__.py
 omdev/interp/cli.py
@@ -170,7 +173,6 @@ omdev/scripts/pyproject.py
 omdev/scripts/slowcat.py
 omdev/scripts/tmpexec.py
 omdev/tools/__init__.py
-omdev/tools/cc.py
 omdev/tools/cloc.py
 omdev/tools/doc.py
 omdev/tools/docker.py

{omdev-0.0.0.dev203 → omdev-0.0.0.dev205}/omdev.egg-info/requires.txt

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

{omdev-0.0.0.dev203 → omdev-0.0.0.dev205}/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.dev203'
+version = '0.0.0.dev205'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev203',
+    'omlish == 0.0.0.dev205',
 ]
 
 [project.optional-dependencies]

omdev-0.0.0.dev203/omdev/tools/cc.py

@@ -1,81 +0,0 @@
-"""
-//$(which true); exec om cc run "$0" "$@"
-or
-//usr/bin/true; exec om cc run "$0" "$@"
-
-See: https://gist.github.com/jdarpinian/1952a58b823222627cc1a8b83a7aa4e2
-
-==
-
-Freestanding options:
-
-//usr/bin/env clang++ -std=c++20 -o ${X=`mktemp`} "$0" && exec -a "$0" "$X" "$@"
-//usr/bin/env clang++ -std=c++20 -o ${D=`mktemp -d`}/x "$0" && ${D}/x ${@:1}; R=$?; rm -rf ${D}; exit $R
-//$(which true); clang++ -std=c++20 -o ${D=`mktemp -d`}/x ${0} && ${D}/x ${@:1}; R=${?}; rm -rf ${D}; exit ${R}
-"""
-import os
-import shutil
-import subprocess
-import tempfile
-
-from omlish import check
-from omlish.argparse import all as ap
-
-from ..cli import CliModule
-
-
-class Cli(ap.Cli):
-    @ap.cmd(
-        ap.arg('src-file'),
-        ap.arg('args', nargs=ap.REMAINDER),
-    )
-    def run(self) -> int:
-        src_file = self.args.src_file
-        check.state(os.path.isfile(src_file))
-
-        src_file_name = os.path.basename(src_file)
-
-        tmp_dir = tempfile.mkdtemp()
-        try:
-            proc = subprocess.run(
-                [
-                    check.non_empty_str(shutil.which('clang++')),
-                    '-std=c++20',
-                    os.path.abspath(src_file),
-                    '-o',
-                    src_file_name,
-                ],
-                cwd=tmp_dir,
-                check=False,
-            )
-
-            if rc := proc.returncode:
-                return rc
-
-            exe_file = os.path.join(tmp_dir, src_file_name)
-            check.state(os.path.isfile(exe_file))
-
-            proc = subprocess.run(
-                [
-                    exe_file,
-                    *self.args.args,
-                ],
-                check=False,
-            )
-
-        finally:
-            shutil.rmtree(tmp_dir)
-
-        return proc.returncode
-
-
-def _main() -> None:
-    Cli().cli_run_and_exit()
-
-
-# @omlish-manifest
-_CLI_MODULE = CliModule('cc', __name__)
-
-
-if __name__ == '__main__':
-    _main()