From bbb5fc14b707915cf7e4cac7ac85dd0b893ef21a Mon Sep 17 00:00:00 2001 From: Putta Khunchalee Date: Mon, 4 Nov 2024 03:41:45 +0700 Subject: [PATCH] Removes .obliteration-development (#1085) --- .obliteration-development | 1 - .vscode/launch.json | 32 ++++++-------------------------- .vscode/tasks.json | 4 +++- cmake/cargo.cmake | 11 +++++++---- gui/main.cpp | 1 + gui/main_window.cpp | 22 +++------------------- gui/main_window.hpp | 1 + 7 files changed, 21 insertions(+), 51 deletions(-) delete mode 100644 .obliteration-development diff --git a/.obliteration-development b/.obliteration-development deleted file mode 100644 index 6615b9a8..00000000 --- a/.obliteration-development +++ /dev/null @@ -1 +0,0 @@ -This file used for detection of development binary in src/main_window.cpp. diff --git a/.vscode/launch.json b/.vscode/launch.json index a3e8bc65..ab6425d1 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,7 +4,10 @@ "name": "GUI", "type": "lldb", "request": "launch", - "args": [], + "args": [ + "--kernel", + "${workspaceFolder}/build/obkrnl" + ], "cwd": "${workspaceFolder}", "windows": { "program": "${workspaceFolder}/build/gui/Obliteration.exe", @@ -25,35 +28,12 @@ "request": "custom", "preLaunchTask": "Launch VMM (Debug)", "targetCreateCommands": [ - "target create ${workspaceFolder}/target/x86_64-unknown-none/debug/obkrnl" + "target create ${workspaceFolder}/build/obkrnl", + "target modules load --file ${workspaceFolder}/build/obkrnl -s 0xffffffff82200000" ], - "osx": { - "targetCreateCommands": [ - "target create ${workspaceFolder}/target/aarch64-unknown-none-softfloat/debug/obkrnl" - ] - }, "processCreateCommands": [ "gdb-remote 1234" ] - }, - { - "name": "Legacy Kernel", - "type": "lldb", - "request": "launch", - "cargo": { - "args": [ - "build", - "--manifest-path", - "${workspaceFolder}/src/kernel/Cargo.toml" - ], - "filter": { - "kind": "bin" - } - }, - "args": [ - "--debug" - ], - "cwd": "${workspaceFolder}" } ], "version": "2.0.0" diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 9dfa1048..04e17b68 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -25,7 +25,9 @@ }, "args": [ "--debug", - "127.0.0.1:1234" + "127.0.0.1:1234", + "--kernel", + "${workspaceFolder}/build/obkrnl" ] } ] diff --git a/cmake/cargo.cmake b/cmake/cargo.cmake index cd321483..685f0967 100644 --- a/cmake/cargo.cmake +++ b/cmake/cargo.cmake @@ -144,7 +144,7 @@ function(add_crate crate) set(release_outputs "${outputs}/${triple}/release") if(${target_os} STREQUAL "windows") - set(bin_ext ".exe") + set(bin_suffix ".exe") endif() # Setup build arguments. @@ -189,8 +189,8 @@ function(add_crate crate) continue() elseif(${kind} STREQUAL "bin") add_executable(${crate} IMPORTED) - set(debug_artifact "${debug_outputs}/${crate}${bin_ext}") - set(release_artifact "${release_outputs}/${crate}${bin_ext}") + set(debug_artifact "${debug_outputs}/${crate}${bin_suffix}") + set(release_artifact "${release_outputs}/${crate}${bin_suffix}") else() message(FATAL_ERROR "${kind} crate is not supported") endif() @@ -206,9 +206,12 @@ function(add_crate crate) IMPORTED_LOCATION_RELEASE ${release_artifact}) # Add build target. + set(output "$,${debug_artifact},${release_artifact}>") + add_custom_target(${build_target} COMMAND cargo ${build_args} + COMMAND ${CMAKE_COMMAND} -E copy -t ${CMAKE_CURRENT_BINARY_DIR} ${output} WORKING_DIRECTORY ${working_directory} - BYPRODUCTS $,${debug_artifact},${release_artifact}>) + BYPRODUCTS ${output}) endforeach() endfunction() diff --git a/gui/main.cpp b/gui/main.cpp index 72c74169..3cef4fd7 100644 --- a/gui/main.cpp +++ b/gui/main.cpp @@ -64,6 +64,7 @@ int main(int argc, char *argv[]) args.setApplicationDescription("Virtualization stack for Obliteration"); args.addHelpOption(); args.addOption(Args::debug); + args.addOption(Args::kernel); args.process(app); // Hook Rust panic. diff --git a/gui/main_window.cpp b/gui/main_window.cpp index 467da4d4..55c9c2f2 100644 --- a/gui/main_window.cpp +++ b/gui/main_window.cpp @@ -43,6 +43,7 @@ namespace Args { const QCommandLineOption debug("debug", "Immediate launch the VMM in debug mode.", "addr", "127.0.0.1:1234"); + const QCommandLineOption kernel("kernel", "Use this kernel instead of default one.", "path"); } #ifdef __APPLE__ @@ -642,25 +643,8 @@ void MainWindow::startVmm(Rust &&debug) m_debugServer.free(); - if (QFile::exists(".obliteration-development")) { - auto b = std::filesystem::current_path(); -#ifdef _WIN32 - auto target = L"x86_64-unknown-none"; -#elif defined(__aarch64__) - auto target = "aarch64-unknown-none-softfloat"; -#else - auto target = "x86_64-unknown-none"; -#endif - -#if defined(_WIN32) && defined(NDEBUG) - kernel = (b / L"target" / target / L"release" / L"obkrnl").u8string(); -#elif defined(_WIN32) && !defined(NDEBUG) - kernel = (b / L"target" / target / L"debug" / L"obkrnl").u8string(); -#elif defined(NDEBUG) - kernel = (b / "target" / target / "release" / "obkrnl").u8string(); -#else - kernel = (b / "target" / target / "debug" / "obkrnl").u8string(); -#endif + if (m_args.isSet(Args::kernel)) { + kernel = m_args.value(Args::kernel).toStdString(); } else { #ifdef _WIN32 std::filesystem::path b(QCoreApplication::applicationDirPath().toStdString(), std::filesystem::path::native_format); diff --git a/gui/main_window.hpp b/gui/main_window.hpp index 03d9e314..b4f983b0 100644 --- a/gui/main_window.hpp +++ b/gui/main_window.hpp @@ -74,4 +74,5 @@ private: namespace Args { extern const QCommandLineOption debug; + extern const QCommandLineOption kernel; }