build(makefile): 增强构建系统功能并改进日志输出

Author: moyanj

Makefile

@@ -1,7 +1,10 @@
 # Proka Kernel - Root Makefile
 # Copyright (C) RainSTR Studio 2025-2026, All Rights Reserved.
 
-.DEFAULT_GOAL := all
+.DEFAULT_GOAL := help
+
+# OS detection
+UNAME_S := $(shell uname -s)
 
 # Verbosity control
 ifeq ($(V),1)
@@ -10,6 +13,20 @@ else
     Q := @
 endif
 
+# Logging macro
+define log_info
+	@echo "[INFO] $(1)"
+endef
+define log_success
+	@echo "[OK]   $(1)"
+endef
+define log_warn
+	@echo "[WARN] $(1)"
+endef
+define log_error
+	@echo "[ERR]  $(1)"
+endef
+
 # Core variables
 BUILD_DIRS   ?= kernel
 TARGET_DIR   ?= $(CURDIR)/target
@@ -22,32 +39,76 @@ INITRD       ?= assets/initrd.cpio
 XORRISO      ?= xorriso
 XORRISOFLAGS ?= -as mkisofs --efi-boot limine/limine-uefi-cd.bin -quiet
 QEMU         ?= qemu-system-x86_64
-QEMU_FLAGS   ?= -bios ./assets/OVMF.fd -cdrom $(ISO_IMAGE) --machine q35 -m 1G
+
+# Accelerator selection
+ifeq ($(UNAME_S),Linux)
+    QEMU_ACCEL ?= -enable-kvm
+else ifeq ($(UNAME_S),Darwin)
+    QEMU_ACCEL ?= -accel hvf
+endif
+
+QEMU_FLAGS   ?= -bios ./assets/OVMF.fd -cdrom $(ISO_IMAGE) --machine q35 -m 1G $(QEMU_ACCEL)
 QEMU_OUT     ?= -serial stdio
 QEMU_EXTRA   ?=
 
 # Profile handling (default to release)
 PROFILE      ?= dev
 export PROFILE
 
-.PHONY: all debug clean distclean run rundebug menuconfig iso $(BUILD_DIRS) docs-build docs-serve docs-clean
+.PHONY: all help debug clean distclean run rundebug menuconfig iso $(BUILD_DIRS) \
+        docs-build docs-serve docs-clean test clippy fmt check-tools
+
+help:
+	@echo "$(COLOR_INFO)Proka Kernel Build System$(COLOR_RESET)"
+	@echo ""
+	@echo "Usage: make [target] [VARIABLES]"
+	@echo ""
+	@echo "Targets:"
+	@echo "  all          Build the kernel"
+	@echo "  iso          Create a bootable ISO image"
+	@echo "  run          Run the kernel in QEMU (with $(QEMU_ACCEL))"
+	@echo "  rundebug     Run the kernel in QEMU with GDB stub (-s -S)"
+	@echo "  test         Run kernel tests"
+	@echo "  clippy       Run clippy lints"
+	@echo "  fmt          Format kernel source code"
+	@echo "  menuconfig   Open kernel configuration menu"
+	@echo "  clean        Remove build artifacts"
+	@echo "  distclean    Full cleanup including target directory"
+	@echo "  doc          Build documentation"
+	@echo "  check-tools  Verify required build tools are installed"
+	@echo ""
+	@echo "Variables:"
+	@echo "  V=1          Enable verbose output"
+	@echo "  PROFILE=dev  Set build profile (dev/release, default: dev)"
+	@echo "  QEMU_ACCEL=  Override QEMU accelerator flags"
+	@echo ""
+	@echo "Detected OS: $(UNAME_S)"
+
+# Tool check
+check-tools:
+	$(call log_info,Checking build tools...)
+	@command -v $(XORRISO) >/dev/null 2>&1 || ( $(call log_error,$(XORRISO) not found); exit 1 )
+	@command -v $(QEMU) >/dev/null 2>&1 || ( $(call log_error,$(QEMU) not found); exit 1 )
+	@command -v cargo >/dev/null 2>&1 || ( $(call log_error,cargo not found); exit 1 )
+	@command -v cpio >/dev/null 2>&1 || ( $(call log_error,cpio not found); exit 1 )
+	$(call log_success,All tools found.)
 
 # Documentation targets
 doc:
-	@echo "Building guide (mdBook)..."
+	$(call log_info,Building guide (mdBook)...)
 	$(Q)mdbook build
