Compare commits
47
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aac376fa22 | ||
|
|
51a29244ed | ||
|
|
8be364c990 | ||
|
|
0e2c6b2936 | ||
|
|
632c3fa66b | ||
|
|
875e3e4765 | ||
|
|
e28d68128d | ||
|
|
a9969d58f8 | ||
|
|
d7a54d858d | ||
|
|
4e991c3e6f | ||
|
|
a3217de71a | ||
|
|
19b433a19f | ||
|
|
69d1d22a18 | ||
|
|
5c15343ed0 | ||
|
|
3ae349fbc8 | ||
|
|
78c060c114 | ||
|
|
cd925e96c2 | ||
|
|
142dd486dd | ||
|
|
beeeabd441 | ||
|
|
b73c66f6d6 | ||
|
|
189526cab8 | ||
|
|
595dd4fbac | ||
|
|
ba6d8037d2 | ||
|
|
208bda92c8 | ||
|
|
a7111d3cac | ||
|
|
d182fd7f46 | ||
|
|
4c5038b001 | ||
|
|
98481ea1ce | ||
|
|
b5582b1284 | ||
|
|
346dc4e4c9 | ||
|
|
b2eee58df4 | ||
|
|
161cea4920 | ||
|
|
6b81c4ece0 | ||
|
|
ee17f69115 | ||
|
|
81c19bff16 | ||
|
|
e7cda58113 | ||
|
|
44f18554e1 | ||
|
|
52b42ec975 | ||
|
|
2815dd9e4d | ||
|
|
d057bfc3ff | ||
|
|
e4621c8aaa | ||
|
|
170b93dd69 | ||
|
|
34d6873a6a | ||
|
|
e69d06ea4f | ||
|
|
2939afa729 | ||
|
|
ad8e80913a | ||
|
|
4d25ceef77 |
+52
@@ -0,0 +1,52 @@
|
|||||||
|
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"
|
||||||
+1
-2
@@ -10,5 +10,4 @@
|
|||||||
/*.sh~
|
/*.sh~
|
||||||
/*.img
|
/*.img
|
||||||
src/include/asuro.pas
|
src/include/asuro.pas
|
||||||
.vscode/launch.json
|
localenv.json
|
||||||
.vscode
|
|
||||||
|
|||||||
@@ -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
|
|
||||||
Vendored
+3
-10
@@ -3,18 +3,11 @@
|
|||||||
{
|
{
|
||||||
"name":"Run",
|
"name":"Run",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"type": "coreclr",
|
"type": "PowerShell",
|
||||||
"preLaunchTask": "Build",
|
"preLaunchTask": "Build",
|
||||||
"program": "VBoxSDL",
|
"script": "${workspaceFolder}/virtualbox-wrapper.ps1",
|
||||||
"args": [
|
"args": ["-Command", "up"],
|
||||||
"--comment",
|
|
||||||
"Asuro",
|
|
||||||
"--startvm",
|
|
||||||
"7d395c96-891c-4139-b77d-9b6b144b0b93"
|
|
||||||
],
|
|
||||||
"cwd": "${workspaceFolder}",
|
"cwd": "${workspaceFolder}",
|
||||||
"console": "internalConsole",
|
|
||||||
"internalConsoleOptions": "neverOpen"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
Vendored
+24
-2
@@ -9,14 +9,18 @@
|
|||||||
"command": "docker-compose",
|
"command": "docker-compose",
|
||||||
"args": [
|
"args": [
|
||||||
"run",
|
"run",
|
||||||
"builder"
|
"builder",
|
||||||
],
|
],
|
||||||
"type": "shell",
|
"type": "shell",
|
||||||
"problemMatcher": [],
|
"problemMatcher": [],
|
||||||
"group": {
|
"group": {
|
||||||
"kind": "build",
|
"kind": "build",
|
||||||
"isDefault": true
|
"isDefault": true
|
||||||
}
|
},
|
||||||
|
"dependsOn": [
|
||||||
|
"Close VirtualBox",
|
||||||
|
"Clean"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": "Build (Builder)",
|
"label": "Build (Builder)",
|
||||||
@@ -26,6 +30,24 @@
|
|||||||
"builder"
|
"builder"
|
||||||
],
|
],
|
||||||
"type": "shell"
|
"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"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
+16
-9
@@ -2,18 +2,25 @@ FROM ubuntu:latest
|
|||||||
|
|
||||||
VOLUME ["/code"]
|
VOLUME ["/code"]
|
||||||
|
|
||||||
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
RUN dpkg --add-architecture i386
|
RUN dpkg --add-architecture i386
|
||||||
RUN apt-get update
|
RUN apt-get update && apt-get install -y \
|
||||||
RUN apt-get install nasm curl make:i386 binutils:i386 xorriso grub-pc-bin dos2unix -y
|
curl dos2unix wget git make nasm binutils xorriso grub-pc-bin \
|
||||||
RUN apt-get clean
|
gcc-multilib g++-multilib && \
|
||||||
RUN curl https://sourceforge.net/projects/freepascal/files/Linux/2.6.4/fpc-2.6.4.i386-linux.tar/download --output fpc.tar -L && \
|
apt-get clean my room
|
||||||
tar -xf fpc.tar
|
|
||||||
|
|
||||||
WORKDIR ./fpc-2.6.4.i386-linux
|
RUN git clone --depth=1 --recurse-submodules https://github.com/cimgui/cimgui.git /cimgui
|
||||||
RUN ./install.sh
|
|
||||||
|
SHELL ["/bin/bash", "-c"]
|
||||||
|
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
|
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
|
WORKDIR /code
|
||||||
RUN find . -type f -print0 | xargs -0 dos2unix
|
RUN find . -type f -print0 | xargs -0 dos2unix
|
||||||
ENTRYPOINT ["/bin/bash", "/compile.sh"]
|
ENTRYPOINT ["/bin/bash", "-c"]
|
||||||
|
CMD ["/compile.sh"]
|
||||||
+32
-44
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/usr/bin/env bash
|
||||||
ERRCOUNT=0
|
ERRCOUNT=0
|
||||||
echo " "
|
echo " "
|
||||||
echo "======================="
|
echo "======================="
|
||||||
@@ -7,56 +7,44 @@ echo "Asuro Compilation"
|
|||||||
echo " "
|
echo " "
|
||||||
|
|
||||||
#Compile Stub.asm
|
#Compile Stub.asm
|
||||||
./compile_stub.sh
|
rm lib/*
|
||||||
if [ $? -ne 0 ]
|
|
||||||
then
|
|
||||||
echo "Failed to compile stub!"
|
|
||||||
ERRCOUNT=$((ERRCOUNT+1))
|
|
||||||
else
|
|
||||||
echo "Success."
|
|
||||||
fi
|
|
||||||
|
|
||||||
#Generate .pas with versioning headers.
|
runOrFail() {
|
||||||
./compile_vergen.sh
|
local binary=$1
|
||||||
|
local errorText=$2
|
||||||
|
if $binary; then
|
||||||
|
echo "Success."
|
||||||
|
else
|
||||||
|
echo "$errorText"
|
||||||
|
ERRCOUNT=$((ERRCOUNT+1))
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
#Compile all .pas sources
|
declare -a run_steps=(
|
||||||
./compile_sources.sh
|
"compile_stub.sh" "Failed to compile stub!"
|
||||||
if [ $? -ne 0 ]
|
"compile_vergen.sh" "Versions failed to compile"
|
||||||
then
|
"compile_imgui.sh" "Failed to compile ImGui!"
|
||||||
echo " "
|
"compile_sources.sh" "Failed to compile FPC Sources!"
|
||||||
echo "Failed to compile FPC Sources!"
|
"compile_link.sh" "Failed linking!"
|
||||||
ERRCOUNT=$((ERRCOUNT+1))
|
"compile_isogen.sh" "Failed to create ISO!"
|
||||||
else
|
)
|
||||||
echo " "
|
|
||||||
echo "Success."
|
|
||||||
fi
|
|
||||||
|
|
||||||
#Link into a binary.
|
for ((i=0; i<${#run_steps[@]}; i+=2))
|
||||||
./compile_link.sh
|
do
|
||||||
if [ $? -ne 0 ]
|
if [ "$ERRCOUNT" -eq "0" ]
|
||||||
then
|
then
|
||||||
echo "Failed linking!"
|
script=$(pwd)/"${run_steps[$i]}"
|
||||||
ERRCOUNT=$((ERRCOUNT+1))
|
message="${run_steps[$i+1]}"
|
||||||
else
|
runOrFail "$script" "$message"
|
||||||
echo "Success."
|
fi
|
||||||
fi
|
done
|
||||||
|
|
||||||
#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
|
|
||||||
|
|
||||||
#Call generate final artifacts based on failure or success of the above.
|
#Call generate final artifacts based on failure or success of the above.
|
||||||
if [ "$ERRCOUNT" -ne "0" ]
|
if [ "$ERRCOUNT" -ne "0" ]
|
||||||
then
|
then
|
||||||
./compile_finish.sh "failed"
|
. ./compile_finish.sh "failed"
|
||||||
else
|
else
|
||||||
./compile_finish.sh "success"
|
. ./compile_finish.sh "success"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/usr/bin/env bash
|
||||||
echo > checksums.md5
|
echo > checksums.md5
|
||||||
for directory in $(find src/ -maxdepth 10 -type d); do
|
for directory in $(find src/ -maxdepth 10 -type d); do
|
||||||
for filename in $directory/*.pas; do
|
for filename in $directory/*.pas; do
|
||||||
|
|||||||
+2
-3
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/usr/bin/env bash
|
||||||
echo " "
|
echo " "
|
||||||
echo "======================="
|
echo "======================="
|
||||||
echo " "
|
echo " "
|
||||||
@@ -14,5 +14,4 @@ echo "Removing old docs"
|
|||||||
rm -rf ./doc/*
|
rm -rf ./doc/*
|
||||||
echo "Generating Docs..."
|
echo "Generating Docs..."
|
||||||
./pasdoc/bin/pasdoc -N "Asuro" -T "Asuro OS Documentation" -O "html" -E ./doc/ -S sources.list --use-tipue-search
|
./pasdoc/bin/pasdoc -N "Asuro" -T "Asuro OS Documentation" -O "html" -E ./doc/ -S sources.list --use-tipue-search
|
||||||
echo "Docgen finished."
|
echo "Docgen finished."
|
||||||
exit 0
|
|
||||||
+2
-2
@@ -1,8 +1,8 @@
|
|||||||
#/bin/sh
|
#!/usr/bin/env bash
|
||||||
echo " "
|
echo " "
|
||||||
echo "======================="
|
echo "======================="
|
||||||
echo " "
|
echo " "
|
||||||
if [ "$1" == "failed" ]
|
if [[ "$1" == "failed" ]]
|
||||||
then
|
then
|
||||||
echo "Errors Occurred, please review."
|
echo "Errors Occurred, please review."
|
||||||
wget -q https://img.shields.io/badge/build-failed-red.svg -O release/build.svg 2>/dev/null
|
wget -q https://img.shields.io/badge/build-failed-red.svg -O release/build.svg 2>/dev/null
|
||||||
|
|||||||
@@ -0,0 +1,90 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
echo " "
|
||||||
|
echo "======================="
|
||||||
|
echo " "
|
||||||
|
echo "Compiling ImGui (cimgui)..."
|
||||||
|
echo " "
|
||||||
|
|
||||||
|
IMGUI_DIR=/cimgui
|
||||||
|
IMGUI_SRC=$IMGUI_DIR/imgui
|
||||||
|
BRIDGE_SRC=src/driver/video/imgui
|
||||||
|
|
||||||
|
# Flags shared by all C/C++ compilation units:
|
||||||
|
# -m32 -> i386 target
|
||||||
|
# -ffreestanding -> no implicit stdlib inclusion
|
||||||
|
# -fno-builtin -> don't inline memcpy/memset/etc. so our stubs are used
|
||||||
|
# -O2 -> optimise for speed
|
||||||
|
# -ffunction-sections -fdata-sections -> allow --gc-sections in linker
|
||||||
|
C_FLAGS="-m32 -ffreestanding -fno-builtin -O2 -ffunction-sections -fdata-sections"
|
||||||
|
|
||||||
|
# Extra flags for C++ translation units (cimgui/imgui sources):
|
||||||
|
# -fno-exceptions -> no stack-unwinding machinery
|
||||||
|
# -fno-rtti -> no typeinfo / dynamic_cast
|
||||||
|
# -fno-use-cxa-atexit -> don't emit __cxa_atexit calls for static dtors
|
||||||
|
# -fno-threadsafe-statics -> no guard-variable emission for local statics
|
||||||
|
# NOTE: *not* -ffreestanding / -fno-builtin here — imgui includes <cmath> and
|
||||||
|
# other hosted headers that refuse to compile in freestanding mode.
|
||||||
|
# The object files are archived into a static lib and linked freestanding;
|
||||||
|
# any hosted-stdlib calls (malloc/free/sin/cos/…) resolve to crtshim.c.
|
||||||
|
CPP_FLAGS="-m32 -O2 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -fno-threadsafe-statics -fno-stack-protector -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -DNDEBUG -DIMGUI_ENABLE_STB_TRUETYPE"
|
||||||
|
|
||||||
|
INCLUDE="-I$IMGUI_DIR -I$IMGUI_SRC"
|
||||||
|
|
||||||
|
echo "Compiling C runtime shim..."
|
||||||
|
gcc $C_FLAGS $INCLUDE \
|
||||||
|
-c $BRIDGE_SRC/crtshim.c \
|
||||||
|
-o lib/imgui_crtshim.o || { echo "Failed: crtshim.c"; exit 1; }
|
||||||
|
|
||||||
|
echo "Compiling render bridge..."
|
||||||
|
# imgbridge is compiled as C++ so it sees cimgui.h function declarations
|
||||||
|
# (C++ mode is required; the .c extension is overridden with -x c++)
|
||||||
|
g++ $CPP_FLAGS $INCLUDE \
|
||||||
|
-x c++ \
|
||||||
|
-DCIMGUI_DEFINE_ENUMS_AND_STRUCTS \
|
||||||
|
-c $BRIDGE_SRC/imgbridge.c \
|
||||||
|
-o lib/imgui_bridge.o || { echo "Failed: imgbridge.c"; exit 1; }
|
||||||
|
|
||||||
|
echo "Compiling cimgui wrapper..."
|
||||||
|
g++ $CPP_FLAGS $INCLUDE \
|
||||||
|
-c $IMGUI_DIR/cimgui.cpp \
|
||||||
|
-o lib/imgui_cimgui.o || { echo "Failed: cimgui.cpp"; exit 1; }
|
||||||
|
|
||||||
|
echo "Compiling imgui core..."
|
||||||
|
g++ $CPP_FLAGS $INCLUDE \
|
||||||
|
-c $IMGUI_SRC/imgui.cpp \
|
||||||
|
-o lib/imgui_core.o || { echo "Failed: imgui.cpp"; exit 1; }
|
||||||
|
|
||||||
|
echo "Compiling imgui draw..."
|
||||||
|
g++ $CPP_FLAGS $INCLUDE \
|
||||||
|
-c $IMGUI_SRC/imgui_draw.cpp \
|
||||||
|
-o lib/imgui_draw.o || { echo "Failed: imgui_draw.cpp"; exit 1; }
|
||||||
|
|
||||||
|
echo "Compiling imgui tables..."
|
||||||
|
g++ $CPP_FLAGS $INCLUDE \
|
||||||
|
-c $IMGUI_SRC/imgui_tables.cpp \
|
||||||
|
-o lib/imgui_tables.o || { echo "Failed: imgui_tables.cpp"; exit 1; }
|
||||||
|
|
||||||
|
echo "Compiling imgui widgets..."
|
||||||
|
g++ $CPP_FLAGS $INCLUDE \
|
||||||
|
-c $IMGUI_SRC/imgui_widgets.cpp \
|
||||||
|
-o lib/imgui_widgets.o || { echo "Failed: imgui_widgets.cpp"; exit 1; }
|
||||||
|
|
||||||
|
echo "Compiling imgui demo..."
|
||||||
|
g++ $CPP_FLAGS $INCLUDE \
|
||||||
|
-c $IMGUI_SRC/imgui_demo.cpp \
|
||||||
|
-o lib/imgui_demo.o || { echo "Failed: imgui_demo.cpp"; exit 1; }
|
||||||
|
|
||||||
|
echo "Archiving cimgui.a..."
|
||||||
|
# NOTE: imgui_bridge.o and imgui_crtshim.o are NOT in the archive because
|
||||||
|
# compile_link.sh already picks them up individually via find lib/ -name "*.o".
|
||||||
|
# Including them here would cause duplicate symbol errors.
|
||||||
|
ar rcs lib/cimgui.a \
|
||||||
|
lib/imgui_cimgui.o \
|
||||||
|
lib/imgui_core.o \
|
||||||
|
lib/imgui_draw.o \
|
||||||
|
lib/imgui_tables.o \
|
||||||
|
lib/imgui_widgets.o \
|
||||||
|
lib/imgui_demo.o || { echo "Failed: ar"; exit 1; }
|
||||||
|
|
||||||
|
echo "ImGui compiled successfully."
|
||||||
|
exit 0
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/usr/bin/env bash
|
||||||
echo " "
|
echo " "
|
||||||
echo "======================="
|
echo "======================="
|
||||||
echo " "
|
echo " "
|
||||||
|
|||||||
+4
-2
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/usr/bin/env bash
|
||||||
echo " "
|
echo " "
|
||||||
echo "======================="
|
echo "======================="
|
||||||
echo " "
|
echo " "
|
||||||
@@ -14,4 +14,6 @@ done;
|
|||||||
objstring=lib/stub.o" "$objstring
|
objstring=lib/stub.o" "$objstring
|
||||||
echo "Object Files: "$objstring
|
echo "Object Files: "$objstring
|
||||||
echo " "
|
echo " "
|
||||||
ld -m elf_i386 -s --gc-sections -Tlinker.script -o bin/kernel.bin $objstring
|
LIBGCC=$(gcc -m32 -print-libgcc-file-name)
|
||||||
|
ld -m elf_i386 -s --gc-sections -Tlinker.script -o bin/kernel.bin $objstring \
|
||||||
|
--start-group lib/cimgui.a $LIBGCC --end-group
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/usr/bin/env bash
|
||||||
echo " "
|
echo " "
|
||||||
echo "======================="
|
echo "======================="
|
||||||
echo " "
|
echo " "
|
||||||
|
|||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/usr/bin/env bash
|
||||||
echo " "
|
echo " "
|
||||||
echo "======================="
|
echo "======================="
|
||||||
echo " "
|
echo " "
|
||||||
echo "Compiling FPC Sources..."
|
echo "Compiling FPC Sources..."
|
||||||
echo " "
|
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 -vlewn -O3 -Op3 -Si -Sc -Sg -Xd -CX -XXs -CfSSE -CfSSE2 -Rintel -Pi386 -Tlinux -FElib/ -Fusrc/* -Fusrc/driver/* -Fusrc/driver/net/* -Fusrc/driver/video/* -Fusrc/driver/video/imgui/* src/kernel.pas
|
||||||
+1
-2
@@ -1,8 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/usr/bin/env bash
|
||||||
echo " "
|
echo " "
|
||||||
echo "======================="
|
echo "======================="
|
||||||
echo " "
|
echo " "
|
||||||
echo "Compiling Stub..."
|
echo "Compiling Stub..."
|
||||||
echo " "
|
echo " "
|
||||||
rm lib/*
|
|
||||||
nasm -f elf src/stub/stub.asm -o lib/stub.o
|
nasm -f elf src/stub/stub.asm -o lib/stub.o
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
#/bin/sh
|
#!/usr/bin/env bash
|
||||||
echo " "
|
echo " "
|
||||||
echo "======================="
|
echo "======================="
|
||||||
echo " "
|
echo " "
|
||||||
|
|||||||
+55
-47
@@ -1,4 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/usr/bin/env bash
|
||||||
|
set -e
|
||||||
echo " "
|
echo " "
|
||||||
echo "======================="
|
echo "======================="
|
||||||
echo " "
|
echo " "
|
||||||
@@ -8,60 +9,67 @@ chmod +x ./compile_checksum.sh
|
|||||||
./compile_checksum.sh
|
./compile_checksum.sh
|
||||||
outfile="src/include/asuro.pas"
|
outfile="src/include/asuro.pas"
|
||||||
file="version"
|
file="version"
|
||||||
while IFS=: read -r line;do
|
{
|
||||||
major=$(echo $line | awk '{print $1}')
|
# this script requires semver tool
|
||||||
minor=$(echo $line | awk '{print $2}')
|
wget -q https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver -O bin/semver && chmod +x bin/semver
|
||||||
sub=$(echo $line | awk '{print $3}')
|
export PATH="$(pwd)/bin:$PATH"
|
||||||
release=$(echo $line | awk '{print $4}')
|
}
|
||||||
done <"$file"
|
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}')
|
linecount=$(./loc.sh | awk '{print $1}')
|
||||||
sourcecount=$(find src -type f | wc -l)
|
sourcecount=$(find src -type f | wc -l)
|
||||||
drivercount=$(find src/driver -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}')
|
fpcversion=$(fpc -h | grep -m 1 version | awk '{print $5}')
|
||||||
makeversion=$(make -v | grep GNU | awk '{print $3}' | grep -v GNU)
|
makeversion=$(make -v | grep GNU | awk '{print $3}' | grep -v GNU)
|
||||||
nasmversion=$(nasm -v | awk '{print $3'})
|
nasmversion=$(nasm -v | awk '{print $3'})
|
||||||
compiledate=$(date +"%d/%m/%y")
|
compiledate=$(date +"%d/%m/%y")
|
||||||
compiletime=$(date +"%T")
|
compiletime=$(date +"%T")
|
||||||
checksum=$(md5sum checksums.md5 | awk '{print $1}')
|
checksum=$(md5sum checksums.md5 | awk '{print $1}')
|
||||||
echo "{" > $outfile
|
|
||||||
echo " Include->Asuro - Constants generated during pipeline/compilation for use at runtime." >> $outfile
|
[[ -n "$release" ]] && version="$version-$release"
|
||||||
echo " @author(Autogenerated)" >> $outfile
|
cat > $outfile <<EOF
|
||||||
echo "}" >> $outfile
|
unit asuro;
|
||||||
echo "unit asuro;" >> $outfile
|
|
||||||
echo " " >> $outfile
|
interface
|
||||||
echo "interface" >> $outfile
|
|
||||||
echo " " >> $outfile
|
const
|
||||||
echo "const" >> $outfile
|
VERSION = '$version';
|
||||||
echo " VERSION = '$major.$minor.$sub-$revision$release'; //The current full version as a string." >> $outfile
|
VERSION_MAJOR = '$major';
|
||||||
echo " VERSION_MAJOR = '$major'; // Current major version as a string." >> $outfile
|
VERSION_MINOR = '$minor';
|
||||||
echo " VERSION_MINOR = '$minor'; // Current minor version as a string." >> $outfile
|
VERSION_SUB = '$sub';
|
||||||
echo " VERSION_SUB = '$sub'; // Current sub version as a string." >> $outfile
|
REVISION = '$revision';
|
||||||
echo " REVISION = '$revision'; // Current revision as a string." >> $outfile
|
RELEASE = '$release';
|
||||||
echo " RELEASE = '$release'; // Current release as a string." >> $outfile
|
LINE_COUNT = $linecount;
|
||||||
echo " LINE_COUNT = $linecount; // Project line count as compiled as a string." >> $outfile
|
FILE_COUNT = $sourcecount;
|
||||||
echo " FILE_COUNT = $sourcecount; // Project line count as compiled as a string." >> $outfile
|
DRIVER_COUNT = $drivercount;
|
||||||
echo " DRIVER_COUNT = $drivercount; // Number of baked drivers in the current binary." >> $outfile
|
FPC_VERSION = '$fpcversion';
|
||||||
echo " FPC_VERSION = '$fpcversion'; // Version of the FreePascal Compiler used to compile the current binary." >> $outfile
|
NASM_VERSION = '$nasmversion';
|
||||||
echo " NASM_VERSION = '$nasmversion'; // Version of the Netwide Assembler used to compile the multiboot stub." >> $outfile
|
MAKE_VERSION = '$makeversion';
|
||||||
echo " MAKE_VERSION = '$makeversion'; // Version of MAKE used to link the current binary." >> $outfile
|
COMPILE_DATE = '$compiledate';
|
||||||
echo " COMPILE_DATE = '$compiledate'; // Date in which the current binary was compiled." >> $outfile
|
COMPILE_TIME = '$compiletime';
|
||||||
echo " COMPILE_TIME = '$compiletime'; // Time in which the current binary was compiled." >> $outfile
|
CHECKSUM = '$checksum';
|
||||||
echo " CHECKSUM = '$checksum'; // MD5 pseduo-checksum of all of the sourcefiles together." >> $outfile
|
|
||||||
echo " " >> $outfile
|
implementation
|
||||||
echo "implementation" >> $outfile
|
|
||||||
echo " " >> $outfile
|
end.
|
||||||
echo "end." >> $outfile
|
EOF
|
||||||
echo "Generating release info..."
|
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
|
set +e # These can fail on branches and such, for now
|
||||||
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/version-$major.$minor.$sub--$revision$release-blue.svg -O release/version.svg
|
||||||
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/revision-$revision-blue.svg -O release/revision.svg
|
||||||
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/release-$release-blue.svg -O release/release.svg
|
||||||
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/lines-$linecount-blueviolet.svg -O release/lines.svg
|
||||||
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/files-$sourcecount-blueviolet.svg -O release/files.svg
|
||||||
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/drivers-$drivercount-blueviolet.svg -O release/drivers.svg
|
||||||
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/FPC_version-$fpcversion-lightgrey.svg -O release/fpcversion.svg
|
||||||
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/NASM_version-$nasmversion-lightgrey.svg -O release/nasmversion.svg
|
||||||
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/MAKE_version-$makeversion-lightgrey.svg -O release/makeversion.svg
|
||||||
wget -q https://img.shields.io/badge/fingerprint-$checksum-important.svg -O release/fingerprint.svg 2>/dev/null
|
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."
|
echo "Done versioning."
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
version: "3.9"
|
|
||||||
services:
|
services:
|
||||||
builder:
|
builder:
|
||||||
build: .
|
build: .
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
4023:CIMGUI_API float igGetWindowDpiScale(void);
|
||||||
|
4081:CIMGUI_API const ImVec4_c* igGetStyleColorVec4(ImGuiCol idx);
|
||||||
|
4082:CIMGUI_API ImVec2_c igGetCursorScreenPos(void);
|
||||||
|
4084:CIMGUI_API ImVec2_c igGetContentRegionAvail(void);
|
||||||
|
4085:CIMGUI_API ImVec2_c igGetCursorPos(void);
|
||||||
|
4086:CIMGUI_API float igGetCursorPosX(void);
|
||||||
|
4087:CIMGUI_API float igGetCursorPosY(void);
|
||||||
|
4091:CIMGUI_API ImVec2_c igGetCursorStartPos(void);
|
||||||
|
4350:CIMGUI_API void igBeginDisabled(bool disabled);
|
||||||
|
4372:CIMGUI_API ImVec2_c igGetItemRectMin(void);
|
||||||
|
4373:CIMGUI_API ImVec2_c igGetItemRectMax(void);
|
||||||
|
4374:CIMGUI_API ImVec2_c igGetItemRectSize(void);
|
||||||
|
4377:CIMGUI_API ImDrawList* igGetBackgroundDrawList(ImGuiViewport* viewport);
|
||||||
|
4378:CIMGUI_API ImDrawList* igGetForegroundDrawList_ViewportPtr(ImGuiViewport* viewport);
|
||||||
|
4387:CIMGUI_API ImVec2_c igCalcTextSize(const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width);
|
||||||
|
4388:CIMGUI_API ImVec4_c igColorConvertU32ToFloat4(ImU32 in);
|
||||||
|
4405:CIMGUI_API bool igIsMouseDoubleClicked_Nil(ImGuiMouseButton button);
|
||||||
|
5092:CIMGUI_API ImDrawList* igGetForegroundDrawList_WindowPtr(ImGuiWindow* window);
|
||||||
|
5161:CIMGUI_API void igBeginDisabledOverrideReenable(void);
|
||||||
|
5244:CIMGUI_API bool igIsMouseDoubleClicked_ID(ImGuiMouseButton button,ImGuiID owner_id);
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user