ide rework again

- `VirtualBox-Wrapper.ps1` now takes 'up' or 'down' as opposed to a machine name. This allows start/stop of a virtualmachine.
- `VirtualBox-Wrapper.ps1` now relies on a gitignored `localenv.json` to work.
- `VirtualBox-Wrapper.ps1` can also optionally monitor the log file generated from the serial adapter in VirtualBox.
- `readme.md` updated to provide instructions on how to populate the `localenv.json` file.
- `tasks.json` updated to have a "Clean" task to --remove-orphans, the Build task depends on this.
- `tasks.json` updated to have a "Close VirtualBox" task, this runs the `virtualbox-wrapper.ps1` in 'down' mode. The Build task depends on this.
- `launch.json` updated to run the `VirtualBox-Wrapper.ps1` with the "-Command up" argument, instead of machine name.
- .gitignore updated to ignore any instances of `localenv.json`.

# Conflicts:
#	.gitignore

.drone.yml

@@ -1,66 +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: 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}}"

.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

@@ -11,11 +11,3 @@
 /*.img
 src/include/asuro.pas
 localenv.json
-/lvgl/
-dockerout.txt
-AGENTS.md
-lessons_learnt.md
-*.log
-/doc/*.md
-wasuro
-src/core/core.version.pas

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

Dockerfile

@@ -5,18 +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 && \
 	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
+RUN mkdir /code && 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"]

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_link.sh

@@ -14,9 +14,4 @@ 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
-# 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 -Ttoolchain/linker.script -o bin/kernel.bin $objstring --start-group lib/liblvgl.a ${LIBGCC} --end-group

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_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"
+chmod +x ./compile_checksum.sh
-"${TOOLCHAIN_DIR}/compile_checksum.sh"
+./compile_checksum.sh
-outfile="src/core/core.version.pas"
+outfile="src/include/asuro.pas"
-file="toolchain/version"
+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