Merge branch 'develop'

Pipeline Cleanup & Expansion

See merge request spexeah/asuro!28

.drone.yml

@@ -17,38 +17,13 @@ steps:
 
   - name: compile
     image: t3hn3rd/asuro-build:latest
-    pull: always
     depends_on:
       - build-image
     commands:
       - git fetch --tags
       - find . -type f -print0 | xargs -0 dos2unix
-      - chmod +x /drone/src/toolchain/*.sh
-      - /drone/src/toolchain/compile.sh
-      
-  - name: deploy-docs
-    image: alpine:latest
-    depends_on:
-      - compile
-    when:
-      branch:
-        - master
-        - develop
-        - feature/mkdocs
-    volumes:
-      - name: docs-htdocs
-        path: /htdocs
-    commands:
-      - apk add --no-cache rsync
-      - |
-        if [ "${DRONE_BRANCH}" = "master" ]; then
-          DEST="/htdocs/master"
-        else
-          DEST="/htdocs/develop"
-        fi
-      - mkdir -p "$DEST"
-      - rsync -a --delete site/ "$DEST/"
-      - echo "Documentation deployed to ${DRONE_BRANCH}"
+      - chmod +x /drone/src/*.sh
+      - /drone/src/compile.sh
 
   - name: upload-iso-artifact
     image: alpine/git
@@ -74,24 +49,4 @@ steps:
         -H "Authorization: token $GITEA_TOKEN" || echo "No previous latest version found."
       - |
         curl -X PUT https://gitea.spexeah.com/api/packages/Spexeah/generic/asuro-iso/latest/Asuro.iso \
-        -H "Authorization: token $GITEA_TOKEN" --upload-file "Asuro-$(git rev-parse --short HEAD).iso"
-
-  - name: msg status
-    image: appleboy/drone-discord
-    failure: ignore
-    depends_on:
-      - compile
-    when:
-      status: [success, failure, changed]
-    settings:
-      webhook_id:
-        from_secret: discord_webhook_id
-      webhook_token:
-        from_secret: discord_webhook_secret
-      message: "**Asuro Build**\n\n{{#success build.status}}✅ Build successful!\n\n{{else}}❌ Build failed!\n\n{{/success}}Repository: `{{repo.namespace}}/{{repo.name}}`\nBranch: `{{commit.branch}}`\nCommit: `{{commit.sha}}`\nAuthor: `{{commit.author}} <{{commit.email}}>`\n\nGitea Diff: [Link](<{{commit.link}}>)\nDrone Build: [Link](<{{build.link}}>)\n\nMessage: {{commit.message}}"
-
-volumes:
-  - name: docs-htdocs
-    host:
-      path: /mnt/user/htdocs/asuro_docs
-
+        -H "Authorization: token $GITEA_TOKEN" --upload-file "Asuro-$(git rev-parse --short HEAD).iso"

.gitattributes

@@ -1,8 +1 @@
-* text=auto eol=lf
-lvglh/** linguist-vendored
-lvgl/** linguist-vendored
-.vscode/* linguist-vendored
-lib/* linguist-generated
-release/* linguist-generated
-iso/* linguist-generated
-*.asm linguist-detectable
+* text=auto eol=lf

.gitignore

@@ -11,16 +11,3 @@
 /*.img
 src/include/asuro.pas
 localenv.json
-/lvgl/
-dockerout.txt
-AGENTS.md
-lessons_learnt.md
-*.log
-wasuro
-src/core/core.version.pas
-site/*
-!site/.gitkeep
-/src/boot/dangling_units.inc
-/lib/dangling/
-.moderne
-CLAUDE.md

.mailmap

@@ -1,13 +0,0 @@
-# Map all Aaron identities to a single preferred identity
-Aaron Hance <[email protected]> aaron <aaron@6dbc8c32-bb84-406f-8558-d1cf31a0ab0c>
-Aaron Hance <[email protected]> aaronhance <[email protected]>
-Aaron Hance <[email protected]> aaron hance <[email protected]>
-Aaron Hance <[email protected]> Aaron <[email protected]>
-
-# Map all Kieron identities to a single preferred identity
-Kieron Morris <[email protected]> kieron <kieron@6dbc8c32-bb84-406f-8558-d1cf31a0ab0c>
-Kieron Morris <[email protected]> Kieron <[email protected]>
-Kieron Morris <[email protected]> t3hn3rd <[email protected]>
-
-# Map goose's multiple identities
-goose <goose@6dbc8c32-bb84-406f-8558-d1cf31a0ab0c> goose <[email protected]>

Dockerfile

@@ -1,25 +1,23 @@
-ARG RECIPES_IMAGE=t3hn3rd/moderne-asuro-recipes:0.1.1@sha256:eaf54188053511dad9c620a8fb98b0f50c41770cd49a0b3d71a0538386522011
-FROM ${RECIPES_IMAGE}
+FROM ubuntu:latest
 
 VOLUME ["/code"]
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN dpkg --add-architecture i386
 RUN apt-get update && apt-get install -y \
-	curl dos2unix wget git make nasm binutils xorriso grub-pc-bin gcc gcc-multilib \
-	python3 python3-pip python3-pil && \
-	apt-get clean && rm -rf /var/lib/apt/lists/*
-
-RUN pip3 install --no-cache-dir --break-system-packages "mkdocs>=1.6,<2" mkdocs-material
+	curl dos2unix wget git make nasm binutils:i386 xorriso grub-pc-bin && \
+	apt-get clean my room
 
 SHELL ["/bin/bash", "-c"]
-ARG FPC_VERSION=3.2.2
+ARG FPC_VERSION=2.6.4
 RUN curl -sL https://sourceforge.net/projects/freepascal/files/Linux/$FPC_VERSION/fpc-$FPC_VERSION.i386-linux.tar/download | tar -xf - && \
 	pushd fpc-$FPC_VERSION.i386-linux && ./install.sh && popd && \
 	rm -rf fpc-$FPC_VERSION.i386-linux
 
+COPY compile.sh /compile.sh
 ADD https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver /usr/bin/semver
 RUN chmod +x /usr/bin/semver
 WORKDIR /code
+RUN find . -type f -print0 | xargs -0 dos2unix
 ENTRYPOINT ["/bin/bash", "-c"]
-CMD ["find toolchain -name '*.sh' -exec dos2unix {} + 2>/dev/null; find toolchain -name '*.sh' -exec chmod +x {} +; bash toolchain/compile.sh"]
+CMD ["/compile.sh"]

Dockerfile.dockerignore

@@ -1,8 +0,0 @@
-**/.git
-**/.gradle
-**/build
-**/.moderne
-wasuro
-site
-lib
-release

