From 7958276c9f0d230053520ba20f2a00f5ecda18e4 Mon Sep 17 00:00:00 2001 From: salmonik Date: Sun, 1 Nov 2026 15:53:29 +0100 Subject: scripts: rebuild the dev loop around build.sh/run.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `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. --- scripts/lib-boot-args.sh | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 scripts/lib-boot-args.sh (limited to 'scripts/lib-boot-args.sh') diff --git a/scripts/lib-boot-args.sh b/scripts/lib-boot-args.sh deleted file mode 100644 index ec97500..0000000 --- a/scripts/lib-boot-args.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash -# -# scripts/lib-boot-args.sh — shared CLI parsing for the QEMU boot scripts. -# Sourced, not executed. The caller sets default values for GUI/DEBUG/ -# MEM/SMP first, then calls `parse_boot_args "$@"`. A caller with extra -# flags defines its own `handle_arg()` to intercept them before the -# shared cases run (unknown args still fail loudly). -set -euo pipefail - -parse_boot_args() { - while [ $# -gt 0 ]; do - case "$1" in - --gui | -g) GUI="-vga std" ;; - --debug | -d) DEBUG="-s -S" ;; - --mem) - shift - MEM="$1" - ;; - --smp) - shift - SMP="$1" - ;; - --help | -h) - head -20 "$0" | grep "^#" | sed 's/^# //' - exit 0 - ;; - *) handle_arg "$1" ;; - esac - shift - done -} - -# Default: no extra flags. A script with more defines its own before -# calling parse_boot_args. -handle_arg() { - echo "unknown: $1" - exit 1 -} -- cgit v1.2.3