Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-24 09:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix local development version OSDK's out-tree behavior

Browse Source
This commit is contained in:
Zhang Junyang
2024-08-25 19:30:39 +08:00
committed by Tate, Hongliang Tian
parent 54cbacb2ff
commit d91573248c
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osdk/src/base_crate/mod.rs
View File

@ -131,14 +131,22 @@ fn add_manifest_dependency(
if link_unit_test_runner { if link_unit_test_runner {
let dep_str = match option_env!("OSDK_LOCAL_DEV") { let dep_str = match option_env!("OSDK_LOCAL_DEV") {
Some("1") => "osdk-test-kernel = { path = \"../../../osdk/test-kernel\" }", Some("1") => {
let crate_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
let test_kernel_dir = crate_dir.join("test-kernel");
format!(
"osdk-test-kernel = {{ path = \"{}\" }}",
test_kernel_dir.display()
)
}
_ => concat!( _ => concat!(
"osdk-test-kernel = { version = \"", "osdk-test-kernel = { version = \"",
env!("CARGO_PKG_VERSION"), env!("CARGO_PKG_VERSION"),
"\" }" "\" }"
), )
.to_owned(),
}; };
let test_runner_dep = toml::Table::from_str(dep_str).unwrap(); let test_runner_dep = toml::Table::from_str(&dep_str).unwrap();
dependencies.as_table_mut().unwrap().extend(test_runner_dep); dependencies.as_table_mut().unwrap().extend(test_runner_dep);
} }

5
osdk/src/commands/build/bin.rs
View File

@ -172,8 +172,9 @@ fn install_setup_with_arch(
cmd.arg("--force"); cmd.arg("--force");
cmd.arg("--root").arg(install_dir.as_ref()); cmd.arg("--root").arg(install_dir.as_ref());
if matches!(option_env!("OSDK_LOCAL_DEV"), Some("1")) { if matches!(option_env!("OSDK_LOCAL_DEV"), Some("1")) {
cmd.arg("--path") let crate_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
.arg("../../../ostd/libs/linux-bzimage/setup"); let setup_dir = crate_dir.join("../ostd/libs/linux-bzimage/setup");
cmd.arg("--path").arg(setup_dir);
} }
// Remember to upgrade this version if new version of linux-bzimage-setup is released. // Remember to upgrade this version if new version of linux-bzimage-setup is released.
const LINUX_BZIMAGE_SETUP_VERSION: &str = "0.1.0"; const LINUX_BZIMAGE_SETUP_VERSION: &str = "0.1.0";