compat/lmemorymanager.pas

@@ -1,75 +0,0 @@
-{ Compatibility shim: wasuro references the old unit name 'lmemorymanager'.
-  Since wasuro/ cannot be modified, this unit re-exports the public API of
-  memory.heap so that 'uses lmemorymanager' continues to compile. }
-unit lmemorymanager;
-
-interface
-
-uses
-    memory.heap;
-
-const
-    ALLOC_UNIT        = memory.heap.ALLOC_UNIT;
-    DATA_OFFSET       = memory.heap.DATA_OFFSET;
-    PAGE_SIZE_LMM     = memory.heap.PAGE_SIZE_LMM;
-    TOTAL_UNITS       = memory.heap.TOTAL_UNITS;
-    BITMAP_DWORDS     = memory.heap.BITMAP_DWORDS;
-    SIZE_PREFIX       = memory.heap.SIZE_PREFIX;
-    LARGE_ALLOC_MAGIC = memory.heap.LARGE_ALLOC_MAGIC;
-
-type
-    PHeapPageHeader = memory.heap.PHeapPageHeader;
-    THeapPageHeader = memory.heap.THeapPageHeader;
-
-procedure init;
-function kalloc(size : uint32) : void;
-function klalloc(size : uint32) : void;
-procedure klfree(address : uint32);
-function kpalloc(address : uint32) : void;
-procedure kfree(area : void);
-function lmm_total_free : uint32;
-function lmm_page_count : uint32;
-
-implementation
-
-procedure init;
-begin
-    memory.heap.init;
-end;
-
-function kalloc(size : uint32) : void; inline;
-begin
-    kalloc := memory.heap.kalloc(size);
-end;
-
-function klalloc(size : uint32) : void; inline;
-begin
-    klalloc := memory.heap.klalloc(size);
-end;
-
-procedure klfree(address : uint32); inline;
-begin
-    memory.heap.klfree(address);
-end;
-
-function kpalloc(address : uint32) : void; inline;
-begin
-    kpalloc := memory.heap.kpalloc(address);
-end;
-
-procedure kfree(area : void); inline;
-begin
-    memory.heap.kfree(area);
-end;
-
-function lmm_total_free : uint32; inline;
-begin
-    lmm_total_free := memory.heap.lmm_total_free;
-end;
-
-function lmm_page_count : uint32; inline;
-begin
-    lmm_page_count := memory.heap.lmm_page_count;
-end;
-
-end.

compat/types.pas

@@ -1,7 +0,0 @@
-unit types;
-
-interface
-
-implementation
-
-end.

compile.sh

@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
-TOOLCHAIN_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "$TOOLCHAIN_DIR/architecture.sh" || exit 1
 ERRCOUNT=0
 echo " "
 echo "======================="
@@ -9,7 +7,7 @@ echo "Asuro Compilation"
 echo " "
 
 #Compile Stub.asm
