refactor(memory): complete PMM/VMM/LMM rewrite - bitmap allocators, bug fixes, hardening

PMM Rewrite:
- Replace ~8KB record array with compact bitmaps
  (PhysPresent/PhysAlloc/PhysScanned, 128B each)
- Add PhysOwner[0..1023] for per-block ownership tracking
- new_block: O(1) amortised via NextFreeHint + dword-level BSF scan,
  returns 0 as OOM sentinel
- free_block: O(1) direct bit clear with double-free detection
- alloc_block: validates PhysPresent and PhysAlloc bits before allocation
- Add pmm_free_blocks/pmm_total_blocks stats functions

VMM Correctness Fixes:
- Fix free_page block extraction (Address SHR 10, was using
  raw Address field)
- Fix invlpg operand (use virtual address, was passing PDE index)
- Clear PDE entry on free_page before returning block to PMM
- Remove map_page double-write (delegate to map_page_ex only)
- Add OOM propagation (new_page returns false if PMM returns 0)
- Fix missing pop_trace in new_page error path

LMM Rewrite:
- Replace per-entry record array with bitmap allocator
  (93% vs 43% page efficiency)
- Layout: Header(24B) + Bitmap(64512B) + Padding + Data at 0x10000
- SIZE_PREFIX=16 for 16-byte aligned returns (SSE MOVAPS requirement)
- Next-fit bitmap scan with roving hint (NextFree) and dword-level
  fast skip
- Large alloc sentinel (LARGE_ALLOC_MAGIC=$FFFFFFFE) so kfree detects
  klalloc'd memory
- Implement klfree (was previously a no-op - pages could never
  be returned)
- Implement try_release_page (return fully-free heap pages to VMM/PMM)
- Fix interrupt safety: stack-balanced pushfd/cli/pop +
  restore_if (sti only)
  Fixes Bad TSS caused by popfd restoring dangerous EFLAGS bits (NT, IOPL)
- Zero memory via rep stosd instead of byte-by-byte loop

