Merge branch 'develop' into 'master'

Pipeline Cleanup & Expansion

See merge request spexeah/asuro!28

.drone.yml

@@ -1,96 +0,0 @@
-kind: pipeline
-type: docker
-name: build
-
-steps:
-  - name: build-image
-    image: plugins/docker
-    settings:
-      repo: t3hn3rd/asuro-build
-      tags: latest
-      dockerfile: Dockerfile
-      registry: docker.io
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-
-  - name: compile
-    image: t3hn3rd/asuro-build:latest
-    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}"
-
-  - name: upload-iso-artifact
-    image: alpine/git
-    depends_on:
-      - compile
-    when:
-      branch:
-        - master
-    environment:
-      GITEA_TOKEN:
-        from_secret: gitea_token
-    commands:
-      - apk add --no-cache curl
-      - chmod +w Asuro.iso
-      - cp Asuro.iso "Asuro-$(git rev-parse --short HEAD).iso"
-      - echo "Uploading Asuro-$(git rev-parse --short HEAD).iso to Gitea Packages..."
-      - |
-         curl -X PUT "https://gitea.spexeah.com/api/packages/Spexeah/generic/asuro-iso/$(git rev-parse --short HEAD)/Asuro.iso" \
-         -H "Authorization: token $GITEA_TOKEN" --upload-file "Asuro-$(git rev-parse --short HEAD).iso"
-      - echo "Updating latest ISO reference..."
-      - |
-        curl -X DELETE https://gitea.spexeah.com/api/packages/Spexeah/generic/asuro-iso/latest/Asuro.iso \
-        -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
-

.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

.gitignore

