diff --git a/.gitignore b/.gitignore index ca161d8..dd3fcfc 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.o *.bin *.elf +*.json .cache diff --git a/clean.sh b/clean.sh index 9b3b751..ab73131 100755 --- a/clean.sh +++ b/clean.sh @@ -1,18 +1,22 @@ #!/bin/bash cd rocklibc +rm -rf *.o +rm -rf *.a +rm -rf *.json make clean cd .. -cd programs/rocksh -make clean -cd ../.. +cd programs +rm -rf *.elf +rm -rf *.o +rm -rf *.json +rm -rf *.a +cd .. make clean cd initrd rm -rf output -rm *.elf -cd .. - -rm *.img \ No newline at end of file +rm -rf *.elf +cd .. \ No newline at end of file diff --git a/compile_commands.json b/compile_commands.json deleted file mode 100644 index c5aa96b..0000000 --- a/compile_commands.json +++ /dev/null @@ -1,308 +0,0 @@ -[ - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/globals.c.o", - "kernel/globals.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/globals.c", - "output": "/home/slinky/source/RockOS/obj/kernel/globals.c.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/kbd.c.o", - "kernel/kbd.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/kbd.c", - "output": "/home/slinky/source/RockOS/obj/kernel/kbd.c.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/gdt.c.o", - "kernel/gdt.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/gdt.c", - "output": "/home/slinky/source/RockOS/obj/kernel/gdt.c.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/drivers/pic/pic.c.o", - "kernel/drivers/pic/pic.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/drivers/pic/pic.c", - "output": "/home/slinky/source/RockOS/obj/kernel/drivers/pic/pic.c.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/drivers/ps2/ps2.c.o", - "kernel/drivers/ps2/ps2.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/drivers/ps2/ps2.c", - "output": "/home/slinky/source/RockOS/obj/kernel/drivers/ps2/ps2.c.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/drivers/serial/serial.c.o", - "kernel/drivers/serial/serial.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/drivers/serial/serial.c", - "output": "/home/slinky/source/RockOS/obj/kernel/drivers/serial/serial.c.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/drivers/iso/iso.c.o", - "kernel/drivers/iso/iso.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/drivers/iso/iso.c", - "output": "/home/slinky/source/RockOS/obj/kernel/drivers/iso/iso.c.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/drivers/ide/ide.c.o", - "kernel/drivers/ide/ide.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/drivers/ide/ide.c", - "output": "/home/slinky/source/RockOS/obj/kernel/drivers/ide/ide.c.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/drivers/vga/vga.c.o", - "kernel/drivers/vga/vga.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/drivers/vga/vga.c", - "output": "/home/slinky/source/RockOS/obj/kernel/drivers/vga/vga.c.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/drivers/cpio/cpio.c.o", - "kernel/drivers/cpio/cpio.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/drivers/cpio/cpio.c", - "output": "/home/slinky/source/RockOS/obj/kernel/drivers/cpio/cpio.c.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/drivers/devfs/devfs.c.o", - "kernel/drivers/devfs/devfs.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/drivers/devfs/devfs.c", - "output": "/home/slinky/source/RockOS/obj/kernel/drivers/devfs/devfs.c.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/drivers/pty/pty.c.o", - "kernel/drivers/pty/pty.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/drivers/pty/pty.c", - "output": "/home/slinky/source/RockOS/obj/kernel/drivers/pty/pty.c.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/scheduler.c.o", - "kernel/scheduler.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/scheduler.c", - "output": "/home/slinky/source/RockOS/obj/kernel/scheduler.c.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/elf.c.o", - "kernel/elf.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/elf.c", - "output": "/home/slinky/source/RockOS/obj/kernel/elf.c.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/multiboot.c.o", - "kernel/multiboot.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/multiboot.c", - "output": "/home/slinky/source/RockOS/obj/kernel/multiboot.c.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/interrupts.c.o", - "kernel/interrupts.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/interrupts.c", - "output": "/home/slinky/source/RockOS/obj/kernel/interrupts.c.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/syscall.c.o", - "kernel/syscall.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/syscall.c", - "output": "/home/slinky/source/RockOS/obj/kernel/syscall.c.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-c", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Ikernel", - "-o", - "obj/kernel/kmain.c.o", - "kernel/kmain.c" - ], - "directory": "/home/slinky/source/RockOS", - "file": "/home/slinky/source/RockOS/kernel/kmain.c", - "output": "/home/slinky/source/RockOS/obj/kernel/kmain.c.o" - } -] diff --git a/makefile b/makefile index d06f6ac..954aaf1 100644 --- a/makefile +++ b/makefile @@ -37,4 +37,4 @@ run: $(OSNAME).iso clean: @echo "Cleaning up build artifacts..." - rm -rf $(OSNAME).iso $(OSNAME).bin obj isodir \ No newline at end of file + rm -rf $(OSNAME).iso $(OSNAME).bin obj isodir compile_commands.json \ No newline at end of file diff --git a/programs/compile_commands.json b/programs/compile_commands.json deleted file mode 100644 index fe51488..0000000 --- a/programs/compile_commands.json +++ /dev/null @@ -1 +0,0 @@ -[] diff --git a/programs/rocksh/compile_commands.json b/programs/rocksh/compile_commands.json deleted file mode 100644 index 33b6549..0000000 --- a/programs/rocksh/compile_commands.json +++ /dev/null @@ -1,36 +0,0 @@ -[ - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-I../../rocklibc/include", - "-c", - "-o", - "crt0.o", - "crt0.S" - ], - "directory": "/home/slinky/source/RockOS/programs/rocksh", - "file": "/home/slinky/source/RockOS/programs/rocksh/crt0.S", - "output": "/home/slinky/source/RockOS/programs/rocksh/crt0.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-I../../rocklibc/include", - "-c", - "-o", - "main.o", - "main.c" - ], - "directory": "/home/slinky/source/RockOS/programs/rocksh", - "file": "/home/slinky/source/RockOS/programs/rocksh/main.c", - "output": "/home/slinky/source/RockOS/programs/rocksh/main.o" - } -] diff --git a/programs/test/compile_commands.json b/programs/test/compile_commands.json deleted file mode 100644 index 63209b9..0000000 --- a/programs/test/compile_commands.json +++ /dev/null @@ -1,36 +0,0 @@ -[ - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-I../../rocklibc/include", - "-c", - "-o", - "crt0.o", - "crt0.S" - ], - "directory": "/home/slinky/source/RockOS/programs/test", - "file": "/home/slinky/source/RockOS/programs/test/crt0.S", - "output": "/home/slinky/source/RockOS/programs/test/crt0.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-I../../rocklibc/include", - "-c", - "-o", - "main.o", - "main.c" - ], - "directory": "/home/slinky/source/RockOS/programs/test", - "file": "/home/slinky/source/RockOS/programs/test/main.c", - "output": "/home/slinky/source/RockOS/programs/test/main.o" - } -] diff --git a/programs/vga_text_term/compile_commands.json b/programs/vga_text_term/compile_commands.json deleted file mode 100644 index 6386dfb..0000000 --- a/programs/vga_text_term/compile_commands.json +++ /dev/null @@ -1,36 +0,0 @@ -[ - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-I../../rocklibc/include", - "-c", - "-o", - "crt0.o", - "crt0.S" - ], - "directory": "/home/slinky/source/RockOS/programs/vga_text_term", - "file": "/home/slinky/source/RockOS/programs/vga_text_term/crt0.S", - "output": "/home/slinky/source/RockOS/programs/vga_text_term/crt0.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-I../../rocklibc/include", - "-c", - "-o", - "main.o", - "main.c" - ], - "directory": "/home/slinky/source/RockOS/programs/vga_text_term", - "file": "/home/slinky/source/RockOS/programs/vga_text_term/main.c", - "output": "/home/slinky/source/RockOS/programs/vga_text_term/main.o" - } -] diff --git a/rocklibc/compile_commands.json b/rocklibc/compile_commands.json deleted file mode 100644 index c860e20..0000000 --- a/rocklibc/compile_commands.json +++ /dev/null @@ -1,104 +0,0 @@ -[ - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Iinclude", - "-c", - "-o", - "src/malloc.o", - "src/malloc.c" - ], - "directory": "/home/slinky/source/RockOS/rocklibc", - "file": "/home/slinky/source/RockOS/rocklibc/src/malloc.c", - "output": "/home/slinky/source/RockOS/rocklibc/src/malloc.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Iinclude", - "-c", - "-o", - "src/strcat.o", - "src/strcat.c" - ], - "directory": "/home/slinky/source/RockOS/rocklibc", - "file": "/home/slinky/source/RockOS/rocklibc/src/strcat.c", - "output": "/home/slinky/source/RockOS/rocklibc/src/strcat.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Iinclude", - "-c", - "-o", - "src/string.o", - "src/string.c" - ], - "directory": "/home/slinky/source/RockOS/rocklibc", - "file": "/home/slinky/source/RockOS/rocklibc/src/string.c", - "output": "/home/slinky/source/RockOS/rocklibc/src/string.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Iinclude", - "-c", - "-o", - "src/syscall.o", - "src/syscall.c" - ], - "directory": "/home/slinky/source/RockOS/rocklibc", - "file": "/home/slinky/source/RockOS/rocklibc/src/syscall.c", - "output": "/home/slinky/source/RockOS/rocklibc/src/syscall.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Iinclude", - "-c", - "-o", - "src/strtok.o", - "src/strtok.c" - ], - "directory": "/home/slinky/source/RockOS/rocklibc", - "file": "/home/slinky/source/RockOS/rocklibc/src/strtok.c", - "output": "/home/slinky/source/RockOS/rocklibc/src/strtok.o" - }, - { - "arguments": [ - "/home/slinky/opt/cross/bin/i686-elf-gcc", - "-ffreestanding", - "-O2", - "-Wall", - "-Wextra", - "-Iinclude", - "-c", - "-o", - "src/stdio.o", - "src/stdio.c" - ], - "directory": "/home/slinky/source/RockOS/rocklibc", - "file": "/home/slinky/source/RockOS/rocklibc/src/stdio.c", - "output": "/home/slinky/source/RockOS/rocklibc/src/stdio.o" - } -] diff --git a/rocklibc/makefile b/rocklibc/makefile index 8fdc2ba..f2bb588 100644 --- a/rocklibc/makefile +++ b/rocklibc/makefile @@ -15,6 +15,6 @@ $(TARGET): $(OBJS) $(CC) $(CFLAGS) -c $< -o $@ clean: - rm -f $(OBJS) $(TARGET) + rm -f $(OBJS) $(TARGET) compile_commands.json .PHONY: all clean \ No newline at end of file