From 5f59f05dcefb7b117e87371ccea0911c57595ac4 Mon Sep 17 00:00:00 2001 From: mlokr Date: Wed, 18 Sep 2024 10:38:49 +0200 Subject: [PATCH] removing deprecated `rel:` path prefix --- Cargo.lock | 6 +++--- sysdata/libraries/dt_api/src/lib.hb | 2 +- sysdata/libraries/horizon_api/src/lib.hb | 4 ++-- sysdata/libraries/ignim/src/application.hb | 4 ++-- sysdata/libraries/ignim/src/instance.hb | 6 +++--- sysdata/libraries/ignim/src/lib.hb | 18 +++++++++--------- sysdata/libraries/ignim/src/rect.hb | 4 ++-- sysdata/libraries/intouch/src/keycodes.hb | 2 +- sysdata/libraries/intouch/src/lib.hb | 2 +- sysdata/libraries/pci/src/lib.hb | 2 +- sysdata/libraries/render/src/lib.hb | 4 ++-- sysdata/libraries/render/src/software.hb | 2 +- sysdata/libraries/render/src/svga.hb | 2 +- sysdata/libraries/stn/src/buffer.hb | 2 +- sysdata/libraries/stn/src/file_io.hb | 2 +- sysdata/libraries/stn/src/lib.hb | 16 ++++++++-------- sysdata/libraries/stn/src/log.hb | 4 ++-- sysdata/programs/filesystem_fat32/src/file.hb | 4 ++-- sysdata/programs/filesystem_fat32/src/main.hb | 8 ++++---- sysdata/programs/svga_driver/src/main.hb | 4 ++-- 20 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 62cf4a155..5c26eed20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -390,7 +390,7 @@ dependencies = [ [[package]] name = "hbbytecode" version = "0.1.0" -source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#ece9bb8bf21507b5d2a7c870f55aa2e9c5ab9f26" +source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#4849807353675c58d819a01569a613a06372304e" [[package]] name = "hbbytecode" @@ -400,7 +400,7 @@ source = "git+https://git.ablecorp.us/ableos/holey-bytes.git#4a9b9de87fd56a6bbd5 [[package]] name = "hblang" version = "0.1.0" -source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#ece9bb8bf21507b5d2a7c870f55aa2e9c5ab9f26" +source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#4849807353675c58d819a01569a613a06372304e" dependencies = [ "hbvm 0.1.0 (git+https://git.ablecorp.us/AbleOS/holey-bytes.git)", ] @@ -408,7 +408,7 @@ dependencies = [ [[package]] name = "hbvm" version = "0.1.0" -source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#ece9bb8bf21507b5d2a7c870f55aa2e9c5ab9f26" +source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#4849807353675c58d819a01569a613a06372304e" dependencies = [ "hbbytecode 0.1.0 (git+https://git.ablecorp.us/AbleOS/holey-bytes.git)", ] diff --git a/sysdata/libraries/dt_api/src/lib.hb b/sysdata/libraries/dt_api/src/lib.hb index bf3e800bd..5363cd30a 100644 --- a/sysdata/libraries/dt_api/src/lib.hb +++ b/sysdata/libraries/dt_api/src/lib.hb @@ -1,4 +1,4 @@ -stn := @use("rel:../../stn/src/lib.hb"); +stn := @use("../../stn/src/lib.hb"); .{string, memory, buffer} := stn dt_get := fn(query: ^u8): int { diff --git a/sysdata/libraries/horizon_api/src/lib.hb b/sysdata/libraries/horizon_api/src/lib.hb index c4fde748d..c3a53ff60 100644 --- a/sysdata/libraries/horizon_api/src/lib.hb +++ b/sysdata/libraries/horizon_api/src/lib.hb @@ -1,7 +1,7 @@ -stn := @use("rel:../../stn/src/lib.hb"); +stn := @use("../../stn/src/lib.hb"); .{string, memory, buffer} := stn -input := @use("rel:../../intouch/src/lib.hb") +input := @use("../../intouch/src/lib.hb") WindowID := struct { host_id: int, diff --git a/sysdata/libraries/ignim/src/application.hb b/sysdata/libraries/ignim/src/application.hb index 61d42c667..f3f22d837 100644 --- a/sysdata/libraries/ignim/src/application.hb +++ b/sysdata/libraries/ignim/src/application.hb @@ -1,5 +1,5 @@ -structures := @use("rel:structures.hb") -version := @use("rel:version.hb") +structures := @use("structures.hb") +version := @use("version.hb") // Refer to here https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkApplicationInfo.html ApplicationInfo := struct { diff --git a/sysdata/libraries/ignim/src/instance.hb b/sysdata/libraries/ignim/src/instance.hb index 0841b98ec..b24fb3df6 100644 --- a/sysdata/libraries/ignim/src/instance.hb +++ b/sysdata/libraries/ignim/src/instance.hb @@ -1,8 +1,8 @@ -application := @use("rel:application.hb"); +application := @use("application.hb"); .{ApplicationInfo} := application -structures := @use("rel:structures.hb") -errors := @use("rel:errors.hb") +structures := @use("structures.hb") +errors := @use("errors.hb") // https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkInstanceCreateInfo.html InstanceCreateInfo := struct { diff --git a/sysdata/libraries/ignim/src/lib.hb b/sysdata/libraries/ignim/src/lib.hb index bc9cc1237..7c0ef0115 100644 --- a/sysdata/libraries/ignim/src/lib.hb +++ b/sysdata/libraries/ignim/src/lib.hb @@ -1,16 +1,16 @@ -application := @use("rel:application.hb") +application := @use("application.hb") -results := @use("rel:results.hb") -errors := @use("rel:errors.hb") +results := @use("results.hb") +errors := @use("errors.hb") -offsets := @use("rel:offset.hb") -extends := @use("rel:extends.hb") +offsets := @use("offset.hb") +extends := @use("extends.hb") -rect := @use("rel:rect.hb") -structures := @use("rel:structures.hb") -instance := @use("rel:instance.hb") +rect := @use("rect.hb") +structures := @use("structures.hb") +instance := @use("instance.hb") -version := @use("rel:version.hb") +version := @use("version.hb") init_vulkan := fn(): int { return errors.IncompatibleDriver diff --git a/sysdata/libraries/ignim/src/rect.hb b/sysdata/libraries/ignim/src/rect.hb index dbc7afd3c..a5395d33e 100644 --- a/sysdata/libraries/ignim/src/rect.hb +++ b/sysdata/libraries/ignim/src/rect.hb @@ -1,5 +1,5 @@ -offsets := @use("rel:offset.hb") -extends := @use("rel:extends.hb") +offsets := @use("offset.hb") +extends := @use("extends.hb") Rect2D := struct { offset: offsets.Offset2D, diff --git a/sysdata/libraries/intouch/src/keycodes.hb b/sysdata/libraries/intouch/src/keycodes.hb index 836a3dba3..85e96f4de 100644 --- a/sysdata/libraries/intouch/src/keycodes.hb +++ b/sysdata/libraries/intouch/src/keycodes.hb @@ -5,4 +5,4 @@ Backspace := KeyCode.(8) Tab := KeyCode.(9) Clear := KeyCode.(12) Return := KeyCode.(13) -Pause := KeyCode.(19) +Pause := KeyCode.(19) \ No newline at end of file diff --git a/sysdata/libraries/intouch/src/lib.hb b/sysdata/libraries/intouch/src/lib.hb index faeb8a5db..86175a6c0 100644 --- a/sysdata/libraries/intouch/src/lib.hb +++ b/sysdata/libraries/intouch/src/lib.hb @@ -1,4 +1,4 @@ -keycodes := @use("rel:keycodes.hb"); +keycodes := @use("keycodes.hb"); .{KeyCode} := keycodes MouseEvent := struct { diff --git a/sysdata/libraries/pci/src/lib.hb b/sysdata/libraries/pci/src/lib.hb index aa911acde..3807a733c 100644 --- a/sysdata/libraries/pci/src/lib.hb +++ b/sysdata/libraries/pci/src/lib.hb @@ -1,4 +1,4 @@ -stn := @use("rel:../../stn/src/lib.hb"); +stn := @use("../../stn/src/lib.hb"); .{string, memory, buffer} := stn PCIAddress := struct { diff --git a/sysdata/libraries/render/src/lib.hb b/sysdata/libraries/render/src/lib.hb index 6cf0ccd59..fdd5bb3df 100644 --- a/sysdata/libraries/render/src/lib.hb +++ b/sysdata/libraries/render/src/lib.hb @@ -1,5 +1,5 @@ -svga := @use("rel:svga.hb") -software := @use("rel:software.hb") +svga := @use("svga.hb") +software := @use("software.hb") // default mode mode := software diff --git a/sysdata/libraries/render/src/software.hb b/sysdata/libraries/render/src/software.hb index 117f42f17..80c4ed4b5 100644 --- a/sysdata/libraries/render/src/software.hb +++ b/sysdata/libraries/render/src/software.hb @@ -1,6 +1,6 @@ .{math, memory} := @use("../../stn/src/lib.hb"); .{dt_get} := @use("../../dt_api/src/lib.hb"); -.{IVec2} := @use("rel:lib.hb") +.{IVec2} := @use("lib.hb") Color := struct {b: u8, g: u8, r: u8, a: u8} white := Color.(255, 255, 255, 255) diff --git a/sysdata/libraries/render/src/svga.hb b/sysdata/libraries/render/src/svga.hb index eb7027d15..e88d008b9 100644 --- a/sysdata/libraries/render/src/svga.hb +++ b/sysdata/libraries/render/src/svga.hb @@ -1,4 +1,4 @@ -.{IVec2} := @use("rel:lib.hb") +.{IVec2} := @use("lib.hb") // .{pci, memory, string, log} := @use("../../stn/src/lib.hb"); Color := struct {b: u8, g: u8, r: u8, a: u8} diff --git a/sysdata/libraries/stn/src/buffer.hb b/sysdata/libraries/stn/src/buffer.hb index 266afb809..896a909bf 100644 --- a/sysdata/libraries/stn/src/buffer.hb +++ b/sysdata/libraries/stn/src/buffer.hb @@ -1,4 +1,4 @@ -string := @use("rel:string.hb") +string := @use("string.hb") receive_message := fn(buffer_id: int, memory_map_location: ^u8, length: int): ^u8 { return @eca(4, buffer_id, memory_map_location, length) diff --git a/sysdata/libraries/stn/src/file_io.hb b/sysdata/libraries/stn/src/file_io.hb index d4054dd2b..feddd52ec 100644 --- a/sysdata/libraries/stn/src/file_io.hb +++ b/sysdata/libraries/stn/src/file_io.hb @@ -1,4 +1,4 @@ -acs := @use("rel:acs.hb"); +acs := @use("acs.hb"); .{DiskID, FileID} := acs // Paths without a node-disk component are to be treated as local files. diff --git a/sysdata/libraries/stn/src/lib.hb b/sysdata/libraries/stn/src/lib.hb index d26ee80e8..09ff85dd0 100644 --- a/sysdata/libraries/stn/src/lib.hb +++ b/sysdata/libraries/stn/src/lib.hb @@ -1,9 +1,9 @@ -acs := @use("rel:acs.hb") +acs := @use("acs.hb") -string := @use("rel:string.hb") -log := @use("rel:log.hb") -memory := @use("rel:memory.hb") -buffer := @use("rel:buffer.hb") -math := @use("rel:math.hb") -random := @use("rel:random.hb") -file := @use("rel:file_io.hb") \ No newline at end of file +string := @use("string.hb") +log := @use("log.hb") +memory := @use("memory.hb") +buffer := @use("buffer.hb") +math := @use("math.hb") +random := @use("random.hb") +file := @use("file_io.hb") \ No newline at end of file diff --git a/sysdata/libraries/stn/src/log.hb b/sysdata/libraries/stn/src/log.hb index bcd5f3e52..14639df82 100644 --- a/sysdata/libraries/stn/src/log.hb +++ b/sysdata/libraries/stn/src/log.hb @@ -1,5 +1,5 @@ -string := @use("rel:string.hb") -buffer := @use("rel:buffer.hb") +string := @use("string.hb") +buffer := @use("buffer.hb") log := fn(message: ^u8, level: u8): void { message_length := @inline(string.length, message); diff --git a/sysdata/programs/filesystem_fat32/src/file.hb b/sysdata/programs/filesystem_fat32/src/file.hb index aa0e3e765..c75484557 100644 --- a/sysdata/programs/filesystem_fat32/src/file.hb +++ b/sysdata/programs/filesystem_fat32/src/file.hb @@ -1,5 +1,5 @@ -attributes := @use("rel:attributes.hb") -datetime := @use("rel:datetime.hb") +attributes := @use("attributes.hb") +datetime := @use("datetime.hb") FileName := [u8; 11] diff --git a/sysdata/programs/filesystem_fat32/src/main.hb b/sysdata/programs/filesystem_fat32/src/main.hb index d662dd0b2..6e88cbbc7 100644 --- a/sysdata/programs/filesystem_fat32/src/main.hb +++ b/sysdata/programs/filesystem_fat32/src/main.hb @@ -1,10 +1,10 @@ stn := @use("../../../libraries/stn/src/lib.hb"); .{string, memory, buffer, log} := stn -attributes := @use("rel:attributes.hb") -datetime := @use("rel:datetime.hb") -directory := @use("rel:file.hb") -bios_parameter_block := @use("rel:bios_parameter_block.hb"); +attributes := @use("attributes.hb") +datetime := @use("datetime.hb") +directory := @use("file.hb") +bios_parameter_block := @use("bios_parameter_block.hb"); .{bpb_sanity_check, ebr_sanity_check, fs_info_sanity_check} := bios_parameter_block; .{new_bpb, new_ebr, new_fs_info} := bios_parameter_block diff --git a/sysdata/programs/svga_driver/src/main.hb b/sysdata/programs/svga_driver/src/main.hb index 6cb8eed56..b75bf9517 100644 --- a/sysdata/programs/svga_driver/src/main.hb +++ b/sysdata/programs/svga_driver/src/main.hb @@ -1,10 +1,10 @@ -device := @use("rel:device.hb") +device := @use("device.hb") pci := @use("../../../libraries/pci/src/lib.hb") stn := @use("../../../libraries/stn/src/lib.hb"); .{string, memory, buffer, log} := stn -reg := @use("rel:reg.hb") +reg := @use("reg.hb") PCI_VENDOR_ID_VMWARE := 0x15AD PCI_DEVICE_ID_VMWARE_SVGA2 := 0x405