Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-27 03:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Overhaul OSDK

Browse Source
This commit is contained in:
Zhang Junyang
2024-03-22 13:50:45 +08:00
committed by Tate, Hongliang Tian
parent 735d7b7b11
commit 33c53dcf2b
40 changed files with 995 additions and 1208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osdk/src/commands/run.rs
View File

@ -28,7 +28,7 @@ pub fn execute_run_command(config: &RunConfig) {
let existing_bundle = Bundle::load(&default_bundle_directory);
let config = RunConfig {
manifest: {
settings: {
if config.gdb_server_args.is_gdb_enabled {
let qemu_gdb_args: Vec<_> = {
let gdb_stub_addr = config.gdb_server_args.gdb_server_addr.as_str();
@ -55,14 +55,14 @@ pub fn execute_run_command(config: &RunConfig) {
let qemu_gdb_args: Vec<_> = qemu_gdb_args
.into_iter()
.filter(|arg| !config.manifest.qemu.args.iter().any(|x| x == arg))
.filter(|arg| !config.settings.qemu_args.iter().any(|x| x == arg))
.map(|x| x.to_string())
.collect();
let mut manifest = config.manifest.clone();
manifest.qemu.args.extend(qemu_gdb_args);
manifest
let mut settings = config.settings.clone();
settings.qemu_args.extend(qemu_gdb_args);
settings
} else {
config.manifest.clone()
config.settings.clone()
}
},
..config.clone()
@ -95,8 +95,8 @@ pub fn execute_run_command(config: &RunConfig) {
}
let required_build_config = BuildConfig {
arch: config.arch.clone(),
manifest: config.manifest.clone(),
arch: config.arch,
settings: config.settings.clone(),
cargo_args: config.cargo_args.clone(),
};