justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[build] Refactor build options definitions

Browse Source 
Split out build definition YAML files to allow different options based
on config, target, kind of module, and target/kind combination.
This commit is contained in:
Justin C. Miller
2023-07-30 23:44:04 -06:00
parent 778e766f6b
commit 21916ab869
14 changed files with 261 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
scripts/bonnibel/project.py
View File

@@ -12,14 +12,17 @@ class Project:
def generate(self, root, output, modules, config, manifest_file):
import sys
import bonnibel
from os.path import join
from ninja.ninja_syntax import Writer
from .target import Target
targets = set()
kinds = set()
for mod in modules.values():
targets.update({Target.load(root, t, config) for t in mod.targets})
targets.update(mod.targets)
kinds.add(mod.kind)
from .config import generate_configs
config_deps = generate_configs(root, output, config, targets, kinds)
with open(output / "build.ninja", "w") as buildfile:
build = Writer(buildfile)
@@ -47,7 +50,7 @@ class Project:
build.newline()
for target in targets:
build.subninja(output / target.name / "target.ninja")
build.subninja(output / target / "target.ninja")
build.newline()
build.build(
@@ -151,6 +154,9 @@ class Project:
for program in manifest.drivers:
add_initrd_stripped("jsix/drivers", program)
for program in manifest.tools:
add_initrd_stripped("jsix/tools", program)
syms = manifest.add_data("symbol_table.dat",
"Symbol table", ("symbols",))
@@ -229,8 +235,7 @@ class Project:
[f"{self.root}/configure", str(manifest_file)] + \
[str(mod.modfile) for mod in modules.values()]
for target in targets:
regen_implicits += target.depfiles
regen_implicits += list(map(str, config_deps))
build.build(
rule = "compdb",
@@ -246,7 +251,7 @@ class Project:
implicit = regen_implicits,
implicit_outputs =
[f"module.{mod.name}.ninja" for mod in modules.values()] +
[f"{target.name}/target.ninja" for target in targets] +
[f"{target}/target.ninja" for target in targets] +
[boot_config],
)
@@ -254,9 +259,9 @@ class Project:
build.default(["${build_root}/jsix.img"])
for target in targets:
mods = [m.name for m in modules.values() if target.name in m.targets]
mods = [m.name for m in modules.values() if target in m.targets]
targetdir = output / target.name
targetdir = output / target
targetdir.mkdir(exist_ok=True)
buildfilename = str(targetdir / "target.ninja")
@@ -265,17 +270,16 @@ class Project:
build.comment("This file is automatically generated by bonnibel")
build.newline()
build.variable("target", target.name)
build.variable("target_dir", output / target.name)
build.variable("target", target)
build.variable("target_dir", output / target)
build.newline()
for name, value in target.items():
build.variable(name, value)
build.include(f"{target}/config.ninja")
build.newline()
for kind in ('defs', 'run'):
for lang in ('c', 'cpp'):
deffile = str(output / target.name / f"{lang}.{kind}")
deffile = str(output / target / f"{lang}.{kind}")
build.build(
rule = f"dump_{lang}_{kind}",