Unit testing framework and devicetree framework refactoring (#50)

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

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index f53d62ea418a1fba0f0a3ae0596b86099ef5748c..9895780868e743be2f6d6d8e3376899706df1a66 100644 (file)
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -9,7 +9,7 @@ ARCH ?= i386
 MODE ?= debug
 export ARCH
 
 MODE ?= debug
 export ARCH
 

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

 
 CMDLINE ?= console=/dev/ttyFB0
 
 
 CMDLINE ?= console=/dev/ttyFB0
 


@@ -31,8 +31,6 @@ $(DEPS):
 $(kbuild_dir):
        @mkdir -p $(kbin_dir)
        @mkdir -p $(os_img_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
 
 .PHONY: kernel
        @mkdir -p $(os_img_dir)/usr
 
 .PHONY: kernel


@@ -43,20 +41,19 @@ kernel: $(lbuild_mkinc)
 
        @$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f kernel.mk all
 
 
        @$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f kernel.mk all
 

+.PHONY: rootfs all clean-user clean tool
+
+tool:
+       $(call status,TASK,$@)
+       @$(MAKE) $(MKFLAGS) -C scripts all -I $(mkinc_dir)
+

 .NOTPARALLEL:
 .NOTPARALLEL:

-.PHONY: image
-export KCMD=$(CMDLINE)

 export LBUILD ARCH MODE
 export LBUILD ARCH MODE

-image: $(kbuild_dir) kernel usr/build
-       $(call status,TASK,$(notdir $@))
-       $(call status,PACK,$(kimg))
+all: $(kbuild_dir) tool kernel

 
 

-       @./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
+rootfs: usr/build
+       $(call status,TASK,$(notdir $@))
+       @./scripts/mkrootfs

 
 usr/build: user
 
 
 usr/build: user
 


@@ -67,8 +64,18 @@ user:
        $(call status,TASK,$@)
        @$(MAKE) $(MKFLAGS) -C usr all -I $(mkinc_dir)
 
        $(call status,TASK,$@)
        @$(MAKE) $(MKFLAGS) -C usr all -I $(mkinc_dir)
 

-clean:
+clean-user:

        @$(MAKE) -C usr clean -I $(mkinc_dir)
        @$(MAKE) -C usr clean -I $(mkinc_dir)

+
+clean:
+       @$(MAKE) $(MKFLAGS) -C usr clean -I $(mkinc_dir)
+       @$(MAKE) $(MKFLAGS) -C scripts clean -I $(mkinc_dir)
+       @$(MAKE) $(MKFLAGS) -C tests/units clean

        @$(MAKE) -f kernel.mk clean -I $(mkinc_dir)
        @$(MAKE) -f kernel.mk clean -I $(mkinc_dir)

+       

        @rm -rf $(kbuild_dir) || exit 1
        @rm -rf .builder || exit 1
        @rm -rf $(kbuild_dir) || exit 1
        @rm -rf .builder || exit 1

+
+export CFLAGS=-include $(lbuild_config_h)
+unit-test: $(lbuild_config_h)
+       @$(MAKE) $(MKFLAGS) -C tests/units run 
\ No newline at end of file