justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-09 16:04:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

[build] Return output from add_input call

Browse Source 
Allow for dependency chaining in *.module files by returning the
expected output from a module.add_input() call.
This commit is contained in:
Justin C. Miller
2021-08-28 18:12:51 -07:00
parent 28068ed36d
commit 80f815c020
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/bonnibel/module.py
View File

@@ -1,3 +1,8 @@
def resolve(path):
if path.startswith('/') or path.startswith('$'):
return path
from pathlib import Path
return str(Path(path).resolve())
class Module:
__fields = {
@@ -122,6 +127,7 @@ class Module:
if includes:
build.variable("ccflags", ["${ccflags}"] + [f"-I{i}" for i in includes])
build.variable("asflags", ["${asflags}"] + [f"-I{i}" for i in includes])
if libs:
build.variable("libs", ["${libs}"] + libs)
@@ -133,14 +139,14 @@ class Module:
source = start
while source and source.action:
output = source.get_output('${module_dir}')
output = source.output
if source.action.rule:
build.build(
rule = source.action.rule,
outputs = output.input,
inputs = source.input,
implicit = [f'${{source_root}}/{p}' for p in source.deps or tuple()],
implicit = list(map(resolve, source.deps)),
variables = {"name": source.name},
)
@@ -178,4 +184,6 @@ class Module:
def add_input(self, path, **kwargs):
from .source import Source
self.sources.append(Source(self.root, path, **kwargs))
s = Source(self.root, path, **kwargs)
self.sources.append(s)
return str(s.output)