-rm -f lib/*
+rm lib/*
 
 runOrFail() {
 	local binary=$1
@@ -25,22 +23,16 @@ runOrFail() {
 declare -a run_steps=(
 	"compile_stub.sh" "Failed to compile stub!"
 	"compile_vergen.sh" "Versions failed to compile"
-	"compile_lvgl.sh" "Failed to compile LVGL!"
-	"compile_icons.sh" "Failed to generate icons!"
-	"compile_wasuro.sh" "Failed to pull Wasuro!"
-	"compile_dangling.sh" "Failed to generate dangling unit list!"
 	"compile_sources.sh" "Failed to compile FPC Sources!"
-	"compile_initcalls.sh" "Failed to generate INITFINAL table!"
 	"compile_link.sh" "Failed linking!"
 	"compile_isogen.sh" "Failed to create ISO!"
-	"compile_docs.sh" "Failed to generate documentation!"
 )
 
 for ((i=0; i<${#run_steps[@]}; i+=2))
 do
 	if [ "$ERRCOUNT" -eq "0" ]
 	then
-			script="${TOOLCHAIN_DIR}/${run_steps[$i]}"
+			script=$(pwd)/"${run_steps[$i]}"
 			message="${run_steps[$i+1]}"
 			runOrFail "$script" "$message"
 	fi
@@ -49,9 +41,9 @@ done
 #Call generate final artifacts based on failure or success of the above.
 if [ "$ERRCOUNT" -ne "0" ]
 then
-	. "${TOOLCHAIN_DIR}/compile_finish.sh" "failed"
+	. ./compile_finish.sh "failed"
 else
-	. "${TOOLCHAIN_DIR}/compile_finish.sh" "success"
+	. ./compile_finish.sh "success"
 fi
 
-cd ..
+cd ..

compile_docs.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+echo " "
+echo "======================="
+echo " "
+echo "Generating Documentation..."
+echo " "
+echo "Dowloading Pasdoc..."
+wget https://github.com/pasdoc/pasdoc/releases/download/v0.16.0/pasdoc-0.16.0-linux-x86_64.tar.gz -O pasdoc.tar.gz
+echo "Extracting Pasdoc..."
+tar -xf pasdoc.tar.gz
+echo "Creating doc output directory..."
+mkdir ./doc
+echo "Removing old docs"
+rm -rf ./doc/*
+echo "Generating Docs..."
+./pasdoc/bin/pasdoc -N "Asuro" -T "Asuro OS Documentation" -O "html" -E ./doc/ -S sources.list --use-tipue-search
+echo "Docgen finished."

compile_link.sh

@@ -14,9 +14,4 @@ done;
 objstring=lib/stub.o" "$objstring 
 echo "Object Files: "$objstring
 echo " "
-
-# Find libgcc for i386 (needed by LVGL compiled with gcc)
-LIBGCC=$(gcc -m32 -print-libgcc-file-name)
-echo "libgcc: ${LIBGCC}"
-
-ld -m elf_i386 -s --gc-sections --no-warn-execstack -Ttoolchain/linker.script -o bin/kernel.bin $objstring --start-group lib/liblvgl.a ${LIBGCC} --end-group
+ld -m elf_i386 -s --gc-sections -Tlinker.script -o bin/kernel.bin $objstring

compile_sources.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+echo " "
+echo "======================="
+echo " "
+echo "Compiling FPC Sources..."
+echo " "
+fpc -Aelf -gw -g -gl -n -vlewn -O3 -Op3 -Si -Sc -Sg -Xd -CX -XXs -CfSSE -CfSSE2 -Rintel -Pi386 -Tlinux -FElib/ -Fusrc/* -Fusrc/driver/* -Fusrc/driver/net/* src/kernel.pas

compile_stub.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+echo " "
+echo "======================="
+echo " "
+echo "Compiling Stub..."
+echo " "
+nasm -f elf src/stub/stub.asm -o lib/stub.o

compile_vergen.sh

@@ -1,15 +1,14 @@
 #!/usr/bin/env bash
 set -e
-TOOLCHAIN_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 echo " "
 echo "======================="
 echo " "
 echo "Generating Versioning Info..."
 echo " "
-chmod +x "${TOOLCHAIN_DIR}/compile_checksum.sh"
-"${TOOLCHAIN_DIR}/compile_checksum.sh"
-outfile="src/core/core.version.pas"
-file="toolchain/version"
+chmod +x ./compile_checksum.sh
+./compile_checksum.sh
+outfile="src/include/asuro.pas"
+file="version"
 {
 	# this script requires semver tool
 	wget -q https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver -O bin/semver && chmod +x bin/semver
@@ -23,7 +22,7 @@ sub=$(semver get patch $tagref)
 version=$(semver get release $tagref)
 release=$(semver get prerel $tagref)
 build=$(semver get build $tagref)
-linecount=$("${TOOLCHAIN_DIR}/loc.sh" | awk '{print $1}')
+linecount=$(./loc.sh | awk '{print $1}')
 sourcecount=$(find src -type f | wc -l)
 drivercount=$(find src/driver -type f | wc -l)
 fpcversion=$(fpc -h | grep -m 1 version | awk '{print $5}')
@@ -35,7 +34,7 @@ checksum=$(md5sum checksums.md5 | awk '{print $1}')
 
 [[ -n "$release" ]] && version="$version-$release"
 cat > $outfile <<EOF
-unit core.version;
+unit asuro;
  
 interface