X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/e0ee3d449aacd33a84cb1f58961e55f9f06acb46..0765e7c133eb393d8cd0292af444543c2edf8ccc:/lunaix-os/makefile?ds=sidebyside

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index 2ffc930..c332bf7 100644
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -1,76 +1,108 @@
-OS_ARCH := x86
+mkinc_dir := $(CURDIR)/makeinc
 
-BUILD_DIR := build
-KERNEL_DIR := kernel
-OBJECT_DIR := $(BUILD_DIR)/obj
-BIN_DIR := $(BUILD_DIR)/bin
-ISO_DIR := $(BUILD_DIR)/iso
-ISO_BOOT_DIR := $(ISO_DIR)/boot
-ISO_GRUB_DIR := $(ISO_BOOT_DIR)/grub
+include $(mkinc_dir)/os.mkinc
+include $(mkinc_dir)/toolchain.mkinc
+include $(mkinc_dir)/qemu.mkinc
+include $(mkinc_dir)/utils.mkinc
 
-INCLUDES_DIR := includes
-INCLUDES := $(patsubst %, -I%, $(INCLUDES_DIR))
+ARCH ?= i386
+export ARCH
 
-OS_NAME = lunaix
-OS_BIN = $(OS_NAME).bin
-OS_ISO = $(OS_NAME).iso
+DEPS := $(CC) $(LD) $(AR) xorriso grub-mkrescue
 
-CC := i686-elf-gcc
-AS := i686-elf-as
+CMDLINE ?= console=/dev/ttyFB0
 
-O := -O3
-W := -Wall -Wextra
-CFLAGS := -std=gnu99 -ffreestanding $(O) $(W)
-LDFLAGS := -ffreestanding $(O) -nostdlib -lgcc
+kbuild_dir := build
+kbin_dir := $(kbuild_dir)/bin
+os_img_dir := $(kbuild_dir)/img
 
-SOURCE_FILES := $(shell find -name "*.[cS]")
-SRC := $(patsubst ./%, $(OBJECT_DIR)/%.o, $(SOURCE_FILES))
+os_build_tag := $(OS_NAME)_$(ARCH)_$(OS_VER)
+kbin := $(kbin_dir)/kernel.bin
+kimg := $(kbuild_dir)/$(os_build_tag).iso
 
-$(OBJECT_DIR):
-	@mkdir -p $(OBJECT_DIR)
+$(DEPS):
+	@echo -n "checking $@ .... "
+	@if which $@ > /dev/null; then \
+		echo "ok";\
+	else\
+		echo "failed" && exit 1;\
+	fi
 
-$(BIN_DIR):
-	@mkdir -p $(BIN_DIR)
+check-cc:
+	@echo -n "checking target i686-elf.... "
+	@test "`i686-elf-gcc -dumpmachine`" = "i686-elf" && echo ok || (echo "failed" && exit 1)
 
-$(ISO_DIR):
-	@mkdir -p $(ISO_DIR)
-	@mkdir -p $(ISO_BOOT_DIR)
-	@mkdir -p $(ISO_GRUB_DIR)
+$(kbuild_dir):
+	@mkdir -p $(kbin_dir)
+	@mkdir -p $(os_img_dir)
+	@mkdir -p $(os_img_dir)/boot
+	@mkdir -p $(os_img_dir)/boot/grub
+	@mkdir -p $(os_img_dir)/usr
 
-$(OBJECT_DIR)/%.S.o: %.S
-	@mkdir -p $(@D)
-	$(CC) -c $< -o $@
+.PHONY: kernel
+export BUILD_DIR=$(kbin_dir)
+export BUILD_NAME=$(kbin)
+kernel:
+	$(call status,TASK,$(notdir $@))
+	@$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f kernel.mk all
 
