From 277218fe1ba1e3616bd147c9d9abecfc56b9957f Mon Sep 17 00:00:00 2001 From: salmonik Date: Thu, 27 Aug 2026 18:39:29 +0200 Subject: build: default profile is release (debug too slow for dev loop) Makefile: PROFILE=release, CARGO_FLAGS=--release; make release target kept as no-op (now default). boot.sh: PROFILE=release default; --debug flag opt-in. mksystem.sh: PROFILE=release default. test-disk/fault/gfx/mouse/msg: all use --release. All scripts syntax-checked. --- Makefile | 6 +++--- scripts/boot.sh | 16 ++++++++++------ scripts/mksystem.sh | 4 ++-- scripts/test-disk.sh | 2 +- scripts/test-fault.sh | 2 +- scripts/test-gfx.sh | 2 +- scripts/test-mouse.sh | 2 +- scripts/test-msg.sh | 2 +- 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index be55e4e..d18a78a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # shellcheck shell=sh disable=SC2046,SC2091,SC2086,SC2155 # NOTE: $(VAR) in this file is MAKE syntax, not shell substitution. export TARGET=x86_64-unknown-uefi -export PROFILE=debug +export PROFILE=release export OUT_DIR=target/$(TARGET)/$(PROFILE) export ESP_DIR=esp export KERNEL=$(OUT_DIR)/rsdos.efi @@ -25,8 +25,8 @@ release: export OUT_DIR=target/$(TARGET)/release release: CARGO_FLAGS=--release release: all -# shellcheck disable=SC2034 -CARGO_FLAGS= +# CARGO_FLAGS set by PROFILE above +CARGO_FLAGS=--release $(OUT_DIR)/rsdos.efi: $(shell find rsnix shell rsdos -name '*.rs') Cargo.toml rsnix/Cargo.toml shell/Cargo.toml rsdos/Cargo.toml cargo build --package rsdos --target $(TARGET) $(CARGO_FLAGS) diff --git a/scripts/boot.sh b/scripts/boot.sh index 9c60dc9..cb017d8 100755 --- a/scripts/boot.sh +++ b/scripts/boot.sh @@ -32,8 +32,8 @@ OVMF="${OVMF:-/usr/share/edk2/x64/OVMF.4m.fd}" MEM="${MEM:-256M}" SMP="${SMP:-1}" SYSTEM_IMG="${SYSTEM_IMG:-/tmp/system.img}" -PROFILE="debug" -CARGO_FLAGS="" +PROFILE="release" + GUI="" DEBUG="" @@ -41,9 +41,9 @@ DEBUG="" source "$SCRIPT_DIR/lib-boot-args.sh" handle_arg() { case "$1" in - --release | -r) - PROFILE="release" - CARGO_FLAGS="--release" + --debug) + PROFILE="debug" + CARGO_FLAGS="" ;; *) echo "unknown: $1" @@ -57,7 +57,11 @@ OUT_DIR="target/x86_64-unknown-uefi/$PROFILE" # ---- build ---- echo "=== Building kernel ($PROFILE) ===" -cargo build --package rsdos --target x86_64-unknown-uefi $CARGO_FLAGS +if [ "$PROFILE" = "release" ]; then + cargo build --release --package rsdos --target x86_64-unknown-uefi +else + cargo build --package rsdos --target x86_64-unknown-uefi +fi # ---- stage system image ---- echo "=== Staging system image ===" diff --git a/scripts/mksystem.sh b/scripts/mksystem.sh index dfa481c..044c86c 100755 --- a/scripts/mksystem.sh +++ b/scripts/mksystem.sh @@ -78,7 +78,7 @@ while [ $# -gt 0 ]; do done TARGET=x86_64-unknown-uefi -PROFILE=debug +PROFILE=release OUT_DIR="target/$TARGET/$PROFILE" KERNEL="$OUT_DIR/rsdos.efi" BZIMAGE="esp/bzImage" @@ -109,7 +109,7 @@ fi # ---- build kernel ---- if [ ! -f "$KERNEL" ]; then echo "mksystem: building kernel..." - cargo build --package rsdos --target "$TARGET" + cargo build --release --package rsdos --target "$TARGET" fi # ---- build bootloader (chain mode only) ---- diff --git a/scripts/test-disk.sh b/scripts/test-disk.sh index b4b0fde..881b475 100755 --- a/scripts/test-disk.sh +++ b/scripts/test-disk.sh @@ -66,7 +66,7 @@ wait_qemu_exit() { } echo "==> 1/6 build kernel (debug)" -cargo build --package rsdos --target x86_64-unknown-uefi +cargo build --release --package rsdos --target x86_64-unknown-uefi echo "==> 2/6 ensure system image" if [ "$FRESH" -eq 1 ]; then diff --git a/scripts/test-fault.sh b/scripts/test-fault.sh index f21596d..be2d7cd 100755 --- a/scripts/test-fault.sh +++ b/scripts/test-fault.sh @@ -41,7 +41,7 @@ wait_log() { } echo "==> 1/5 build kernel (debug)" -cargo build --package rsdos --target x86_64-unknown-uefi +cargo build --release --package rsdos --target x86_64-unknown-uefi echo "==> 2/5 stage system image" "$SCRIPT_DIR/mksystem.sh" --force "$SYSTEM_IMG" diff --git a/scripts/test-gfx.sh b/scripts/test-gfx.sh index c5d6429..1c7f9ac 100755 --- a/scripts/test-gfx.sh +++ b/scripts/test-gfx.sh @@ -40,7 +40,7 @@ wait_log() { } echo "==> 1/5 build kernel (debug)" -cargo build --package rsdos --target x86_64-unknown-uefi +cargo build --release --package rsdos --target x86_64-unknown-uefi echo "==> 2/5 stage system image" "$SCRIPT_DIR/mksystem.sh" --force "$SYSTEM_IMG" diff --git a/scripts/test-mouse.sh b/scripts/test-mouse.sh index 56b6783..9f9f018 100755 --- a/scripts/test-mouse.sh +++ b/scripts/test-mouse.sh @@ -57,7 +57,7 @@ cursor_state() { } echo "==> 1/6 build kernel (debug)" -cargo build --package rsdos --target x86_64-unknown-uefi +cargo build --release --package rsdos --target x86_64-unknown-uefi echo "==> 2/6 stage system image" "$SCRIPT_DIR/mksystem.sh" --force "$SYSTEM_IMG" diff --git a/scripts/test-msg.sh b/scripts/test-msg.sh index 95b7af3..ff7fd72 100755 --- a/scripts/test-msg.sh +++ b/scripts/test-msg.sh @@ -60,7 +60,7 @@ wait_qemu_exit() { } echo "==> 1/5 build kernel (debug)" -cargo build --package rsdos --target x86_64-unknown-uefi +cargo build --release --package rsdos --target x86_64-unknown-uefi echo "==> 2/5 stage system image" "$SCRIPT_DIR/mksystem.sh" --force "$SYSTEM_IMG" -- cgit v1.2.3