Refactor build and run modules for improved structure and clarity

.github/workflows/ci.yml

@@ -24,8 +24,10 @@ jobs:
         targets: ${{ matrix.targets }}
     - uses: Swatinem/rust-cache@v2
     - name: Install qemu
-      run: sudo apt install qemu-system-aarch64 -y
-    - run: sudo apt install u-boot-tools -y
+      run: |
+        sudo apt-get update
+        sudo apt install qemu-system-aarch64 -y
+        sudo apt install u-boot-tools -y
     - name: Install lib libudev-dev
       run: sudo apt install libudev-dev -y
     - name: Check rust version

jkconfig/tests/schema.rs

@@ -63,7 +63,7 @@ fn test_object() {
 
 #[test]
 fn test_value() {
-    env_logger::builder().is_test(true).init();
+    let _ = env_logger::builder().is_test(true).try_init();
 
     let schema = schema_for!(AnimalObject);
 

ostool/Cargo.toml

@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
 name = "ostool"
 readme = "../README.md"
 repository = "https://github.com/ZR233/ostool"
-version = "0.8.3"
+version = "0.8.4"
 
 [[bin]]
 name = "ostool"

ostool/src/bin/cargo-osrun.rs

@@ -3,7 +3,7 @@ use std::{env, path::PathBuf, process::exit};
 use clap::{Parser, Subcommand};
 use log::{LevelFilter, debug};
 use ostool::{
-    ctx::AppContext,
+    ctx::{AppContext, OutputConfig, PathConfig},
     run::{
         qemu,
         uboot::{self, RunUbootArgs},
@@ -53,6 +53,12 @@ struct RunnerArgs {
     #[arg(allow_hyphen_values = true)]
     /// Arguments to be run
     runner_args: Vec<String>,
+
+    #[arg(long)]
+    build_dir: Option<String>,
+
+    #[arg(long)]
+    bin_dir: Option<String>,
 }
 
 #[derive(Debug, Subcommand, Clone)]
@@ -90,9 +96,18 @@ async fn main() -> anyhow::Result<()> {
         Err(_) => manifest_dir.clone(),
     };
 
+    let bin_dir: Option<PathBuf> = args.bin_dir.map(PathBuf::from);
+    let build_dir: Option<PathBuf> = args.build_dir.map(PathBuf::from);
+
+    let output_config = OutputConfig { build_dir, bin_dir };
+
     let mut app = AppContext {
-        workspace_folder,
-        manifest_dir,
+        paths: PathConfig {
+            workspace: workspace_folder,
+            manifest: manifest_dir,
+            config: output_config,
+            ..Default::default()
+        },
         ..Default::default()
     };