From 088e628cdef39e43852591e57bed7601a2e86a98 Mon Sep 17 00:00:00 2001 From: able Date: Wed, 24 Apr 2024 23:08:34 -0500 Subject: [PATCH] Hypothetical ideas laid out --- .vscode/settings.json | 3 ++- sysdata/programs/dev/README.md | 14 ++++++++++++++ sysdata/programs/dev/meta.toml | 16 ++++++++++++++++ sysdata/programs/dev/src/main.c | 5 +++++ sysdata/programs/fisp_test/meta.toml | 2 +- sysdata/programs/test/meta.toml | 4 ++-- sysdata/programs/test/src/{main.hbl => main.S} | 2 ++ 7 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 sysdata/programs/dev/README.md create mode 100644 sysdata/programs/dev/meta.toml create mode 100644 sysdata/programs/dev/src/main.c rename sysdata/programs/test/src/{main.hbl => main.S} (91%) diff --git a/.vscode/settings.json b/.vscode/settings.json index 465a071..e0c3d05 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,5 @@ { "rust-analyzer.checkOnSave.allTargets": false, - "rust-analyzer.showUnlinkedFileNotification": false + "rust-analyzer.showUnlinkedFileNotification": false, + "C_Cpp.errorSquiggles": "disabled" } \ No newline at end of file diff --git a/sysdata/programs/dev/README.md b/sysdata/programs/dev/README.md new file mode 100644 index 0000000..2b2985c --- /dev/null +++ b/sysdata/programs/dev/README.md @@ -0,0 +1,14 @@ +# Dev +Dev is a (currently) hypothetical tool meant to be used to ease development and compilation on ableOS. + +## Usage +A `meta.toml` file must be in the project root. A `src` folder and a `lib` folder must exist. +Binaries should be put into a folder named `bin`. + +``` +bin/ +lib/ +src/ +``` + +The folders `lib/` and `bin/` should both be left out of source tracking. \ No newline at end of file diff --git a/sysdata/programs/dev/meta.toml b/sysdata/programs/dev/meta.toml new file mode 100644 index 0000000..8ca8b7c --- /dev/null +++ b/sysdata/programs/dev/meta.toml @@ -0,0 +1,16 @@ +[package] +name = "dev" +authors = ["able"] + +[dependants.libraries] +file_service = "0.0.1" + +[dependants.binaries] +susc.version = "1.0.0" + +[build.debug] +command = "susc src/main.hbl" + +[run.debug] +depends = ["build.debug"] +command = "bin/main.hbf" diff --git a/sysdata/programs/dev/src/main.c b/sysdata/programs/dev/src/main.c new file mode 100644 index 0000000..75d5431 --- /dev/null +++ b/sysdata/programs/dev/src/main.c @@ -0,0 +1,5 @@ +#include "lib/file_service.h" + +int main() { + File fhand = file_open("meta.toml"); +} \ No newline at end of file diff --git a/sysdata/programs/fisp_test/meta.toml b/sysdata/programs/fisp_test/meta.toml index 438a0d6..c0f4a7b 100644 --- a/sysdata/programs/fisp_test/meta.toml +++ b/sysdata/programs/fisp_test/meta.toml @@ -12,4 +12,4 @@ command = "fisp src/main.fisp" [run.debug] depends = ["build.debug"] -command = "" +command = "bin/main.hbf" diff --git a/sysdata/programs/test/meta.toml b/sysdata/programs/test/meta.toml index 25cc59c..60e5f4b 100644 --- a/sysdata/programs/test/meta.toml +++ b/sysdata/programs/test/meta.toml @@ -9,8 +9,8 @@ authors = ["able"] htasm = "" [build.debug] -command = "hblang src/main.hbl" +command = "htasm src/main.S" [run.debug] depends = ["build.debug"] -command = "" +command = "bin/main.hbf" diff --git a/sysdata/programs/test/src/main.hbl b/sysdata/programs/test/src/main.S similarity index 91% rename from sysdata/programs/test/src/main.hbl rename to sysdata/programs/test/src/main.S index d183c59..1b4a4ff 100644 --- a/sysdata/programs/test/src/main.hbl +++ b/sysdata/programs/test/src/main.S @@ -1,3 +1,5 @@ +jmp start + start: li64 r1, 3 li64 r2, 1