switch to Jinx (#117)

Signed-off-by: Anhad Singh <[email protected]>

Author: Andy-Python-Programmer

.gitattributes

@@ -1,2 +1,6 @@
 * text=auto eol=lf
-*.real linguist-language=Assembly
+
+jinx-config linguist-language=Shell
+host-recipes/* linguist-language=Shell
+recipes/* linguist-language=Shell
+source-recipes/* linguist-language=Shell

.github/workflows/build.yml

@@ -24,10 +24,10 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y nasm
+        sudo apt-get install -y nasm make
         python3 -m pip install requests xbstrap
     - name: Build Documentation
-      run: ./aero.py --document
+      run: make doc
     - name: Formatting Check
       run: |
         ./aero.py --fmt

.gitignore

@@ -25,3 +25,12 @@ base-files/server
 
 # todo: remove these
 debug
+
+# XXXXXXXXXXXXXXXX
+3rdparty/
+.jinx-cache
+sources/
+host-pkgs/
+host-builds/
+pkgs/
+builds/

Makefile

@@ -0,0 +1,47 @@
+jinx:
+	if [ ! -d "target/jinx" ]; then \
+		git clone https://github.com/mintsuki/jinx target/jinx; \
+	fi
+
+	# FIXME: autosync
+	mkdir -p target/cargo-home
+	cp build-support/rust/config.toml target/cargo-home/config.toml
+
+.PHONY: distro
+distro: jinx
+	./target/jinx/jinx build-all
+
+SOURCE_DIR := src
+USERLAND_DIR := userland
+USERLAND_TARGET := builds/userland/target/init
+KERNEL_TARGET := src/target/x86_64-aero_os/release/aero_kernel
+
+.PHONY: clean
+clean:
+	rm -rf src/target
+
+$(KERNEL_TARGET): $(shell find $(SOURCE_DIR) -type f -not -path '$(SOURCE_DIR)/target/*')
+	cd src && cargo build --package aero_kernel --target .cargo/x86_64-aero_os.json --release
+	@$(MAKE) iso
+
+$(USERLAND_TARGET): $(shell find $(USERLAND_DIR) -type f -not -path '$(USERLAND_DIR)/target/*')
+	./target/jinx/jinx rebuild userland
+	@$(MAKE) distro-image
+
+.PHONY: iso
+iso: $(KERNEL_TARGET) 
+	./build-support/mkiso.sh
+
+.PHONY: distro-image
+distro-image: distro
+	./build-support/mkimage.sh
+
+.PHONY: qemu
+qemu: $(KERNEL_TARGET) $(USERLAND_TARGET)
+	${QEMU_PATH}/qemu-system-x86_64 -cdrom target/aero.iso -m 8G -serial stdio --boot d -s -enable-kvm -cpu host -drive file=target/disk.img,if=none,id=NVME1,format=raw -device nvme,drive=NVME1,serial=nvme 
+
+.PHONY: doc
+doc:
+	rm -rf target/doc
+	cd src && cargo doc --package aero_kernel --target .cargo/x86_64-aero_os.json --release --target-dir=../target/doc/
+	cp web/index.html target/doc/index.html

base-files/bin

@@ -0,0 +1 @@
+/usr/bin

base-files/etc/X11/xinit/xinitrc

@@ -0,0 +1,2 @@
+#!/usr/bin/sh
+jwm &

extra-files/xorg/xorg.conf renamed to base-files/etc/X11/xorg.conf

@@ -0,0 +1 @@
+/usr/lib

base-files/lib

@@ -0,0 +1 @@
+/usr/lib

base-files/lib64

@@ -0,0 +1 @@
+/usr/bin