diff --git a/.travis.yml b/.travis.yml index c244505..63c2356 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,6 +51,7 @@ install: fi script: + - cd ucore - mkdir build && cd build - cmake -DARCH=$ARCH .. - make diff --git a/CMakeLists.txt b/ucore/CMakeLists.txt similarity index 100% rename from CMakeLists.txt rename to ucore/CMakeLists.txt diff --git a/src/arch/aarch64/arch.h b/ucore/src/arch/aarch64/arch.h similarity index 100% rename from src/arch/aarch64/arch.h rename to ucore/src/arch/aarch64/arch.h diff --git a/src/arch/aarch64/atomic.h b/ucore/src/arch/aarch64/atomic.h similarity index 100% rename from src/arch/aarch64/atomic.h rename to ucore/src/arch/aarch64/atomic.h diff --git a/src/arch/aarch64/initcode.S b/ucore/src/arch/aarch64/initcode.S similarity index 100% rename from src/arch/aarch64/initcode.S rename to ucore/src/arch/aarch64/initcode.S diff --git a/src/arch/i386/arch.h b/ucore/src/arch/i386/arch.h similarity index 100% rename from src/arch/i386/arch.h rename to ucore/src/arch/i386/arch.h diff --git a/src/arch/i386/atomic.h b/ucore/src/arch/i386/atomic.h similarity index 100% rename from src/arch/i386/atomic.h rename to ucore/src/arch/i386/atomic.h diff --git a/src/arch/i386/initcode.S b/ucore/src/arch/i386/initcode.S similarity index 100% rename from src/arch/i386/initcode.S rename to ucore/src/arch/i386/initcode.S diff --git a/src/arch/riscv/arch.h b/ucore/src/arch/riscv/arch.h similarity index 100% rename from src/arch/riscv/arch.h rename to ucore/src/arch/riscv/arch.h diff --git a/src/arch/riscv/atomic.h b/ucore/src/arch/riscv/atomic.h similarity index 100% rename from src/arch/riscv/atomic.h rename to ucore/src/arch/riscv/atomic.h diff --git a/src/arch/riscv/initcode.S b/ucore/src/arch/riscv/initcode.S similarity index 100% rename from src/arch/riscv/initcode.S rename to ucore/src/arch/riscv/initcode.S diff --git a/src/arch/riscv/sbi.h b/ucore/src/arch/riscv/sbi.h similarity index 100% rename from src/arch/riscv/sbi.h rename to ucore/src/arch/riscv/sbi.h diff --git a/src/badarg.c b/ucore/src/badarg.c similarity index 100% rename from src/badarg.c rename to ucore/src/badarg.c diff --git a/src/badsegment.c b/ucore/src/badsegment.c similarity index 100% rename from src/badsegment.c rename to ucore/src/badsegment.c diff --git a/src/divzero.c b/ucore/src/divzero.c similarity index 100% rename from src/divzero.c rename to ucore/src/divzero.c diff --git a/src/exit.c b/ucore/src/exit.c similarity index 100% rename from src/exit.c rename to ucore/src/exit.c diff --git a/src/faultread.c b/ucore/src/faultread.c similarity index 100% rename from src/faultread.c rename to ucore/src/faultread.c diff --git a/src/faultreadkernel.c b/ucore/src/faultreadkernel.c similarity index 100% rename from src/faultreadkernel.c rename to ucore/src/faultreadkernel.c diff --git a/src/forktest.c b/ucore/src/forktest.c similarity index 100% rename from src/forktest.c rename to ucore/src/forktest.c diff --git a/src/forktree.c b/ucore/src/forktree.c similarity index 100% rename from src/forktree.c rename to ucore/src/forktree.c diff --git a/src/hello.c b/ucore/src/hello.c similarity index 100% rename from src/hello.c rename to ucore/src/hello.c diff --git a/src/libs/defs.h b/ucore/src/libs/defs.h similarity index 100% rename from src/libs/defs.h rename to ucore/src/libs/defs.h diff --git a/src/libs/dirent.h b/ucore/src/libs/dirent.h similarity index 100% rename from src/libs/dirent.h rename to ucore/src/libs/dirent.h diff --git a/src/libs/elf.h b/ucore/src/libs/elf.h similarity index 100% rename from src/libs/elf.h rename to ucore/src/libs/elf.h diff --git a/src/libs/error.h b/ucore/src/libs/error.h similarity index 100% rename from src/libs/error.h rename to ucore/src/libs/error.h diff --git a/src/libs/hash.c b/ucore/src/libs/hash.c similarity index 100% rename from src/libs/hash.c rename to ucore/src/libs/hash.c diff --git a/src/libs/list.h b/ucore/src/libs/list.h similarity index 100% rename from src/libs/list.h rename to ucore/src/libs/list.h diff --git a/src/libs/printfmt.c b/ucore/src/libs/printfmt.c similarity index 100% rename from src/libs/printfmt.c rename to ucore/src/libs/printfmt.c diff --git a/src/libs/rand.c b/ucore/src/libs/rand.c similarity index 100% rename from src/libs/rand.c rename to ucore/src/libs/rand.c diff --git a/src/libs/skew_heap.h b/ucore/src/libs/skew_heap.h similarity index 100% rename from src/libs/skew_heap.h rename to ucore/src/libs/skew_heap.h diff --git a/src/libs/stat.h b/ucore/src/libs/stat.h similarity index 100% rename from src/libs/stat.h rename to ucore/src/libs/stat.h diff --git a/src/libs/stdarg.h b/ucore/src/libs/stdarg.h similarity index 100% rename from src/libs/stdarg.h rename to ucore/src/libs/stdarg.h diff --git a/src/libs/stdio.h b/ucore/src/libs/stdio.h similarity index 100% rename from src/libs/stdio.h rename to ucore/src/libs/stdio.h diff --git a/src/libs/stdlib.h b/ucore/src/libs/stdlib.h similarity index 100% rename from src/libs/stdlib.h rename to ucore/src/libs/stdlib.h diff --git a/src/libs/string.c b/ucore/src/libs/string.c similarity index 100% rename from src/libs/string.c rename to ucore/src/libs/string.c diff --git a/src/libs/string.h b/ucore/src/libs/string.h similarity index 100% rename from src/libs/string.h rename to ucore/src/libs/string.h diff --git a/src/libs/unistd.h b/ucore/src/libs/unistd.h similarity index 100% rename from src/libs/unistd.h rename to ucore/src/libs/unistd.h diff --git a/src/ls.c b/ucore/src/ls.c similarity index 100% rename from src/ls.c rename to ucore/src/ls.c diff --git a/src/matrix.c b/ucore/src/matrix.c similarity index 100% rename from src/matrix.c rename to ucore/src/matrix.c diff --git a/src/pgdir.c b/ucore/src/pgdir.c similarity index 100% rename from src/pgdir.c rename to ucore/src/pgdir.c diff --git a/src/priority.c b/ucore/src/priority.c similarity index 100% rename from src/priority.c rename to ucore/src/priority.c diff --git a/src/sfs_filetest1.c b/ucore/src/sfs_filetest1.c similarity index 100% rename from src/sfs_filetest1.c rename to ucore/src/sfs_filetest1.c diff --git a/src/sh.c b/ucore/src/sh.c similarity index 100% rename from src/sh.c rename to ucore/src/sh.c diff --git a/src/sleep.c b/ucore/src/sleep.c similarity index 100% rename from src/sleep.c rename to ucore/src/sleep.c diff --git a/src/sleepkill.c b/ucore/src/sleepkill.c similarity index 100% rename from src/sleepkill.c rename to ucore/src/sleepkill.c diff --git a/src/softint.c b/ucore/src/softint.c similarity index 100% rename from src/softint.c rename to ucore/src/softint.c diff --git a/src/spin.c b/ucore/src/spin.c similarity index 100% rename from src/spin.c rename to ucore/src/spin.c diff --git a/src/testbss.c b/ucore/src/testbss.c similarity index 100% rename from src/testbss.c rename to ucore/src/testbss.c diff --git a/src/ulibs/dir.c b/ucore/src/ulibs/dir.c similarity index 100% rename from src/ulibs/dir.c rename to ucore/src/ulibs/dir.c diff --git a/src/ulibs/dir.h b/ucore/src/ulibs/dir.h similarity index 100% rename from src/ulibs/dir.h rename to ucore/src/ulibs/dir.h diff --git a/src/ulibs/file.c b/ucore/src/ulibs/file.c similarity index 100% rename from src/ulibs/file.c rename to ucore/src/ulibs/file.c diff --git a/src/ulibs/file.h b/ucore/src/ulibs/file.h similarity index 100% rename from src/ulibs/file.h rename to ucore/src/ulibs/file.h diff --git a/src/ulibs/lock.h b/ucore/src/ulibs/lock.h similarity index 100% rename from src/ulibs/lock.h rename to ucore/src/ulibs/lock.h diff --git a/src/ulibs/panic.c b/ucore/src/ulibs/panic.c similarity index 100% rename from src/ulibs/panic.c rename to ucore/src/ulibs/panic.c diff --git a/src/ulibs/stdio.c b/ucore/src/ulibs/stdio.c similarity index 100% rename from src/ulibs/stdio.c rename to ucore/src/ulibs/stdio.c diff --git a/src/ulibs/syscall.c b/ucore/src/ulibs/syscall.c similarity index 100% rename from src/ulibs/syscall.c rename to ucore/src/ulibs/syscall.c diff --git a/src/ulibs/syscall.h b/ucore/src/ulibs/syscall.h similarity index 100% rename from src/ulibs/syscall.h rename to ucore/src/ulibs/syscall.h diff --git a/src/ulibs/ulib.c b/ucore/src/ulibs/ulib.c similarity index 100% rename from src/ulibs/ulib.c rename to ucore/src/ulibs/ulib.c diff --git a/src/ulibs/ulib.h b/ucore/src/ulibs/ulib.h similarity index 100% rename from src/ulibs/ulib.h rename to ucore/src/ulibs/ulib.h diff --git a/src/ulibs/umain.c b/ucore/src/ulibs/umain.c similarity index 100% rename from src/ulibs/umain.c rename to ucore/src/ulibs/umain.c diff --git a/src/waitkill.c b/ucore/src/waitkill.c similarity index 100% rename from src/waitkill.c rename to ucore/src/waitkill.c diff --git a/src/yield.c b/ucore/src/yield.c similarity index 100% rename from src/yield.c rename to ucore/src/yield.c