From 7958276c9f0d230053520ba20f2a00f5ecda18e4 Mon Sep 17 00:00:00 2001
From: salmonik <salmonik@tuta.io>
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/qemu.sh | 99 ---------------------------------------------------------
 1 file changed, 99 deletions(-)
 delete mode 100755 scripts/qemu.sh

(limited to 'scripts/qemu.sh')

diff --git a/scripts/qemu.sh b/scripts/qemu.sh
deleted file mode 100755
index eeaf4de..0000000
--- a/scripts/qemu.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/env bash
-# =============================================================================
-# scripts/qemu.sh — flexible QEMU launcher for rs-dos
-#
-# Usage:
-#   ./scripts/qemu.sh                     # serial console (no graphics)
-#   ./scripts/qemu.sh --gui               # graphical window
-#   ./scripts/qemu.sh --debug             # GDB stub on :1234
-#   ./scripts/qemu.sh --chain             # full boot chain (firmware → rsboot → rsnix)
-#   ./scripts/qemu.sh --bios /path/to.fd  # custom OVMF
-#   ./scripts/qemu.sh --mem 512M          # memory size
-#   ./scripts/qemu.sh --smp 2             # SMP cores
-#
-# One image, one drive — the system image contains kernel + ESP + data.
-# =============================================================================
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-PROJECT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
-cd "$PROJECT_DIR"
-
-# Defaults
-GUI_FLAG=""
-DEBUG_FLAG=""
-CHAIN_FLAG=""
-OVMF="${OVMF:-/usr/share/edk2/x64/OVMF.4m.fd}"
-MEM="${MEM:-256M}"
-SMP="${SMP:-1}"
-SYSTEM_IMG="${SYSTEM_IMG:-/tmp/system.img}"
-
-# Pre-build
-make all
-
-# Parse args
-while [ $# -gt 0 ]; do
-	case "$1" in
-	--gui | -g)
-		GUI_FLAG="-vga std"
-		shift
-		;;
-	--debug | -d)
-		DEBUG_FLAG="-s -S"
-		shift
-		;;
-	--chain | -c)
-		CHAIN_FLAG=1
-		SYSTEM_IMG="${SYSTEM_IMG:-rs-dos.img}"
-		shift
-		;;
-	--image | -i)
-		SYSTEM_IMG="$2"
-		shift 2
-		;;
-	--bios | -b)
-		OVMF="$2"
-		shift 2
-		;;
-	--mem)
-		MEM="$2"
-		shift 2
-		;;
-	--smp)
-		SMP="$2"
-		shift 2
-		;;
-	*)
-		echo "unknown: $1"
-		exit 1
-		;;
-	esac
-done
-
-# Stage system image if needed
-if [ -n "$CHAIN_FLAG" ]; then
-	./scripts/mksystem.sh --chain --gpt "$SYSTEM_IMG"
-else
-	./scripts/mksystem.sh "$SYSTEM_IMG"
-fi
-
-echo ""
-echo "=== Booting ==="
-echo "  image:  $SYSTEM_IMG"
-echo "  ovmf:   $OVMF"
-echo "  mem:    $MEM   smp: $SMP"
-echo "  gui:    $([ -n "$GUI_FLAG" ] && echo yes || echo no)"
-echo "  gdb:    $([ -n "$DEBUG_FLAG" ] && echo ':1234' || echo off)"
-echo ""
-
-exec qemu-system-x86_64 \
-	-bios "$OVMF" \
-	-drive "file=$SYSTEM_IMG,format=raw,if=none,id=hd" \
-	-device ide-hd,drive=hd \
-	-serial stdio \
-	-m "$MEM" \
-	-machine q35 \
-	-cpu qemu64 \
-	-no-reboot \
-	-smp "$SMP" \
-	$GUI_FLAG $DEBUG_FLAG
-- 
cgit v1.2.3