summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorsalmonik <salmonik@tuta.io>2026-11-01 15:53:29 +0100
committersalmonik <salmonik@tuta.io>2026-11-01 15:53:29 +0100
commit7958276c9f0d230053520ba20f2a00f5ecda18e4 (patch)
tree596f5f71ad597ed951bae98de818cb37f171a18d /docs
parentfs: /bin alias for the system volume (diff)
downloadrs-dos-7958276c9f0d230053520ba20f2a00f5ecda18e4.tar.gz
rs-dos-7958276c9f0d230053520ba20f2a00f5ecda18e4.zip
scripts: rebuild the dev loop around build.sh/run.sh
`make` did not parse at all (missing separator at line 139), so every make target was dead. The folder also carried three overlapping launchers (boot.sh, qemu.sh, boot-image.sh) plus a fourth partial one in the Makefile, `cargo build --package rsdos` copy-pasted eight times, the QEMU invocation copy-pasted per script, and the test helpers (fail/wait_log/wait_qemu_exit/qemu_hmp) duplicated in five tests. New layout: - scripts/lib.sh: single config (image, OVMF, mem/smp), the one cargo invocation (build_all), the one QEMU shape (qemu_args), and the test harness (test_boot, wait_log, wait_qemu_exit, qemu_hmp, sendkeys) - scripts/build.sh: kernel + every bins/* in one pass - scripts/mksystem.sh: freshness-aware image build that now stages every bins/*.efi into /bin/cli|gui (they were never copied before) - scripts/run.sh: build + stage + boot in one command; --headless, --debug (GDB stub), --monitor (HMP socket), --fresh, --mem/--smp/ --bios/--image; on Wayland it auto-selects XWayland plus grab-on-hover so the mouse can be captured (Ctrl+Alt+G toggles) - scripts/tests/: the five automated tests on the shared harness - deleted: boot.sh, qemu.sh, boot-image.sh, lib-boot-args.sh, build-image-release.sh, build-bootloader.sh (rsboot chain dropped) The Makefile is now a thin wrapper: make run, make test, make system, make inspect, make help. Two-command flow: ./scripts/build.sh then ./scripts/run.sh (run.sh alone also works). Stale test assumptions fixed so the suite is green again: test-gfx waited for "gfx: check" while the shell prints "gfx check: PASS"; test-mouse/test-msg hardcoded msgrecv = task 3 (wm-input took slot 3 — ids are parsed from the log now); the queue-full probe targeted task 0, whose exec pump drains its own queue as completion codes (moved to the cursor task, which never recvs). Verified in QEMU: make test -> test-disk, test-gfx, test-mouse, test-msg, test-fault all PASS.
Diffstat (limited to '')
-rw-r--r--docs/adr/0002-keyword-redirection-and-post-filters.md2
-rw-r--r--docs/plan-executable-binaries.md4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/adr/0002-keyword-redirection-and-post-filters.md b/docs/adr/0002-keyword-redirection-and-post-filters.md
index 1584077..227ce2c 100644
--- a/docs/adr/0002-keyword-redirection-and-post-filters.md
+++ b/docs/adr/0002-keyword-redirection-and-post-filters.md
@@ -65,7 +65,7 @@ cmd args [USE src] [TIL marker] [filters…] [output kw dst]
65 -t 10`) is expressible without a pipe; ^C flushes the held-back 65 -t 10`) is expressible without a pipe; ^C flushes the held-back
66 window instead of losing it. 66 window instead of losing it.
67- **Negative:** Breaks existing muscle memory and tooling: POSIX users 67- **Negative:** Breaks existing muscle memory and tooling: POSIX users
68 must learn the keywords; `scripts/test-disk.sh` and the `help` text 68 must learn the keywords; `scripts/tests/test-disk.sh` and the `help` text
69 must be rewritten from `echo >` to the keyword syntax. 69 must be rewritten from `echo >` to the keyword syntax.
70- **Negative:** Keywords are reserved, so printing text like `WRITING` 70- **Negative:** Keywords are reserved, so printing text like `WRITING`
71 requires quoting; unknown commands cannot be filtered with flags 71 requires quoting; unknown commands cannot be filtered with flags
diff --git a/docs/plan-executable-binaries.md b/docs/plan-executable-binaries.md
index cd6f1d0..138b8e0 100644
--- a/docs/plan-executable-binaries.md
+++ b/docs/plan-executable-binaries.md
@@ -11,7 +11,7 @@ the glossary rules.
11The build produces one dd-able FAT32 image instead of the current 11The build produces one dd-able FAT32 image instead of the current
12two-source setup (vvfat `esp/` directory + separate `/tmp/disk.img`). 12two-source setup (vvfat `esp/` directory + separate `/tmp/disk.img`).
13 13
14- [ ] Extend `scripts/mkdisk.sh` (or add `scripts/mksystem.sh`) to create 14- [x] `scripts/mksystem.sh` creates
15 `system.img`: `mkfs.fat -C`, then `mcopy` in 15 `system.img`: `mkfs.fat -C`, then `mcopy` in
16 `\bzImage`, `\EFI\` (as rsbl requires), `\etc\*` (motd moves out of 16 `\bzImage`, `\EFI\` (as rsbl requires), `\etc\*` (motd moves out of
17 the `fs.rs` code literal? — optional here), seed content. 17 the `fs.rs` code literal? — optional here), seed content.
@@ -97,7 +97,7 @@ is absent; **version bump to 0.6.0**.
97- [ ] Migrate `cat` last (input consumer of every corner: heredoc, USE, 97- [ ] Migrate `cat` last (input consumer of every corner: heredoc, USE,
98 TIL sugar, multi-path). 98 TIL sugar, multi-path).
99 99
100**Gate:** full `scripts/test-disk.sh` grammar suite passes unchanged with 100**Gate:** full `scripts/tests/test-disk.sh` grammar suite passes unchanged with
101external binaries; `-h/-t/-g/-p` chains work across the task boundary; 101external binaries; `-h/-t/-g/-p` chains work across the task boundary;
102^C flushes a tail window on an infinite stream. 102^C flushes a tail window on an infinite stream.
103 103