@@ -1,8 +1,6 @@
 /lib/*.ppu
 /lib/*.a
 /lib/*.o
-/lib/x86_64/
-/bin/x86_64/
 /release/*.svg
 /release/*.iso
 /bin/*.bin
@@ -12,14 +10,5 @@
 /*.sh~
 /*.img
 src/include/asuro.pas
-localenv.json
+.vscode/launch.json
-/lvgl/
+.vscode
-dockerout.txt
-AGENTS.md
-lessons_learnt.md
-/plan.md
-*.log
-wasuro
-src/core/core.version.pas
-site/*
-!site/.gitkeep

.gitlab-ci.yml

@@ -0,0 +1,73 @@
+stages:
+  - Compile Versions
+  - Compile Sources
+  - Link
+  - Generate Documentation
+  - Deploy
+
+cache:
+  - key: ${CI_COMMIT_REF_SLUG}
+    paths:
+      - lib/*.o
+      - bin/kernel.bin
+      - doc
+
+before_script:
+  - chmod +x *.sh
+
+versions:
+  stage: Compile Versions
+  script:
+    - ./compile_vergen.sh
+  artifacts:
+    paths:
+      - release/*.svg
+      - src/include/asuro.pas
+
+compile_sources:
+  stage: Compile Sources
+  script:
+    - rm -f lib/*.so
+    - ./compile_sources.sh
+  needs:
+    - versions
+
+link:
+  stage: Link
+  script:
+    - ./compile_stub.sh
+    - ./compile_link.sh
+  needs:
+    - versions
+    - compile_sources
+
+isogen:
+  stage: Deploy
+  script:
+    - ./compile_isogen.sh
+    - ./compile_sumgen.sh
+  artifacts:
+    paths:
+      - ./Asuro.iso
+      - ./release/checksum.svg
+  needs:
+    - link
+
+docgen:
+  stage: Generate Documentation
+  only:
+    - master
+    - develop
+  script:
+    - ./compile_sourcelist.sh
+    - ./compile_docs.sh
+    # Remove comments when we want to use gitlab pages.
+    #- cp doc public
+  allow_failure: true
+  artifacts:
+    paths:
+      - doc
+      #- public/*
+      #- ./sources.list
+  needs:
+    - versions

.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]>

.vscode/launch.json

@@ -3,11 +3,18 @@
         {
             "name":"Run",
             "request": "launch",
-            "type": "PowerShell",
+            "type": "coreclr",
             "preLaunchTask": "Build",
-            "script": "${workspaceFolder}/virtualbox-wrapper.ps1",
+            "program": "VBoxSDL",
-            "args": ["-Command", "up"],
+            "args": [
+                "--comment", 
+                "Asuro", 
+                "--startvm", 
+                "7d395c96-891c-4139-b77d-9b6b144b0b93"
+            ],
             "cwd": "${workspaceFolder}",
+            "console": "internalConsole",
+            "internalConsoleOptions": "neverOpen"
         }
     ]
 }

.vscode/tasks.json

@@ -9,18 +9,14 @@
             "command": "docker-compose",
             "args": [
                 "run",
-                "builder",
+                "builder"
             ],
             "type": "shell",
             "problemMatcher": [],
             "group": {
                 "kind": "build",
                 "isDefault": true
-            },
+            }
-            "dependsOn": [
-                "Close VirtualBox",
-                "Clean"
-            ]
         },
         {
             "label": "Build (Builder)",
@@ -30,24 +26,6 @@
                 "builder"
             ],
             "type": "shell"
-        },
-        {
-            "label": "Clean",
-            "command": "docker-compose",
-            "args": [
-                "down",
-                "--remove-orphans"
-            ],
-            "type": "shell"
-        },
-        {
-            "label": "Close VirtualBox",
-            "command": "./virtualbox-wrapper.ps1",
-            "args": [
-                "-Command", 
-                "down"
-            ],
-            "type": "shell"
         }
     ]
 }

Dockerfile

@@ -5,21 +5,19 @@ 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 \
+	curl dos2unix wget git make nasm binutils:i386 xorriso grub-pc-bin && \
-	python3 python3-pip python3-pil fp-compiler && \
 	apt-get clean my room
 
-RUN pip3 install --no-cache-dir --break-system-packages "mkdocs>=1.6,<2" mkdocs-material
-
 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
+RUN mkdir /code && chmod +x /usr/bin/semver
 WORKDIR /code
-# Sources are mounted at runtime; the CMD below normalizes build scripts.
+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"]

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

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+ERRCOUNT=0
+echo " "
+echo "======================="
+echo " "
+echo "Asuro Compilation"
+echo " "
+
+#Compile Stub.asm
+rm lib/*
+
+runOrFail() {
+	local binary=$1
+	local errorText=$2
+	if $binary; then
+		echo "Success."
+	else
+		echo "$errorText"
+		ERRCOUNT=$((ERRCOUNT+1))
+	fi
+}
+
+runOrFail $(pwd)/compile_stub.sh "Failed to compile stub!"
+
+#Generate .pas with versioning headers.
+runOrFail $(pwd)/compile_vergen.sh "Versions failed to compile"
+
+#Compile all .pas sources
+runOrFail $(pwd)/compile_sources.sh "Failed to compile FPC Sources!"
+
+#Link into a binary.
+runOrFail $(pwd)/compile_link.sh "Failed linking!"
+
+#Generate an ISO with GRUB as the Bootloader.
+runOrFail ./compile_isogen.sh "Failed to create ISO!"
+
+#Call generate final artifacts based on failure or success of the above.
+if [ "$ERRCOUNT" -ne "0" ]
+then
+	./compile_finish.sh "failed"
+else
+	./compile_finish.sh "success"
+fi
+
+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_isogen.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+echo " "
+echo "======================="
+echo " "
+echo "Creating ISO..."
+echo " "
+cp bin/kernel.bin iso/boot/asuro.bin
+grub-mkrescue -o Asuro.iso iso

compile_link.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+echo " "
+echo "======================="
+echo " "
+echo "Linking..."
+echo " "
+objstring=""; 
+for object in `find lib/ -name "*.o"`; do
+	if [ "$object" != "lib/stub.o" ]
+	then
+		objstring=$objstring$object" ";
+	fi
+done;
+objstring=lib/stub.o" "$objstring 
+echo "Object Files: "$objstring
+echo " "
+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 -n -va -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_sumgen.sh

@@ -1,10 +1,8 @@
 #!/usr/bin/env bash
-# Target configuration updates: Copyright 2026 Aaron Hance.
-source "$(dirname "${BASH_SOURCE[0]}")/target.sh"
 echo " "
 echo "======================="
 echo " "
 echo "Generating Checksum Badge..."
 echo " "
-checksum=$(md5sum "$ISO_FILE" | awk '{print $1}')
+checksum=$(md5sum Asuro.iso | awk '{print $1}')
 wget -q https://img.shields.io/badge/checksum-$checksum-important.svg -O release/checksum.svg 2>/dev/null