-$(OBJECT_DIR)/%.c.o: %.c 
-	@mkdir -p $(@D)
-	$(CC) $(INCLUDES) -c $< -o $@ $(CFLAGS)
+.PHONY: image
+export KCMD=$(CMDLINE)
+export _OS_NAME=$(OS_NAME)
+image: usr/build kernel
+	$(call status,TASK,$(notdir $@))
+	@./config-grub.sh $(os_img_dir)/boot/grub/grub.cfg
+	@cp -r usr/build/* $(os_img_dir)/usr
+	@cp -r $(kbin_dir)/* $(os_img_dir)/boot
+	@grub-mkrescue -o $(kimg) $(os_img_dir) -- -volid "$(OS_ID) $(OS_VER)" -system_id "$(OS_NAME)"
 
-$(BIN_DIR)/$(OS_BIN): $(OBJECT_DIR) $(BIN_DIR) $(SRC)
-	$(CC) -T linker.ld -o $(BIN_DIR)/$(OS_BIN) $(SRC) $(LDFLAGS)
+usr/build: user
 
-$(BUILD_DIR)/$(OS_ISO): $(ISO_DIR) $(BIN_DIR)/$(OS_BIN) GRUB_TEMPLATE
-	@./config-grub.sh ${OS_NAME} > $(ISO_GRUB_DIR)/grub.cfg
-	@cp $(BIN_DIR)/$(OS_BIN) $(ISO_BOOT_DIR)
-	@grub-mkrescue -o $(BUILD_DIR)/$(OS_ISO) $(ISO_DIR)
+check: $(DEPS) check-cc GRUB_TEMPLATE
 
-all: clean $(BUILD_DIR)/$(OS_ISO)
+prepare: check $(os_img_dir)
 
-all-debug: O := -O0
-all-debug: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) -fomit-frame-pointer
-all-debug: LDFLAGS := -ffreestanding $(O) -nostdlib -lgcc
-all-debug: clean $(BUILD_DIR)/$(OS_ISO)
-	@i686-elf-objdump -D $(BIN_DIR)/$(OS_BIN) > dump
+export BUILD_MODE=release
+bootable: $(kbuild_dir) image
+
+export BUILD_MODE=debug
+bootable-debug: $(kbuild_dir) image
+
+user:
+	$(call status,$@)
+	@$(MAKE) $(MKFLAGS) -C usr all -I $(mkinc_dir)
+
+all: bootable
+
+instable: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT) -D__LUNAIXOS_DEBUG__
+instable: all
+
+all-debug: bootable-debug
 
 clean:
-	@rm -rf $(BUILD_DIR)
+	@rm -rf $(kbuild_dir) || exit 1
+	@$(MAKE) -C usr clean -I $(mkinc_dir)
+	@$(MAKE) -f kernel.mk clean -I $(mkinc_dir)
 
 run: $(BUILD_DIR)/$(OS_ISO)
-	@qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO)
+	@qemu-system-i386 $(QEMU_OPTIONS)
+	@sleep 1
+	@telnet 127.0.0.1 $(QEMU_MON_PORT)
 
 debug-qemu: all-debug
-	@objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
-	@qemu-system-i386 -s -S -kernel $(BIN_DIR)/$(OS_BIN) &
-	@gdb -s $(BUILD_DIR)/kernel.dbg -ex "target remote localhost:1234"
+	@i686-elf-objcopy --only-keep-debug $(kbin) $(kbuild_dir)/kernel.dbg
+	@qemu-system-i386 $(call get_qemu_options,$(kimg))
+	@sleep 1
+	@QMPORT=$(QEMU_MON_PORT) gdb $(kbin) -ex "target remote localhost:1234"
+
+debug-qemu-vscode: all-debug
+	@qemu-system-i386 $(call get_qemu_options,$(kimg))
+	@sleep 0.5
+	@telnet 127.0.0.1 $(QEMU_MON_PORT)
 
 debug-bochs: all-debug
-	@bochs -q -f bochs.cfg
\ No newline at end of file
+	@bochs -q -f bochs.cfg
+
+debug-metal: 
+	@printf "@cmc" > $(PORT)
+	@gdb -s $(kbuild_dir)/kernel.dbg -ex "target remote $(PORT)"
\ No newline at end of file