os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Makefile stuff

This commit is contained in:
Adrien Bourmault 2019-03-16 22:33:09 +01:00
parent 7add417986
commit 77b9f2d066
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -63,17 +63,12 @@ CL3='\033[0m'
NC='\033[1;37m' NC='\033[1;37m'
kernel: kernel:
cpp ./Makefile.in > build/Makefile.out @echo ${CL2}[[kernel]]${NC} Making kernel...${CL3}
python build/idttool.py @cpp ./Makefile.in > build/Makefile.out
make kernel -f build/Makefile.out.2 @python build/idttool.py
rm build/Makefile.out build/Makefile.out.2 @make kernel -f build/Makefile.out.2
@rm build/Makefile.out build/Makefile.out.2
kernel-asm: @echo ${CL2}[[kernel]]${CL} Terminated without error.${CL3}
cpp -D_TO_ASM ./Makefile.in > build/Makefile.out
python build/idttool.py
make kernel -f build/Makefile.out.2
rm build/Makefile.out build/Makefile.out.2
tests: tests:
cpp -D_TESTS ./Makefile.in > build/Makefile.out cpp -D_TESTS ./Makefile.in > build/Makefile.out
python build/idttool.py python build/idttool.py
@ -84,8 +79,9 @@ boot.mbr: $(BINDIR)/disk.img $(MBRDIR)/grub.cfg
@mkdir -p $(BINDIR)/disk @mkdir -p $(BINDIR)/disk
@echo ${CL2}[boot.mbr]${NC} Installing MBR on image...${CL3} @echo ${CL2}[boot.mbr]${NC} Installing MBR on image...${CL3}
@$(MBRDIR)/grub-install.sh $(BINDIR)/disk.img $(BINDIR)/disk $(MBRDIR)/grub.cfg @$(MBRDIR)/grub-install.sh $(BINDIR)/disk.img $(BINDIR)/disk $(MBRDIR)/grub.cfg
@echo ${CL2}[boot.mbr]${CL} OK${CL3} @tail -1 grub.log | head -1 | grep "Installation terminée, sans erreur."
@rmdir $(BINDIR)/disk @rmdir $(BINDIR)/disk
@echo ${CL2}[boot.mbr]${CL} Terminated without error.${CL3}
boot.loader.asm: $(LOADERDIR)/loader.asm boot.loader.asm: $(LOADERDIR)/loader.asm
@echo ${CL2}[boot.loader.asm]${NC} Making loader...${CL3} @echo ${CL2}[boot.loader.asm]${NC} Making loader...${CL3}
@ -106,6 +102,7 @@ copykernel:
make_disk: make_disk:
@echo ${CL2}[make_disk]${NC} Constructing disk image...${CL3} @echo ${CL2}[make_disk]${NC} Constructing disk image...${CL3}
@$(MBRDIR)/create_disk.sh $(BINDIR)/disk.img @$(MBRDIR)/create_disk.sh $(BINDIR)/disk.img
@echo ${CL2}[make_disk]${CL} OK${CL3} @echo ${CL2}[make_disk]${CL} OK${CL3}

2
boot/grub/grub-install.sh
View File

@ -61,4 +61,4 @@ sudo umount /dev/loop1 > /dev/null
echo ${CL2}[grub-install.sh]${NC} Unmounting image... \(losetup\)${CL3} echo ${CL2}[grub-install.sh]${NC} Unmounting image... \(losetup\)${CL3}
sudo losetup -D > /dev/null sudo losetup -D > /dev/null
echo ${CL2}[grub-install.sh]${CL} Terminated without error. See grub.log for more informations.${CL3} echo ${CL2}[grub-install.sh]${CL} See grub.log for more informations.${CL3}