Renames libcore to libgui and move it to top-level (#1008)

obhq · Oct 1, 2024 · c8ce13a · c8ce13a
1 parent 709c0b7
commit c8ce13a
Show file tree

Hide file tree

Showing 49 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -20,7 +20,7 @@ jobs:
       run: cargo clippy --package obkrnl --target x86_64-unknown-none -- -D warnings
       working-directory: src
     - name: Run tests
-      run: cargo test --workspace --exclude core --exclude kernel
+      run: cargo test --workspace --exclude gui --exclude kernel
       working-directory: src
     - name: Add Flathub
       run: flatpak remote-add --user flathub https://flathub.org/repo/flathub.flatpakrepo

diff --git a/.github/workflows/ci-mac.yml b/.github/workflows/ci-mac.yml
@@ -80,7 +80,7 @@ jobs:
     - name: Build
       run: cmake --build --preset mac-release
     - name: Run tests
-      run: cargo test --workspace --exclude core --exclude kernel
+      run: cargo test --workspace --exclude gui --exclude kernel
       working-directory: src
     - name: Create Application Bundle
       run: |

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
@@ -71,7 +71,7 @@ jobs:
     - name: Build
       run: cmake --build --preset windows-release
     - name: Run tests
-      run: cargo test --workspace --exclude core --exclude kernel
+      run: cargo test --workspace --exclude gui --exclude kernel
       working-directory: src
     - name: Export artifacts
       run: cmake --install build --prefix dist

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,22 +41,22 @@ set(KERNEL ${KERNEL_OUTPUTS}/obkrnl)
 set(HOST_OUTPUTS $<IF:$<CONFIG:Debug>,${CMAKE_CURRENT_SOURCE_DIR}/target/debug,${CMAKE_CURRENT_SOURCE_DIR}/target/release>)
 
 if(WIN32)
-    set(LIBCORE ${HOST_OUTPUTS}/core.lib)
+    set(LIBGUI ${HOST_OUTPUTS}/gui.lib)
 else()
-    set(LIBCORE ${HOST_OUTPUTS}/libcore.a)
+    set(LIBGUI ${HOST_OUTPUTS}/libgui.a)
 endif()
 
-add_custom_target(core
+add_custom_target(libgui
     COMMAND cargo build $<IF:$<CONFIG:Debug>,--profile=dev,--release>
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/core
-    BYPRODUCTS ${LIBCORE})
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gui
+    BYPRODUCTS ${LIBGUI})
 
 add_custom_target(kernel
     COMMAND cargo ${KERNEL_TOOLCHAIN} build $<IF:$<CONFIG:Debug>,--profile=dev,--release> --target ${KERNEL_TARGET} ${KERNEL_OPTS}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/obkrnl
     BYPRODUCTS ${KERNEL})
 
-add_dependencies(core kernel)
+add_dependencies(libgui kernel)
 
 # Add GUI.
 add_subdirectory(src)
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
-    "src/core",
+    "gui",
     "src/fs",
     "src/gmtx",
     "src/kernel",

diff --git a/src/core/Cargo.toml → gui/Cargo.toml b/src/core/Cargo.toml → gui/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "core"
+name = "gui"
 version = "0.1.0"
 edition = "2021"
 
@@ -10,10 +10,10 @@ crate-type = ["staticlib"]
 bitfield-struct = "0.8.0"
 humansize = "2.1.3"
 libc = "0.2.155"
-obconf = { path = "../obconf", features = ["serde", "virt"] }
+obconf = { path = "../src/obconf", features = ["serde", "virt"] }
 obfw = { git = "https://github.com/obhq/firmware-dumper.git", features = ["read", "std"] }
-param = { path = "../param" }
-pkg = { path = "../pkg" }
+param = { path = "../src/param" }
+pkg = { path = "../src/pkg" }
 ciborium = "0.2.2"
 serde = { version = "1.0.209", features = ["derive"] }
 thiserror = "1.0"

diff --git a/src/core/build.rs → gui/build.rs b/src/core/build.rs → gui/build.rs
@@ -51,5 +51,5 @@ fn main() {
         .with_config(conf)
         .generate()
         .unwrap()
-        .write_to_file(root.join("core.h"));
+        .write_to_file(root.join("src").join("core.h"));
 }
diff --git a/src/core/src/error/mod.rs → gui/src/error/mod.rs b/src/core/src/error/mod.rs → gui/src/error/mod.rs
diff --git a/src/core/src/lib.rs → gui/src/lib.rs b/src/core/src/lib.rs → gui/src/lib.rs
diff --git a/src/core/src/param/mod.rs → gui/src/param/mod.rs b/src/core/src/param/mod.rs → gui/src/param/mod.rs
diff --git a/src/core/src/pkg/mod.rs → gui/src/pkg/mod.rs b/src/core/src/pkg/mod.rs → gui/src/pkg/mod.rs
diff --git a/src/core/src/profile/mod.rs → gui/src/profile/mod.rs b/src/core/src/profile/mod.rs → gui/src/profile/mod.rs
diff --git a/src/core/src/string/mod.rs → gui/src/string/mod.rs b/src/core/src/string/mod.rs → gui/src/string/mod.rs
diff --git a/src/core/src/system/mod.rs → gui/src/system/mod.rs b/src/core/src/system/mod.rs → gui/src/system/mod.rs
diff --git a/src/core/src/vmm/aarch64.rs → gui/src/vmm/aarch64.rs b/src/core/src/vmm/aarch64.rs → gui/src/vmm/aarch64.rs
diff --git a/src/core/src/vmm/hv/aarch64.rs → gui/src/vmm/hv/aarch64.rs b/src/core/src/vmm/hv/aarch64.rs → gui/src/vmm/hv/aarch64.rs
diff --git a/src/core/src/vmm/hv/linux/aarch64.rs → gui/src/vmm/hv/linux/aarch64.rs b/src/core/src/vmm/hv/linux/aarch64.rs → gui/src/vmm/hv/linux/aarch64.rs
diff --git a/src/core/src/vmm/hv/linux/cpu.rs → gui/src/vmm/hv/linux/cpu.rs b/src/core/src/vmm/hv/linux/cpu.rs → gui/src/vmm/hv/linux/cpu.rs
diff --git a/src/core/src/vmm/hv/linux/ffi.rs → gui/src/vmm/hv/linux/ffi.rs b/src/core/src/vmm/hv/linux/ffi.rs → gui/src/vmm/hv/linux/ffi.rs
diff --git a/src/core/src/vmm/hv/linux/mod.rs → gui/src/vmm/hv/linux/mod.rs b/src/core/src/vmm/hv/linux/mod.rs → gui/src/vmm/hv/linux/mod.rs
diff --git a/src/core/src/vmm/hv/linux/run.rs → gui/src/vmm/hv/linux/run.rs b/src/core/src/vmm/hv/linux/run.rs → gui/src/vmm/hv/linux/run.rs
diff --git a/src/core/src/vmm/hv/linux/x86_64.rs → gui/src/vmm/hv/linux/x86_64.rs b/src/core/src/vmm/hv/linux/x86_64.rs → gui/src/vmm/hv/linux/x86_64.rs
diff --git a/src/core/src/vmm/hv/macos/aarch64.rs → gui/src/vmm/hv/macos/aarch64.rs b/src/core/src/vmm/hv/macos/aarch64.rs → gui/src/vmm/hv/macos/aarch64.rs
diff --git a/src/core/src/vmm/hv/macos/cpu.rs → gui/src/vmm/hv/macos/cpu.rs b/src/core/src/vmm/hv/macos/cpu.rs → gui/src/vmm/hv/macos/cpu.rs
diff --git a/src/core/src/vmm/hv/macos/mod.rs → gui/src/vmm/hv/macos/mod.rs b/src/core/src/vmm/hv/macos/mod.rs → gui/src/vmm/hv/macos/mod.rs
diff --git a/src/core/src/vmm/hv/macos/x86_64.rs → gui/src/vmm/hv/macos/x86_64.rs b/src/core/src/vmm/hv/macos/x86_64.rs → gui/src/vmm/hv/macos/x86_64.rs
diff --git a/src/core/src/vmm/hv/mod.rs → gui/src/vmm/hv/mod.rs b/src/core/src/vmm/hv/mod.rs → gui/src/vmm/hv/mod.rs
diff --git a/src/core/src/vmm/hv/windows/cpu.rs → gui/src/vmm/hv/windows/cpu.rs b/src/core/src/vmm/hv/windows/cpu.rs → gui/src/vmm/hv/windows/cpu.rs
diff --git a/src/core/src/vmm/hv/windows/mod.rs → gui/src/vmm/hv/windows/mod.rs b/src/core/src/vmm/hv/windows/mod.rs → gui/src/vmm/hv/windows/mod.rs
diff --git a/src/core/src/vmm/hv/windows/partition.rs → gui/src/vmm/hv/windows/partition.rs b/src/core/src/vmm/hv/windows/partition.rs → gui/src/vmm/hv/windows/partition.rs
diff --git a/src/core/src/vmm/hv/x86_64.rs → gui/src/vmm/hv/x86_64.rs b/src/core/src/vmm/hv/x86_64.rs → gui/src/vmm/hv/x86_64.rs
diff --git a/src/core/src/vmm/hw/console/context.rs → gui/src/vmm/hw/console/context.rs b/src/core/src/vmm/hw/console/context.rs → gui/src/vmm/hw/console/context.rs
diff --git a/src/core/src/vmm/hw/console/mod.rs → gui/src/vmm/hw/console/mod.rs b/src/core/src/vmm/hw/console/mod.rs → gui/src/vmm/hw/console/mod.rs
diff --git a/src/core/src/vmm/hw/mod.rs → gui/src/vmm/hw/mod.rs b/src/core/src/vmm/hw/mod.rs → gui/src/vmm/hw/mod.rs
diff --git a/src/core/src/vmm/hw/vmm/context.rs → gui/src/vmm/hw/vmm/context.rs b/src/core/src/vmm/hw/vmm/context.rs → gui/src/vmm/hw/vmm/context.rs
diff --git a/src/core/src/vmm/hw/vmm/mod.rs → gui/src/vmm/hw/vmm/mod.rs b/src/core/src/vmm/hw/vmm/mod.rs → gui/src/vmm/hw/vmm/mod.rs
diff --git a/src/core/src/vmm/kernel/mod.rs → gui/src/vmm/kernel/mod.rs b/src/core/src/vmm/kernel/mod.rs → gui/src/vmm/kernel/mod.rs
diff --git a/src/core/src/vmm/kernel/segment.rs → gui/src/vmm/kernel/segment.rs b/src/core/src/vmm/kernel/segment.rs → gui/src/vmm/kernel/segment.rs
diff --git a/src/core/src/vmm/mod.rs → gui/src/vmm/mod.rs b/src/core/src/vmm/mod.rs → gui/src/vmm/mod.rs
diff --git a/src/core/src/vmm/ram/builder.rs → gui/src/vmm/ram/builder.rs b/src/core/src/vmm/ram/builder.rs → gui/src/vmm/ram/builder.rs
diff --git a/src/core/src/vmm/ram/mod.rs → gui/src/vmm/ram/mod.rs b/src/core/src/vmm/ram/mod.rs → gui/src/vmm/ram/mod.rs
diff --git a/src/core/src/vmm/screen/metal/buffer.rs → gui/src/vmm/screen/metal/buffer.rs b/src/core/src/vmm/screen/metal/buffer.rs → gui/src/vmm/screen/metal/buffer.rs
diff --git a/src/core/src/vmm/screen/metal/mod.rs → gui/src/vmm/screen/metal/mod.rs b/src/core/src/vmm/screen/metal/mod.rs → gui/src/vmm/screen/metal/mod.rs
diff --git a/src/core/src/vmm/screen/mod.rs → gui/src/vmm/screen/mod.rs b/src/core/src/vmm/screen/mod.rs → gui/src/vmm/screen/mod.rs
diff --git a/src/core/src/vmm/screen/vulkan/buffer.rs → gui/src/vmm/screen/vulkan/buffer.rs b/src/core/src/vmm/screen/vulkan/buffer.rs → gui/src/vmm/screen/vulkan/buffer.rs
diff --git a/src/core/src/vmm/screen/vulkan/ffi.rs → gui/src/vmm/screen/vulkan/ffi.rs b/src/core/src/vmm/screen/vulkan/ffi.rs → gui/src/vmm/screen/vulkan/ffi.rs
diff --git a/src/core/src/vmm/screen/vulkan/mod.rs → gui/src/vmm/screen/vulkan/mod.rs b/src/core/src/vmm/screen/vulkan/mod.rs → gui/src/vmm/screen/vulkan/mod.rs
diff --git a/src/core/src/vmm/x86_64.rs → gui/src/vmm/x86_64.rs b/src/core/src/vmm/x86_64.rs → gui/src/vmm/x86_64.rs
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -43,7 +43,7 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     target_sources(obliteration PRIVATE kvm.cpp vulkan.cpp)
 endif()
 
-add_dependencies(obliteration core)
+add_dependencies(obliteration libgui)
 
 set_target_properties(obliteration PROPERTIES AUTOMOC ON AUTORCC ON)
 
@@ -66,7 +66,7 @@ target_compile_features(obliteration PRIVATE cxx_std_17)
 
 target_link_libraries(obliteration PRIVATE Qt6::Svg Qt6::Widgets)
 target_link_libraries(obliteration PRIVATE Threads::Threads)
-target_link_libraries(obliteration PRIVATE ${LIBCORE})
+target_link_libraries(obliteration PRIVATE ${LIBGUI})
 
 if(WIN32)
     target_link_libraries(obliteration PRIVATE bcrypt imm32 ntdll setupapi userenv version winhvplatform winmm ws2_32)