-	@echo "Building API documentation (rustdoc)..."
+	$(call log_info,Building API documentation (rustdoc)...)
 	$(Q)cd kernel && cargo doc --no-deps
 	$(Q)rm -rf book/api
 	$(Q)cp -r kernel/target/x86_64-unknown-none/doc book/api
-	@echo "Documentation built in book/"
+	$(call log_success,Documentation built in book/)
 
 docs-serve:
-	@echo "Serving documentation..."
+	$(call log_info,Serving documentation...)
 	$(Q)mdbook serve --hostname 0.0.0.0
 
 docs-clean:
-	@echo "Cleaning documentation..."
+	$(call log_info,Cleaning documentation...)
 	$(Q)mdbook clean
 	$(Q)rm -rf book
 	$(Q)cd kernel && cargo clean --doc
@@ -59,25 +120,26 @@ debug:
 	$(Q)$(MAKE) PROFILE=dev all
 
 $(BUILD_DIRS):
-	@echo "Entering directory: $@"
+	$(call log_info,Entering directory: $@)
 	$(Q)mkdir -p $(OBJ_DIR)
 	$(Q)$(MAKE) -C $@ OBJ_DIR=$(OBJ_DIR) V=$(V)
 
 # ISO image creation
-iso: all $(INITRD)
-	@echo "Creating ISO image: $(ISO_IMAGE)"
+ROOTFS_SRC := $(shell find assets/rootfs -type f 2>/dev/null)
+iso: all $(INITRD) $(ROOTFS_SRC)
+	$(call log_info,Creating ISO image: $(ISO_IMAGE))
 	$(Q)mkdir -p $(ISO_DIR)
 	$(Q)cp -r ./assets/rootfs/* $(ISO_DIR)/
 	$(Q)cp $(INITRD) $(ISO_DIR)/initrd.cpio
 	$(Q)cp ./kernel/kernel $(ISO_DIR)/kernel
 	$(Q)$(XORRISO) $(XORRISOFLAGS) $(ISO_DIR) -o $(ISO_IMAGE)
 	$(Q)rm -rf $(ISO_DIR)
-	@echo "ISO build complete."
+	$(call log_success,ISO build complete.)
 
 # Initrd creation
 INITRD_SRC := $(shell find assets/initrd -type f 2>/dev/null)
 $(INITRD): $(INITRD_SRC)
-	@echo "Creating initrd: $@"
+	$(call log_info,Creating initrd: $@)
 	$(Q)mkdir -p assets
 	$(Q)cd assets/initrd && find . -print | cpio -H newc -o > ../initrd.cpio 2>/dev/null
 
@@ -88,6 +150,14 @@ run: iso
 rundebug:
 	$(Q)$(MAKE) QEMU_EXTRA="-s -S" run
 
+test:
+	$(call log_info,Running kernel tests...)
+	$(Q)$(MAKE) -C kernel test
+
+clippy:
+	$(call log_info,Running clippy...)
+	$(Q)$(MAKE) -C kernel clippy
+
 menuconfig:
 	$(Q)$(MAKE) -C kernel menuconfig
 
@@ -101,8 +171,9 @@ clean: docs-clean
 	done
 	$(Q)rm -f $(ISO_IMAGE) $(INITRD)
 	$(Q)rm -rf $(OBJ_DIR)
-	@echo "Cleaned."
+	$(call log_success,Cleaned.)
 
 distclean: clean
 	$(Q)rm -rf $(TARGET_DIR)
-	@echo "Full cleanup complete."
+	$(call log_success,Full cleanup complete.)
+

kernel/Makefile

@@ -6,14 +6,14 @@ MAKEFLAGS += -rR
 .SUFFIXES:
 
 # Output binary name
-OUTPUT := kernel
+OUTPUT     := kernel
 # Cargo package name
-PKG_NAME := proka-kernel
+PKG_NAME   := proka-kernel
 # Rust target triple
 RUST_TARGET := x86_64-unknown-none
 
 # Build profile (dev, release)
-PROFILE ?= release
+PROFILE    ?= release
 # Map 'dev' to Cargo's 'debug' directory
 ifeq ($(PROFILE),dev)
     PROFILE_DIR := debug
@@ -28,10 +28,13 @@ else
     Q := @
 endif
 
+# Rust compilation flags
+RUSTFLAGS  ?= -C relocation-model=static
+
 # Binary path relative to kernel directory
 BIN_PATH := target/$(RUST_TARGET)/$(PROFILE_DIR)/$(PKG_NAME)
 
-.PHONY: all clean distclean
+.PHONY: all clean distclean menuconfig fmt clippy test
 
 all: $(OUTPUT)
 
@@ -41,7 +44,13 @@ $(OUTPUT): $(BIN_PATH)
 
 $(BIN_PATH): .FORCE
 	@echo "Building kernel in $(PROFILE) mode..."
-	$(Q)RUSTFLAGS="-C relocation-model=static" cargo anaxa build --no-env --target $(RUST_TARGET) --profile $(PROFILE)
+	$(Q)RUSTFLAGS="$(RUSTFLAGS)" cargo anaxa build --no-env --target $(RUST_TARGET) --profile $(PROFILE)
+
+clippy:
+	$(Q)RUSTFLAGS="$(RUSTFLAGS)" cargo clippy --target $(RUST_TARGET) --all-features
+
+test:
+	$(Q)RUSTFLAGS="$(RUSTFLAGS)" cargo test --lib --target $(RUST_TARGET)
 
 .FORCE:
 

kernel/src/memory/Kconfig.toml

@@ -3,7 +3,7 @@ title = "Memory Manager"
 [[config]]
 name = "KERNEL_INIT_HEAP_SIZE"
 type = "int"
-default = 8388608
+default = 65536
 desc = "The size of the init heap memory (Unit: Bytes)."
 help = "Default init heap size for the kernel."
 rust_type = "u64"
@@ -19,7 +19,7 @@ rust_type = "usize"
 [[config]]
 name = "OOM_EXPAND_SIZE"
 type = "int"
-default = 4096
+default = 1048576                                               # 1MB
 desc = "The size of expand when OOM (Unit: Bytes)."
 help = "The size of expand when OOM. Maximum expansion is 4MB."
 rust_type = "u64"

kernel/src/memory/heap.rs

@@ -92,7 +92,7 @@ pub fn init_heap(
 ) -> Result<(), MapToError<Size4KiB>> {
     let heap_start = VirtAddr::new(HEAP_START as u64);
     // Map initial 64KB for boot-strapping VMM
-    let initial_size = 64 * 1024;
+    let initial_size = crate::config::KERNEL_INIT_HEAP_SIZE;
     let heap_end = heap_start + initial_size;
 
     let page_range = {

tests/Makefile

@@ -1,19 +1,35 @@
-# Proka Kernel - A kernel for ProkaOS
+# Proka Kernel - Test Makefile
 # Copyright (C) RainSTR Studio 2025, All Rights Reserved.
-#
-# This is the Makefile, which will build the C code
-# only and link with ASM code.
 
-# The ASM source
-C_CODE = $(wildcard *.c)
-CFLAGS = -std=gnu99 -ffreestanding -O0 -Wall -Wextra -fPIE -fno-stack-protector -lgcc
-C_MODE_FLAGS := $(if $(DEBUG),-g)
+# Build configuration
+CC      := gcc
+CFLAGS  := -std=gnu99 -ffreestanding -O0 -Wall -Wextra -fPIE -fno-stack-protector
+LDFLAGS := -lgcc
 
-# The object file
-OBJ_FILES = $(patsubst %.c,$(OBJ_DIR)/%.o,$(C_CODE))
+# Debug mode
+ifeq ($(DEBUG),1)
+    CFLAGS += -g
+endif
 
-# Build
-all: $(OBJ_FILES)
+# Source and objects
+SRCS    := $(wildcard *.c)
+OBJS    := $(patsubst %.c,$(OBJ_DIR)/%.o,$(SRCS))
+DEPS    := $(OBJS:.o=.d)
 
+# Ensure OBJ_DIR exists
+$(shell mkdir -p $(OBJ_DIR))
+
+.PHONY: all clean
+
+all: $(OBJS)
+
+# Include dependency files
+-include $(DEPS)
+
+# Compile C source to object
 $(OBJ_DIR)/%.o: %.c
-	gcc -c $(CFLAGS) $(C_MODE_FLAGS) $< -o $@
+	@echo "  CC      $<"
+	$(Q)$(CC) -MMD -MP -c $(CFLAGS) $< -o $@
+
+clean:
+	$(Q)rm -f $(OBJS) $(DEPS)