From 72db77fb589e5a268f76089dcd058fc7ea36991b Mon Sep 17 00:00:00 2001 From: "Justin C. Miller" Date: Mon, 30 Jan 2023 00:42:35 -0800 Subject: [PATCH] [build] Move configs/ to assets/build/ I was sick of `configs` colliding with `configure`, and these are (mostly) static asset files anyway, they should live under assets/. --- {configs => assets/build}/base.yaml | 0 {configs => assets/build}/boot-debug.yaml | 0 {configs => assets/build}/kernel-debug.yaml | 0 {configs => assets/build}/rules.ninja | 0 {configs => assets/build}/user-debug.yaml | 0 scripts/bonnibel/project.py | 2 +- scripts/bonnibel/target.py | 2 +- 7 files changed, 2 insertions(+), 2 deletions(-) rename {configs => assets/build}/base.yaml (100%) rename {configs => assets/build}/boot-debug.yaml (100%) rename {configs => assets/build}/kernel-debug.yaml (100%) rename {configs => assets/build}/rules.ninja (100%) rename {configs => assets/build}/user-debug.yaml (100%) diff --git a/configs/base.yaml b/assets/build/base.yaml similarity index 100% rename from configs/base.yaml rename to assets/build/base.yaml diff --git a/configs/boot-debug.yaml b/assets/build/boot-debug.yaml similarity index 100% rename from configs/boot-debug.yaml rename to assets/build/boot-debug.yaml diff --git a/configs/kernel-debug.yaml b/assets/build/kernel-debug.yaml similarity index 100% rename from configs/kernel-debug.yaml rename to assets/build/kernel-debug.yaml diff --git a/configs/rules.ninja b/assets/build/rules.ninja similarity index 100% rename from configs/rules.ninja rename to assets/build/rules.ninja diff --git a/configs/user-debug.yaml b/assets/build/user-debug.yaml similarity index 100% rename from configs/user-debug.yaml rename to assets/build/user-debug.yaml diff --git a/scripts/bonnibel/project.py b/scripts/bonnibel/project.py index 685e0f8..93fc36a 100644 --- a/scripts/bonnibel/project.py +++ b/scripts/bonnibel/project.py @@ -30,7 +30,7 @@ class Project: build.variable("source_root", root) build.newline() - build.include(root / "configs" / "rules.ninja") + build.include(root / "assets/build/rules.ninja") build.newline() build.variable("version_major", self.version.major) diff --git a/scripts/bonnibel/target.py b/scripts/bonnibel/target.py index 30a076b..aa3c32f 100644 --- a/scripts/bonnibel/target.py +++ b/scripts/bonnibel/target.py @@ -8,7 +8,7 @@ class Target(dict): if (name, config) in cls.__targets: return cls.__targets[(name, config)] - configs = root / "configs" + configs = root / "assets/build" dicts = [] depfiles = []