Correct the build on Travis

We need to split up the build into a few steps, as Travis won't let us install GRUB. This makefile isn't perfect yet, the default command doesn't quite work. I will deal with that later.
intermezzOS · Dec 28, 2015 · b77ccc1 · b77ccc1
1 parent 82040fb
commit b77ccc1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: rust
 rust:
   - nightly
 script:
-  - make
+  - make build
 addons:
   apt:
     packages:

diff --git a/Makefile b/Makefile
@@ -1,7 +1,12 @@
-default:
+build:
 	nasm -f elf64 multiboot_header.asm
 	nasm -f elf64 boot.asm
 	ld -n -o kernel.bin -T linker.ld multiboot_header.o boot.o
+iso:
 	mv kernel.bin isofiles/boot/
 	grub-mkrescue -o os.iso isofiles
+
+run:
 	qemu-system-x86_64 -drive format=raw,file=os.iso
+
+default: build iso run