CuteEngineering/cutekit
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix run command decorator

Browse source
This commit is contained in:
Sleepy Monax 2023-11-13 20:41:14 +01:00
parent c2510da0ca
commit b3cc65ac36
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
cutekit/builder.py
View file

@ -2,10 +2,9 @@ import os
import logging import logging
from pathlib import Path from pathlib import Path
from dataclasses import dataclass from dataclasses import dataclass
from itertools import chain from typing import TextIO, Union
from typing import Generator, TextIO, Union, cast
from . import shell, rules, model, ninja, const, utils, cli from . import shell, rules, model, ninja, const, cli
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
@ -46,28 +45,26 @@ def buildpath(target: model.Target, component: model.Component, path) -> Path:
# --- Compilation ------------------------------------------------------------ # # --- Compilation ------------------------------------------------------------ #
def listSrc(component: model.Component) -> list[str]: def wilcard(component: model.Component, wildcards: list[str]) -> list[str]:
wildcards = set(chain(*map(lambda rule: rule.fileIn, rules.rules.values())))
dirs = [component.dirname()] + list( dirs = [component.dirname()] + list(
map(lambda d: os.path.join(component.dirname(), d), component.subdirs) map(lambda d: os.path.join(component.dirname(), d), component.subdirs)
) )
return shell.find(dirs, list(wildcards), recusive=False) return shell.find(dirs, list(wildcards), recusive=False)
def compileSrc( def compile(
w: ninja.Writer, target: model.Target, component: model.Component w: ninja.Writer,
target: model.Target,
component: model.Component,
rule: str,
srcs: list[str],
) -> list[str]: ) -> list[str]:
res: list[str] = [] res: list[str] = []
for src in listSrc(component): for src in srcs:
rel = Path(src).relative_to(component.dirname()) rel = Path(src).relative_to(component.dirname())
dest = buildpath(target, component, "obj") / rel.with_suffix(".o")
r = rules.byFileIn(src) t = target.tools[rule]
if r is None: w.build(str(dest), rule, inputs=src, order_only=t.files)
raise RuntimeError(f"Unknown rule for file {src}")
dest = buildpath(target, component, "obj") / rel.with_suffix(r.fileOut[0][1:])
t = target.tools[r.id]
w.build(str(dest), r.id, inputs=src, order_only=t.files)
res.append(str(dest)) res.append(str(dest))
return res return res
@ -127,7 +124,16 @@ def link(
) -> str: ) -> str:
w.newline() w.newline()
out = outfile(target, component) out = outfile(target, component)
objs: list[str] = compileSrc(w, target, component)
objs = []
objs += compile(w, target, component, "cc", wilcard(component, ["*.c"]))
objs += compile(
w, target, component, "cxx", wilcard(component, ["*.cpp", "*.cc", "*.cxx"])
)
objs += compile(
w, target, component, "as", wilcard(component, ["*.s", "*.asm", "*.S"])
)
res = compileRes(w, target, component) res = compileRes(w, target, component)
libs = collectLibs(registry, target, component) libs = collectLibs(registry, target, component)
if component.type == model.Kind.LIB: if component.type == model.Kind.LIB:
@ -239,7 +245,7 @@ def buildCmd(args: cli.Args):
build(target, registry, component)[0] build(target, registry, component)[0]
@cli.command("p", "project", "Show project information") @cli.command("r", "run", "Run a component")
def runCmd(args: cli.Args): def runCmd(args: cli.Args):
registry = model.Registry.use(args) registry = model.Registry.use(args)
target = model.Target.use(args) target = model.Target.use(args)