Hardening:
- kalloc OOM now triggers BSOD instead of returning nil
  (90% of callers don't check)
- Double-free detection in kfree (verify bitmap bits set before clearing)
- Guard bytes ({$IFDEF DEBUG_LMM}): $DEADBEEF sentinel for buffer overrun detection
- kpalloc: bounds check (block >= 1024 -> GPF) + syslog MMIO mapping audit log

Observability:
- Add MEMINFO command as src/prog/meminfo.pas (moved from inline kernel.pas)
- Displays multiboot memory, PMM block stats, LMM heap stats
- Register via progmanager.pas following standard prog pattern

Files changed:
- src/pmemorymanager.pas
- src/vmemorymanager.pas
- src/lmemorymanager.pas
- src/kernel.pas
- src/progmanager.pas
- src/prog/meminfo.pas

.drone.yml

@@ -0,0 +1,66 @@
+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/*.sh
+      - /drone/src/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 +1,8 @@
-* text=auto eol=lf
+* 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

@@ -10,5 +10,9 @@
 /*.sh~
 /*.img
 src/include/asuro.pas
-.vscode/launch.json
-.vscode
+localenv.json
+/lvgl/
+dockerout.txt
+AGENTS.md
+*.log
+/doc/*.md

.gitlab-ci.yml

@@ -1,99 +0,0 @@
-stages:
-  - Generate Stub and Versions
-  - Generate Version Files
-  - Compile Sources
-  - Link
-  - Generate ISO
-  - Generate Sources List
-  - Generate Documentation
-
-compile_stub:
-  stage: Generate Stub and Versions
-  script: 
-    - chmod +x ./compile_stub.sh
-    - ./compile_stub.sh
-  artifacts:
-    paths:
-      - lib/stub.o
-
-vergen:
-  stage: Generate Stub and Versions
-  script: 
-    - chmod +x ./compile_vergen.sh
-    - ./compile_vergen.sh
-  artifacts:
-    paths:
-      - release/*.svg
-      - src/include/asuro.pas
-
-compile_sources:
-  stage: Compile Sources
-  script:
-    - chmod +x ./compile_sources.sh
-    - ./compile_sources.sh
-  artifacts:
-    paths:
-      - lib/*.o
-  dependencies:
-    - compile_stub
-    - vergen
-  needs:
-    - vergen
-    - compile_stub
-
-link:
-  stage: Link
-  script:
-    - chmod +x ./compile_link.sh
-    - ./compile_link.sh
-  artifacts:
-    paths:
-      - bin/kernel.bin
-  dependencies:
-    - compile_sources
-  needs:
-    - compile_sources
-
-isogen:
-  stage: Generate ISO
-  script:
-    - chmod +x ./compile_isogen.sh
-    - ./compile_isogen.sh
-    - chmod +x ./compile_sumgen.sh
-    - ./compile_sumgen.sh
-  artifacts:
-    paths:
-      - ./Asuro.iso
-      - ./release/checksum.svg
-  dependencies:
-    - link
-  needs:
-    - link
-
-sourcelist:
-  stage: Generate Sources List
-  script:
-    - chmod +x ./compile_sourcelist.sh
-    - ./compile_sourcelist.sh
-  artifacts:
-    paths:
-      - ./sources.list
-  dependencies:
-    - vergen
-  needs:
-    - vergen
-
-docgen:
-  stage: Generate Documentation
-  script:
-    - chmod +x ./compile_docs.sh
-    - ./compile_docs.sh
-  artifacts:
-    paths:
-      - ./doc/*
-  dependencies:
-    - vergen
-    - sourcelist
-  needs:
-    - vergen
-    - sourcelist

.mailmap

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

.vscode/tasks.json

@@ -9,14 +9,18 @@
             "command": "docker-compose",
             "args": [
                 "run",
-                "builder"
+                "builder",
             ],
             "type": "shell",
             "problemMatcher": [],
             "group": {
                 "kind": "build",
                 "isDefault": true
-            }
+            },
+            "dependsOn": [
+                "Close VirtualBox",
+                "Clean"
+            ]
         },
         {
             "label": "Build (Builder)",
@@ -26,6 +30,24 @@
                 "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

@@ -2,18 +2,22 @@ FROM ubuntu:latest
 
 VOLUME ["/code"]
 
+ENV DEBIAN_FRONTEND=noninteractive
 RUN dpkg --add-architecture i386
-RUN apt-get update
-RUN apt-get install nasm curl make:i386 binutils:i386 xorriso grub-pc-bin dos2unix -y
-RUN apt-get clean
-RUN curl https://sourceforge.net/projects/freepascal/files/Linux/2.6.4/fpc-2.6.4.i386-linux.tar/download --output fpc.tar -L && \
-	tar -xf fpc.tar
+RUN apt-get update && apt-get install -y \
+	curl dos2unix wget git make nasm binutils xorriso grub-pc-bin gcc gcc-multilib && \
+	apt-get clean my room
 
-WORKDIR ./fpc-2.6.4.i386-linux
-RUN ./install.sh
+SHELL ["/bin/bash", "-c"]
+ARG FPC_VERSION=3.2.2
+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
-RUN mkdir /code
+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", "/compile.sh"]
+ENTRYPOINT ["/bin/bash", "-c"]
+CMD ["/compile.sh"]

compile.sh

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

compile_checksum.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 echo > checksums.md5
 for directory in $(find src/ -maxdepth 10 -type d); do
 	for filename in $directory/*.pas; do

compile_docs.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 echo " "
 echo "======================="
 echo " "
@@ -14,5 +14,4 @@ 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."
-exit 0
+echo "Docgen finished."

compile_finish.sh

@@ -1,8 +1,8 @@
-#/bin/sh
+#!/usr/bin/env bash
 echo " "
 echo "======================="
 echo " "
-if [ "$1" == "failed" ]
+if [[ "$1" == "failed" ]]
 then
 	echo "Errors Occurred, please review."
 	wget -q https://img.shields.io/badge/build-failed-red.svg -O release/build.svg 2>/dev/null

compile_isogen.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 echo " "
 echo "======================="
 echo " "

compile_link.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 echo " "
 echo "======================="
 echo " "
@@ -14,4 +14,9 @@ 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 -Tlinker.script -o bin/kernel.bin $objstring --start-group lib/liblvgl.a ${LIBGCC} --end-group

compile_lvgl.sh

@@ -0,0 +1,132 @@
+#!/usr/bin/env bash
+# compile_lvgl.sh — Download LVGL v9.2 source and compile into lib/liblvgl.a
+# Clone & compile in /tmp (fast container-local fs).
+# Cache liblvgl.a on host mount (/code/lvgl/) to skip rebuild.
+set -e
+
+LVGL_VERSION="v9.2.2"
+LVGL_REPO="https://github.com/lvgl/lvgl.git"
+LVGL_DIR="/tmp/lvgl"
+OBJ_DIR="/tmp/lvgl_obj"
+CONF_DIR="$(pwd)/lvglh"
+OUT_DIR="$(pwd)/lib"
+CACHE_DIR="/code/lvgl"
+
+CC="gcc"
+CFLAGS="-m32 -march=i686 -ffreestanding \
+    -fno-builtin -fno-stack-protector -fno-pic -fno-pie \
+    -O2 -Wall -Wno-unused-function -Wno-unused-variable \
+    -I${CONF_DIR} \
+    -I${LVGL_DIR} \
+    -I${LVGL_DIR}/.. \
+    -DLV_CONF_INCLUDE_SIMPLE"
+
+echo " "
+echo "======================="
+echo " "
+echo "Compiling LVGL..."
+echo " "
+
+# If cached liblvgl.a exists on host mount, just copy it and skip everything
+if [ -f "${CACHE_DIR}/liblvgl.a" ]; then
+    echo "Found cached liblvgl.a in ${CACHE_DIR}, copying to ${OUT_DIR}..."
+    cp "${CACHE_DIR}/liblvgl.a" "${OUT_DIR}/liblvgl.a"
+    echo "(Delete lvgl/liblvgl.a to force a full rebuild.)"
+    echo " "
+    echo "LVGL compilation complete (cached)."
+    echo " "
+    exit 0
+fi
+
+# Clone LVGL into /tmp (container-local)
+rm -rf "$LVGL_DIR"
+echo "Downloading LVGL ${LVGL_VERSION}..."
+git clone --depth 1 --branch "${LVGL_VERSION}" "${LVGL_REPO}" "${LVGL_DIR}" 2>&1
+echo "Download complete."
+
+# Gather all LVGL .c source files (core library only, no demos/examples)
+SOURCES=$(find "${LVGL_DIR}/src" -name '*.c' -not -path '*/test/*')
+TOTAL=$(echo "$SOURCES" | wc -l)
+echo "Found ${TOTAL} LVGL source files."
+
+# Compile each .c file to .o (container-local)
+rm -rf "$OBJ_DIR"
+mkdir -p "$OBJ_DIR"
+
+COUNT=0
+ERRORS=0
+for src in $SOURCES; do
+    COUNT=$((COUNT + 1))
+    rel="${src#${LVGL_DIR}/src/}"
+    obj_path="${OBJ_DIR}/${rel%.c}.o"
+    mkdir -p "$(dirname "$obj_path")"
+
+    if ! $CC $CFLAGS -c "$src" -o "$obj_path" 2>&1; then
+        echo "FAILED: $rel"
+        ERRORS=$((ERRORS + 1))
+    fi
+
+    if [ $((COUNT % 50)) -eq 0 ]; then
+        echo "  Compiled ${COUNT}/${TOTAL}..."
+    fi
+done
+
+echo "Compiled ${COUNT} files (${ERRORS} errors)."
+
+if [ "$ERRORS" -ne 0 ]; then
+    echo "LVGL compilation FAILED with ${ERRORS} errors."
+    exit 1
+fi
+
+# Archive into static library
+OBJECTS=$(find "$OBJ_DIR" -name '*.o')
+ar rcs "${OUT_DIR}/liblvgl.a" $OBJECTS
+echo "Created ${OUT_DIR}/liblvgl.a"
+
+# Compile custom LVGL extension files from lvglh/
+LVGLH_SOURCES=$(find "${CONF_DIR}" -name '*.c' 2>/dev/null || true)
+if [ -n "$LVGLH_SOURCES" ]; then
+    echo " "
+    echo "Compiling custom LVGL files from lvglh/..."
+    LVGLH_OBJ_DIR="/tmp/lvglh_obj"
+    rm -rf "$LVGLH_OBJ_DIR"
+    mkdir -p "$LVGLH_OBJ_DIR"
+    HCOUNT=0
+    HERRORS=0
+    for src in $LVGLH_SOURCES; do
+        HCOUNT=$((HCOUNT + 1))
+        rel="${src#${CONF_DIR}/}"
+        obj_path="${LVGLH_OBJ_DIR}/${rel%.c}.o"
+        mkdir -p "$(dirname "$obj_path")"
+        echo "  [lvglh] $rel"
+        if ! $CC $CFLAGS -c "$src" -o "$obj_path" 2>&1; then
+            echo "  FAILED: $rel"
+            HERRORS=$((HERRORS + 1))
+        fi
+    done
+    echo "Compiled ${HCOUNT} custom files (${HERRORS} errors)."
+    if [ "$HERRORS" -ne 0 ]; then
+        echo "Custom LVGL compilation FAILED."
+        exit 1
+    fi
+    # Append custom objects into the existing archive
+    HOBJECTS=$(find "$LVGLH_OBJ_DIR" -name '*.o')
+    ar rcs "${OUT_DIR}/liblvgl.a" $HOBJECTS
+    echo "Updated ${OUT_DIR}/liblvgl.a with custom objects."
+else
+    echo "No custom LVGL files in lvglh/."
+fi
+
+# Cache liblvgl.a and source to host mount for next build
+echo "Caching LVGL to host mount..."
+mkdir -p "$CACHE_DIR"
+rm -rf ${CACHE_DIR}/* ${CACHE_DIR}/.[!.]* ${CACHE_DIR}/..?* 2>/dev/null || true
+cp "${OUT_DIR}/liblvgl.a" "${CACHE_DIR}/liblvgl.a"
+cp -a "$LVGL_DIR/src" "${CACHE_DIR}/src"
+cp -a "$LVGL_DIR"/*.h "${CACHE_DIR}/" 2>/dev/null || true
+cp -a "$OBJ_DIR" "${CACHE_DIR}/obj"
+echo "Done."
+
+echo " "
+echo "LVGL compilation complete."
+echo " "

compile_sourcelist.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 echo " "
 echo "======================="
 echo " "

compile_sources.sh

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/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
+fpc -Aelf -gw -g -gl -n -v0ew -O3 -OpPENTIUM3 -Si -Sc -Sg -Xd -CX -XXs -CfSSE -CfSSE2 -Rintel -Pi386 -Tlinux -FElib/ -Fusrc/* -Fusrc/include/* -Fusrc/driver/* -Fusrc/driver/net/* -Fusrc/driver/bus/* -Fusrc/driver/bus/usb/* -Fusrc/driver/hid/* src/kernel.pas

compile_stub.sh

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

compile_sumgen.sh

@@ -1,4 +1,4 @@
-#/bin/sh
+#!/usr/bin/env bash
 echo " "
 echo "======================="
 echo " "

compile_vergen.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -e
 echo " "
 echo "======================="
 echo " "
@@ -8,56 +9,67 @@ chmod +x ./compile_checksum.sh
 ./compile_checksum.sh
 outfile="src/include/asuro.pas"
 file="version"
-while IFS=: read -r line;do
-	major=$(echo $line | awk '{print $1}')
-	minor=$(echo $line | awk '{print $2}')
-	sub=$(echo $line | awk '{print $3}')
-	release=$(echo $line | awk '{print $4}')
-done <"$file"
+{
+	# this script requires semver tool
+	wget -q https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver -O bin/semver && chmod +x bin/semver
+	export PATH="$(pwd)/bin:$PATH"
+}
+tagref=$(git describe --tags)
+revision=$(git rev-parse --short=8 HEAD)
+major=$(semver get major $tagref)
+minor=$(semver get minor $tagref)
+sub=$(semver get patch $tagref)
+version=$(semver get release $tagref)
+release=$(semver get prerel $tagref)
+build=$(semver get build $tagref)
 linecount=$(./loc.sh | awk '{print $1}')
 sourcecount=$(find src -type f | wc -l)
 drivercount=$(find src/driver -type f | wc -l)
-revision=$(git rev-list --all --count)
 fpcversion=$(fpc -h | grep -m 1 version | awk '{print $5}')
 makeversion=$(make -v | grep GNU | awk '{print $3}' | grep -v GNU)
 nasmversion=$(nasm -v | awk '{print $3'})
 compiledate=$(date +"%d/%m/%y")
 compiletime=$(date +"%T")
 checksum=$(md5sum checksums.md5 | awk '{print $1}')
-echo "unit asuro;" > $outfile
-echo " " >> $outfile
-echo "interface" >> $outfile
-echo " " >> $outfile
-echo "const" >> $outfile
-echo "     VERSION       = '$major.$minor.$sub-$revision$release';" >> $outfile
-echo "     VERSION_MAJOR = '$major';" >> $outfile
-echo "     VERSION_MINOR = '$minor';" >> $outfile
-echo "     VERSION_SUB   = '$sub';" >> $outfile
-echo "     REVISION      = '$revision';" >> $outfile
-echo "     RELEASE       = '$release';" >> $outfile
-echo "     LINE_COUNT    = $linecount;" >> $outfile
-echo "     FILE_COUNT    = $sourcecount;" >> $outfile
-echo "     DRIVER_COUNT  = $drivercount;" >> $outfile
-echo "     FPC_VERSION   = '$fpcversion';" >> $outfile
-echo "     NASM_VERSION  = '$nasmversion';" >> $outfile
-echo "     MAKE_VERSION  = '$makeversion';" >> $outfile
-echo "     COMPILE_DATE  = '$compiledate';" >> $outfile
-echo "     COMPILE_TIME  = '$compiletime';" >> $outfile
-echo "     CHECKSUM      = '$checksum';" >> $outfile
-echo " " >> $outfile
-echo "implementation" >> $outfile
-echo " " >> $outfile
-echo "end." >> $outfile
+
+[[ -n "$release" ]] && version="$version-$release"
+cat > $outfile <<EOF
+unit asuro;
+ 
+interface
+ 
+const
+     VERSION       = '$version';
+     VERSION_MAJOR = '$major';
+     VERSION_MINOR = '$minor';
+     VERSION_SUB   = '$sub';
+     REVISION      = '$revision';
+     RELEASE       = '$release';
+     LINE_COUNT    = $linecount;
+     FILE_COUNT    = $sourcecount;
+     DRIVER_COUNT  = $drivercount;
+     FPC_VERSION   = '$fpcversion';
+     NASM_VERSION  = '$nasmversion';
+     MAKE_VERSION  = '$makeversion';
+     COMPILE_DATE  = '$compiledate';
+     COMPILE_TIME  = '$compiletime';
+     CHECKSUM      = '$checksum';
+ 
+implementation
+ 
+end.
+EOF
 echo "Generating release info..."
-wget -q https://img.shields.io/badge/version-$major.$minor.$sub--$revision$release-blue.svg -O release/version.svg 2>/dev/null
-wget -q https://img.shields.io/badge/revision-$revision-blue.svg -O release/revision.svg 2>/dev/null
-wget -q https://img.shields.io/badge/release-$release-blue.svg -O release/release.svg 2>/dev/null
-wget -q https://img.shields.io/badge/lines-$linecount-blueviolet.svg -O release/lines.svg 2>/dev/null
-wget -q https://img.shields.io/badge/files-$sourcecount-blueviolet.svg -O release/files.svg 2>/dev/null
-wget -q https://img.shields.io/badge/drivers-$drivercount-blueviolet.svg -O release/drivers.svg 2>/dev/null
-wget -q https://img.shields.io/badge/FPC_version-$fpcversion-lightgrey.svg -O release/fpcversion.svg 2>/dev/null
-wget -q https://img.shields.io/badge/NASM_version-$nasmversion-lightgrey.svg -O release/nasmversion.svg 2>/dev/null
-wget -q https://img.shields.io/badge/MAKE_version-$makeversion-lightgrey.svg -O release/makeversion.svg 2>/dev/null
-wget -q https://img.shields.io/badge/release_date-$compiledate-lightgrey.svg -O release/date.svg 2>/dev/null
-wget -q https://img.shields.io/badge/fingerprint-$checksum-important.svg -O release/fingerprint.svg 2>/dev/null
+set +e # These can fail on branches and such, for now
+wget -q https://img.shields.io/badge/version-$major.$minor.$sub--$revision$release-blue.svg -O release/version.svg
+wget -q https://img.shields.io/badge/revision-$revision-blue.svg -O release/revision.svg
+wget -q https://img.shields.io/badge/release-$release-blue.svg -O release/release.svg
+wget -q https://img.shields.io/badge/lines-$linecount-blueviolet.svg -O release/lines.svg
+wget -q https://img.shields.io/badge/files-$sourcecount-blueviolet.svg -O release/files.svg
+wget -q https://img.shields.io/badge/drivers-$drivercount-blueviolet.svg -O release/drivers.svg
+wget -q https://img.shields.io/badge/FPC_version-$fpcversion-lightgrey.svg -O release/fpcversion.svg
+wget -q https://img.shields.io/badge/NASM_version-$nasmversion-lightgrey.svg -O release/nasmversion.svg
+wget -q https://img.shields.io/badge/MAKE_version-$makeversion-lightgrey.svg -O release/makeversion.svg
+wget -q https://img.shields.io/badge/release_date-$compiledate-lightgrey.svg -O release/date.svg
+wget -q https://img.shields.io/badge/fingerprint-$checksum-important.svg -O release/fingerprint.svg
 echo "Done versioning."