commit 0110d15dee7ec5b09ebfa58b68cc623972bca20d parent 8008d9d24780567ea2899557ce1bdfb43b1a832e Author: erai <erai@omiltem.net> Date: Sun, 17 Nov 2024 22:43:21 -0500 update build scripts to use *.om Diffstat:
| M | .gitignore | | | 10 | +++------- |
| M | bootstrap.sh | | | 8 | ++++---- |
| M | build.sh | | | 38 | +++++++++++++++++++------------------- |
3 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/.gitignore b/.gitignore @@ -1,14 +1,10 @@ a.out kernel disk -cc0 -cc1 -cc2 +cc[012] cc2.c -gencc -parse3.c -parsepeg.c -parsepeg2.c +parse3.om +parsepeg.om pxe cmp cpio diff --git a/bootstrap.sh b/bootstrap.sh @@ -1,13 +1,13 @@ #!/bin/sh BOOTSTRAP="cc0.c" -LIBS="bufio.c lib.c alloc.c syscall.c" -SOURCES="cc1.c type.c parse2.c parse3.c peglib.c as.c decl.c node.c cout.c peg.c parsepeg.c" +LIBS="bufio.om lib.om alloc.om syscall.om" +SOURCES="cc1.om type.om parse2.om parse3.om peglib.om as.om decl.om node.om cout.om peg.om parsepeg.om" # Build the bootstrap compiler from c gcc -std=c99 ${BOOTSTRAP} -o cc0 -./cc0 -P P_ cc3.peg -o parse3.c -./cc0 -P PEG_ peg.peg -o parsepeg.c +./cc0 -P P_ cc3.peg -o parse3.om +./cc0 -P PEG_ peg.peg -o parsepeg.om ./cc0 ${LIBS} ${SOURCES} -o cc1 # Double check the bootstrap and self hosting compiler have the same output diff --git a/build.sh b/build.sh @@ -1,27 +1,27 @@ #!/bin/sh -LIBS="peglib.c bufio.c lib.c alloc.c syscall.c" -CRYPTO="ed25519.c sha512.c sha256.c chacha20.c poly1305.c" -CC="cc1.c type.c as.c decl.c node.c" -PEG="peg.c parsepeg.c" -SSHD="chacha20.c poly1305.c sha256.c sha512.c ed25519.c sshd.c" -KERNEL="kernel.c" -SHELL="echo.c cmp.c rm.c ls.c cat.c xxd.c mv.c mkdir.c cpio.c sh.c" +LIBS="peglib.om bufio.om lib.om alloc.om syscall.om" +CRYPTO="ed25519.om sha512.om sha256.om chacha20.om poly1305.om" +CC="cc1.om type.om as.om decl.om node.om" +PEG="peg.om parsepeg.om" +SSHD="chacha20.om poly1305.om sha256.om sha512.om ed25519.om sshd.om" +KERNEL="kernel.om" +SHELL="echo.om cmp.om rm.om ls.om cat.om xxd.om mv.om mkdir.om cpio.om sh.om" BIN="echo cmp rm ls cat xxd mv mkdir cpio sh sshd init cc1 build.sh peg.peg cc3.peg" ALL="${LIBS} ${CC} ${PEG} ${SSHD} ${KERNEL} ${SHELL} ${BIN}" -./cc1 ${LIBS} echo.c -o echo -./cc1 ${LIBS} cmp.c -o cmp -./cc1 ${LIBS} rm.c -o rm -./cc1 ${LIBS} mv.c -o mv -./cc1 ${LIBS} mkdir.c -o mkdir -./cc1 ${LIBS} ls.c -o ls -./cc1 ${LIBS} cat.c -o cat -./cc1 ${LIBS} xxd.c -o xxd -./cc1 ${LIBS} cpio.c -o cpio -./cc1 ${LIBS} sh.c -o sh -./cc1 ${LIBS} ${CRYPTO} sshd.c -o sshd +./cc1 ${LIBS} echo.om -o echo +./cc1 ${LIBS} cmp.om -o cmp +./cc1 ${LIBS} rm.om -o rm +./cc1 ${LIBS} mv.om -o mv +./cc1 ${LIBS} mkdir.om -o mkdir +./cc1 ${LIBS} ls.om -o ls +./cc1 ${LIBS} cat.om -o cat +./cc1 ${LIBS} xxd.om -o xxd +./cc1 ${LIBS} cpio.om -o cpio +./cc1 ${LIBS} sh.om -o sh +./cc1 ${LIBS} ${CRYPTO} sshd.om -o sshd for name in ${ALL}; do echo ${name}; done | ./cpio -o > initramfs -./cc1 kernel.c -o kernel +./cc1 kernel.om -o kernel