Second Extended Filesystem (ext2) and other improvements (#33)

[lunaix-os.git] / lunaix-os / makefile

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index c1c800ccb68797a7630e44b7c62de4e4b1cddd35..f53d62ea418a1fba0f0a3ae0596b86099ef5748c 100644 (file)
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -1,10 +1,25 @@
-include config/make-locations
-include config/make-os
-include config/make-cc
-include config/make-debug-tool
+mkinc_dir := $(CURDIR)/makeinc
+
+include $(mkinc_dir)/toolchain.mkinc
+include $(mkinc_dir)/utils.mkinc
+include $(mkinc_dir)/lunabuild.mkinc
+
+QEMU_HMP ?= 45454
+ARCH ?= i386
+MODE ?= debug
+export ARCH

 
 DEPS := $(CC) $(LD) $(AR) xorriso grub-mkrescue
 
 
 DEPS := $(CC) $(LD) $(AR) xorriso grub-mkrescue
 

+CMDLINE ?= console=/dev/ttyFB0
+
+kbuild_dir := build
+kbin_dir := $(kbuild_dir)/bin
+os_img_dir := $(kbuild_dir)/img
+
+kbin := $(kbin_dir)/kernel.bin
+kimg := $(kbuild_dir)/lunaix.iso
+

 $(DEPS):
        @echo -n "checking $@ .... "
        @if which $@ > /dev/null; then \
 $(DEPS):
        @echo -n "checking $@ .... "
        @if which $@ > /dev/null; then \


@@ -13,76 +28,47 @@ $(DEPS):
                echo "failed" && exit 1;\
        fi
 
                echo "failed" && exit 1;\
        fi
 

-check-cc:
-       @echo -n "checking target i686-elf.... "
-       @test "`i686-elf-gcc -dumpmachine`" = "i686-elf" && echo ok || (echo "failed" && exit 1)
-
-$(OBJECT_DIR):
-       @mkdir -p $(OBJECT_DIR)
-
-$(BIN_DIR):
-       @mkdir -p $(BIN_DIR)
-
-$(USR_DIR):
-       @mkdir -p $(USR_DIR)
-
-$(ISO_DIR):
-       @mkdir -p $(ISO_DIR)
-       @mkdir -p $(ISO_BOOT_DIR)
-       @mkdir -p $(ISO_GRUB_DIR)
-
-check: $(DEPS) check-cc GRUB_TEMPLATE
-
-prepare: check $(OBJECT_DIR) $(BIN_DIR) $(ISO_DIR) $(USR_DIR)
-
-usrlib: prepare makefile.usr
-       @make -f makefile.usr usr-runtime
-
-usrlib-debug: prepare makefile.usr
-       @make -f makefile.usr usr-runtime-debug
-
-usr-prog: prepare usrlib makefile.prog
-       @make -f makefile.prog all
-
-bootable: usr-prog usrlib makefile.ker
-       @make -f makefile.ker all
-
-bootable-debug: usr-prog usrlib-debug makefile.ker
-       @make -f makefile.ker all-debug
-
-all: bootable
-
-instable: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT) -D__LUNAIXOS_DEBUG__
-instable: all
-
-all-debug: clean bootable-debug
-       @echo "Dumping the disassembled kernel code to $(BUILD_DIR)/kdump.txt"
-       @i686-elf-objdump -S $(BIN_DIR)/$(OS_BIN) > $(BUILD_DIR)/kdump.txt
+$(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
+
+.PHONY: kernel
+export BUILD_DIR=$(kbin_dir)
+export BUILD_NAME=$(kbin)
+kernel: $(lbuild_mkinc)
+       $(call status,TASK,$(notdir $@))
+
+       @$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f kernel.mk all
+
+.NOTPARALLEL:
+.PHONY: image
+export KCMD=$(CMDLINE)
+export LBUILD ARCH MODE
+image: $(kbuild_dir) kernel usr/build
+       $(call status,TASK,$(notdir $@))
+       $(call status,PACK,$(kimg))
+
+       @./scripts/grub/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 "LUNA" -system_id "Lunaix" \
+               -report_about FAILURE -abort_on FAILURE
+
+usr/build: user
+
+prepare: $(os_img_dir)
+
+export LBUILD ARCH MODE
+user:
+       $(call status,TASK,$@)
+       @$(MAKE) $(MKFLAGS) -C usr all -I $(mkinc_dir)

 
 clean:
 
 clean:

-       @rm -rf $(BUILD_DIR) || exit 1
-
-run: $(BUILD_DIR)/$(OS_ISO)
-       @qemu-system-i386 $(QEMU_OPTIONS)
-       @sleep 1
-       @telnet 127.0.0.1 $(QEMU_MON_PORT)
-
-debug-qemu: all-debug
-       @i686-elf-objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
-       @qemu-system-i386 $(QEMU_OPTIONS)
-       @sleep 1
-       @$(QEMU_MON_TERM) -- telnet 127.0.0.1 $(QEMU_MON_PORT)
-       @gdb -s $(BUILD_DIR)/kernel.dbg -ex "target remote localhost:1234"
-
-debug-qemu-vscode: all-debug
-       @i686-elf-objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
-       @qemu-system-i386 $(QEMU_OPTIONS)
-       @sleep 0.5
-       @telnet 127.0.0.1 $(QEMU_MON_PORT)
-
-debug-bochs: all-debug
-       @bochs -q -f bochs.cfg
-
-debug-metal: 
-       @printf "@cmc" > $(PORT)
-       @gdb -s $(BUILD_DIR)/kernel.dbg -ex "target remote $(PORT)"
\ No newline at end of file
+       @$(MAKE) -C usr clean -I $(mkinc_dir)
+       @$(MAKE) -f kernel.mk clean -I $(mkinc_dir)
+       @rm -rf $(kbuild_dir) || exit 1
+       @rm -rf .builder || exit 1