瀏覽代碼

add update of lab2, lab2_result Makefile from https://github.com/Archstacker/ucore_lab/

main
yuchen 9 年之前
父節點
當前提交
78cb3d7156
共有 2 個文件被更改,包括 29 次插入29 次删除
  1. +14
    -14
      labcodes/lab2/Makefile
  2. +15
    -15
      labcodes_answer/lab2_result/Makefile

+ 14
- 14
labcodes/lab2/Makefile 查看文件

@ -224,32 +224,32 @@ endif
# files for grade script
targets: $(TARGETS)
TARGETS: $(TARGETS)
.DEFAULT_GOAL := targets
.DEFAULT_GOAL := TARGETS
QEMUOPTS = -hda $(UCOREIMG)
.PHONY: qemu qemu-nox gdb debug debug-mon debug-nox
qemu-mon: targets
.PHONY: qemu qemu-nox debug debug-nox
qemu-mon: $(UCOREIMG)
$(V)$(QEMU) -no-reboot -monitor stdio $(QEMUOPTS) -serial null
qemu: targets
qemu: $(UCOREIMG)
$(V)$(QEMU) -no-reboot -parallel stdio $(QEMUOPTS) -serial null
qemu-nox: targets
$(V)$(QEMU) -no-reboot -serial mon:stdio $(QEMUOPTS) -nographic
gdb:
$(V)$(GDB) -q -x tools/gdbinit
TERMINAL := gnome-terminal
debug: targets
$(V)$(QEMU) -S -s -parallel stdio $(QEMUOPTS) -serial null
debug: $(UCOREIMG)
$(V)$(QEMU) -S -s -parallel stdio $(QEMUOPTS) -serial null &
$(V)sleep 2
$(V)$(TERMINAL) -e "$(GDB) -q -x tools/gdbinit"
debug-mon: targets
$(V)$(QEMU) -S -s -monitor stdio $(QEMUOPTS) -parallel null -serial null
debug-nox: targets
$(V)$(QEMU) -S -s -serial mon:stdio $(QEMUOPTS) -nographic
debug-nox: $(UCOREIMG)
$(V)$(QEMU) -S -s -serial mon:stdio $(QEMUOPTS) -nographic &
$(V)sleep 2
$(V)$(TERMINAL) -e "$(GDB) -q -x tools/gdbinit"
.PHONY: grade touch

+ 15
- 15
labcodes_answer/lab2_result/Makefile 查看文件

@ -207,26 +207,26 @@ targets: $(TARGETS)
QEMUOPTS = -hda $(UCOREIMG)
.PHONY: qemu qemu-nox gdb debug debug-mon debug-nox
qemu-mon: targets
$(V)$(QEMU) -no-reboot -monitor stdio $(QEMUOPTS) -serial null
qemu: targets
$(V)$(QEMU) -no-reboot -parallel stdio $(QEMUOPTS) -serial null
.PHONY: qemu qemu-nox debug debug-nox
qemu-mon: $(UCOREIMG)
$(V)$(QEMU) -monitor stdio $(QEMUOPTS) -serial null
qemu: $(UCOREIMG)
$(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null
qemu-nox: targets
$(V)$(QEMU) -no-reboot -serial mon:stdio $(QEMUOPTS) -nographic
$(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic
gdb:
$(V)$(GDB) -q -x tools/gdbinit
TERMINAL := gnome-terminal
debug: targets
$(V)$(QEMU) -S -s -parallel stdio $(QEMUOPTS) -serial null
debug: $(UCOREIMG)
$(V)$(QEMU) -S -s -parallel stdio $(QEMUOPTS) -serial null &
$(V)sleep 2
$(V)$(TERMINAL) -e "$(GDB) -q -x tools/gdbinit"
debug-mon: targets
$(V)$(QEMU) -S -s -monitor stdio $(QEMUOPTS) -parallel null -serial null
debug-nox: targets
$(V)$(QEMU) -S -s -serial mon:stdio $(QEMUOPTS) -nographic
debug-nox: $(UCOREIMG)
$(V)$(QEMU) -S -s -serial mon:stdio $(QEMUOPTS) -nographic &
$(V)sleep 2
$(V)$(TERMINAL) -e "$(GDB) -q -x tools/gdbinit"
.PHONY: grade touch

Loading…
取消
儲存