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

[build] Move to yaml-based build config and manifest

Browse Source 
Overall, I believe TOML to be a superior configuration format than YAML
in many situations, but it gets ugly quickly when nesting data
structures. The build configs were fine in TOML, but the manifest (and
my future plans for it) got unwieldy. I also did not want different
formats for each kind of configuration on top of also having a custom
DSL for interface definitions, so I've switched all the TOML to YAML.

Also of note is that this change actually adds structure to the manifest
file, which was little more than a CSV previously.
This commit is contained in:
Justin C. Miller
2021-09-05 13:07:09 -07:00
parent 186724e751
commit c9d713fc7f
11 changed files with 101 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/bonnibel/project.py
View File

@@ -10,11 +10,12 @@ class Project:
def __str__(self):
return f"{self.name} {self.version.major}.{self.version.minor}.{self.version.patch}-{self.version.sha}"
def generate(self, root, output, modules, config, manifest):
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 . import load_config
from .target import Target
targets = set()
@@ -47,11 +48,7 @@ class Project:
fatroot.mkdir(exist_ok=True)
fatroot_content = []
for line in open(manifest, 'r'):
target, name = line.split(",", 1)
target = target.strip()
name = name.strip()
def add_fatroot(name, target):
if not name in modules:
raise BonnibelError(f"Manifest item '{name}' is not a known module")
@@ -66,9 +63,23 @@ class Project:
"name": f"Installing {name}",
"debug": f"${{build_root}}/{mod.output}.debug",
})
fatroot_content.append(fatroot_output)
build.newline()
manifest = load_config(manifest_file)
programs = manifest.get("programs", tuple())
kernel = manifest.get("kernel", dict())
add_fatroot(
kernel.get("name", "kernel"),
kernel.get("target", "kernel"))
for program in programs:
name = program["name"]
target = program.get("target", "user")
add_fatroot(name, target)
symbol_table = "${build_root}/fatroot/symbol_table.dat"
build.build(
rule = "makest",
@@ -123,7 +134,7 @@ class Project:
build.newline()
regen_implicits = \
[f"{self.root}/configure", str(manifest)] + \
[f"{self.root}/configure", str(manifest_file)] + \
[str(mod.modfile) for mod in modules.values()]
for target in targets: