chore: Ok, it's yet another Navy

This commit is contained in:
Jordan ⌨️ 2023-12-15 22:31:52 +01:00
parent 6a90e556c4
commit 0d981455cf
6 changed files with 9 additions and 9 deletions

View file

@ -6,7 +6,7 @@ class Builder:
self.__registry = model.Registry.use(args) self.__registry = model.Registry.use(args)
self.__kernel_scope = builder.TargetScope( self.__kernel_scope = builder.TargetScope(
self.__registry, self.__registry,
self.__registry.lookup(f"kernel-{arch}", model.Target), self.__registry.lookup(f"navy-{arch}", model.Target),
) )
def build_core(self) -> Path: def build_core(self) -> Path:

View file

@ -4,12 +4,12 @@ from . import build
from . import image from . import image
from . import qemu from . import qemu
@cli.command("k", "kernel", "kernel related commands") @cli.command("n", "navy", "Navy related commands")
def _(args: cli.Args): def _(args: cli.Args):
pass pass
@cli.command("b", "kernel/boot", "Boot kernel") @cli.command("b", "navy/boot", "Boot Navy")
def _(args: cli.Args): def _(args: cli.Args):
qemu.Qemu( qemu.Qemu(
image.Image( image.Image(
@ -18,6 +18,6 @@ def _(args: cli.Args):
).run() ).run()
@cli.command("B", "kernel/build", "Build kernel") @cli.command("B", "navy/build", "Build Navy")
def _(args: cli.Args): def _(args: cli.Args):
build.Builder(args).build_core() build.Builder(args).build_core()

View file

@ -4,7 +4,7 @@ from cutekit import const, shell
from .build import Builder from .build import Builder
class Image: class Image:
def __init__(self, builder: Builder, dst: Path = Path(".") / const.PROJECT_CK_DIR / "kernel"): def __init__(self, builder: Builder, dst: Path = Path(".") / const.PROJECT_CK_DIR / "navy"):
self.builder = builder self.builder = builder
self.path = dst self.path = dst
@ -38,7 +38,7 @@ class Image:
cfg = [ cfg = [
"TIMEOUT=0", "TIMEOUT=0",
"GRAPHICS=no", "GRAPHICS=no",
":kernel", ":navy",
"PROTOCOL=limine", "PROTOCOL=limine",
"KERNEL_PATH=boot:///boot/kernel.elf", "KERNEL_PATH=boot:///boot/kernel.elf",
] ]

View file

@ -1,12 +1,12 @@
{ {
"$schema": "https://schemas.cute.engineering/stable/cutekit.manifest.target.v1", "$schema": "https://schemas.cute.engineering/stable/cutekit.manifest.target.v1",
"id": "kernel-x86_64", "id": "navy-x86_64",
"type": "target", "type": "target",
"props": { "props": {
"toolchain": "clang", "toolchain": "clang",
"arch": "x86_64", "arch": "x86_64",
"bits": "64", "bits": "64",
"sys": "kernel", "sys": "navy",
"loader": "limine", "loader": "limine",
"abi": "sysv", "abi": "sysv",
"encoding": "utf8", "encoding": "utf8",

View file

@ -1,7 +1,7 @@
{ {
"$schema": "https://schemas.cute.engineering/stable/cutekit.manifest.project.v1", "$schema": "https://schemas.cute.engineering/stable/cutekit.manifest.project.v1",
"type": "project", "type": "project",
"id": "kernel", "id": "navy-org/navy",
"extern": { "extern": {
"cute-engineering/libheap": { "cute-engineering/libheap": {
"git": "https://github.com/cute-engineering/libheap.git", "git": "https://github.com/cute-engineering/libheap.git",