Skip to content

Commit

Permalink
Merge branch 'main' into eliza/fix-plic-mask
Browse files Browse the repository at this point in the history
  • Loading branch information
hawkw authored Dec 27, 2024
2 parents 6e838b7 + 6536ed7 commit 09e9b38
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[alias]
crowtty = "run --bin crowtty --release --"
crowtty = "run --package crowtty --bin crowtty --release --"
melpomene = "run --bin melpomene --release --"
melpo = "melpomene"
forth3 = "run --bin f3repl --release --"
Expand All @@ -23,7 +23,7 @@ runner = "cargo run --package mnemos-x86_64-bootimager -- --kernel-bin"
# `rust-osdev/bootloader`, where a target crate depends on the kernel binary
# artifact from the kernel core crate and links it with the bootloader binary in
# a `build.rs` script.
#
#
# Artifact dependencies are also used by `manganese` to depend on binary crates
# as normal Cargo.toml dependencies.
#
Expand Down
4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ default-members = [
# tools
# note that this skips `manganese` by default, so that we don't build its
# dependency features when running `cargo check --all-features` and similar.
#
# also, crowtty is excluded by default, as it depends on `libudev` on Linux,
# and we would like to be able to build documentation without having to
# install libudev on CI.
"tools/libcrowtty",
"tools/dumbloader",
"tools/f3repl",
Expand Down
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ _x86-bootimager cmd *args='':
# run crowtty (a host serial multiplexer, log viewer, and pseudo-keyboard)
crowtty *FLAGS:
{{ _cargo }} run --profile {{ profile }} --bin crowtty -- {{ FLAGS }}
{{ _cargo }} run --package crowtty --profile {{ profile }} --bin crowtty -- {{ FLAGS }}
# run the Melpomene simulator
melpomene *FLAGS:
Expand Down
1 change: 1 addition & 0 deletions tools/crowtty/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ features = ["std"]

[dependencies.miette]
workspace = true
features = ["fancy"]

0 comments on commit 09e9b38

Please sign in to comment.