Fix: Circular dependencies

Cargo.toml

@@ -33,9 +33,9 @@ members = [
 ]
 
 [workspace.package]
-version = "0.2.0"
+version = "0.2.2-preview.1"
 edition = "2024"
-authors = ["Yuekai Jia <equation618@gmail.com>"]
+authors = ["Yuekai Jia <equation618@gmail.com>", "Yu Chen <yuchen@tsinghua.edu.cn>"]
 license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0"
 homepage = "https://github.com/arceos-org/arceos"
 documentation = "https://arceos-org.github.io/arceos"
@@ -44,46 +44,46 @@ keywords = ["arceos", "kernel"]
 categories = ["os", "no-std"]
 
 [workspace.dependencies]
-axstd = { path = "ulib/axstd" }
-axlibc = { path = "ulib/axlibc" }
+axstd = { version = "0.2.2-preview.1", path = "ulib/axstd" }
+axlibc = { version = "0.2.2-preview.1", path = "ulib/axlibc" }
 
-arceos_api = { path = "api/arceos_api" }
-arceos_posix_api = { path = "api/arceos_posix_api" }
-axfeat = { path = "api/axfeat" }
+arceos_api = { version = "0.2.2-preview.1", path = "api/arceos_api" }
+arceos_posix_api = { version = "0.2.2-preview.1", path = "api/arceos_posix_api" }
+axfeat = { version = "0.2.2-preview.1", path = "api/axfeat" }
 
-axalloc = { path = "modules/axalloc" }
-axconfig = { path = "modules/axconfig" }
-axdisplay = { path = "modules/axdisplay" }
-axdma = { path = "modules/axdma" }
-axdriver = { path = "modules/axdriver" }
-axfs = { path = "modules/axfs" }
-axhal = { path = "modules/axhal" }
-axinput = { path = "modules/axinput" }
-axipi = { path = "modules/axipi" }
-axlog = { path = "modules/axlog" }
-axmm = { path = "modules/axmm" }
-axnet = { path = "modules/axnet" }
-axruntime = { path = "modules/axruntime" }
-axsync = { path = "modules/axsync" }
-axtask = { path = "modules/axtask" }
+axalloc = { version = "0.2.2-preview.1", path = "modules/axalloc" }
+axconfig = { version = "0.2.2-preview.1", path = "modules/axconfig" }
+axdisplay = { version = "0.2.2-preview.1", path = "modules/axdisplay" }
+axdma = { version = "0.2.2-preview.1", path = "modules/axdma" }
+axdriver = { version = "0.2.2-preview.1", path = "modules/axdriver" }
+axfs = { version = "0.2.2-preview.1", path = "modules/axfs" }
+axhal = { version = "0.2.2-preview.6", path = "modules/axhal" }
+axinput = { version = "0.2.2-preview.1", path = "modules/axinput" }
+axipi = { version = "0.2.2-preview.2", path = "modules/axipi" }
+axlog = { version = "0.2.2-preview.1", path = "modules/axlog" }
+axmm = { version = "0.2.2-preview.1", path = "modules/axmm" }
+axnet = { version = "0.2.2-preview.1", path = "modules/axnet" }
+axruntime = { version = "0.2.2-preview.2", path = "modules/axruntime" }
+axsync = { version = "0.2.2-preview.1", path = "modules/axsync" }
+axtask = { version = "0.2.2-preview.3", path = "modules/axtask" }
 
 allocator = { git = "https://github.com/arceos-org/allocator.git", tag = "v0.1.2", features = [
     "axerrno",
 ] }
 axbacktrace = "0.1"
-axdriver_base = { git = "https://github.com/arceos-org/axdriver_crates.git", tag = "v0.1.2-dev.0" }
-axdriver_block = { git = "https://github.com/arceos-org/axdriver_crates.git", tag = "v0.1.2-dev.0" }
-axdriver_display = { git = "https://github.com/arceos-org/axdriver_crates.git", tag = "v0.1.2-dev.0" }
-axdriver_input = { git = "https://github.com/arceos-org/axdriver_crates.git", tag = "v0.1.2-dev.0" }
-axdriver_net = { git = "https://github.com/arceos-org/axdriver_crates.git", tag = "v0.1.2-dev.0" }
-axdriver_pci = { git = "https://github.com/arceos-org/axdriver_crates.git", tag = "v0.1.2-dev.0" }
-axdriver_virtio = { git = "https://github.com/arceos-org/axdriver_crates.git", tag = "v0.1.2-dev.0" }
-axdriver_vsock = { git = "https://github.com/arceos-org/axdriver_crates.git", tag = "v0.1.2-dev.0" }
+axdriver_base = "0.1.4-preview.3"
+axdriver_block = "0.1.4-preview.3"
+axdriver_display = "0.1.4-preview.3"
+axdriver_input = "0.1.4-preview.3"
+axdriver_net = "0.1.4-preview.3"
+axdriver_pci = "0.1.4-preview.3"
+axdriver_virtio = "0.1.4-preview.3"
+axdriver_vsock = "0.1.4-preview.3"
 axerrno = "0.2"
 axfs-ng-vfs = "0.1"
 axio = "0.3.0-pre.1"
 axklib = { git = "https://github.com/arceos-hypervisor/axklib.git" } # FIXME: pin to a specific commit or tag
-axplat = { git = "https://github.com/arceos-org/axplat_crates.git", tag = "dev-v03" }
+axplat = ">=0.3.0-preview.2, <0.3.0"
 axplat-aarch64-bsta1000b = { git = "https://github.com/arceos-org/axplat_crates.git", tag = "dev-v03" }
 axplat-aarch64-phytium-pi = { git = "https://github.com/arceos-org/axplat_crates.git", tag = "dev-v03" }
 axplat-aarch64-qemu-virt = { git = "https://github.com/arceos-org/axplat_crates.git", tag = "dev-v03" }
@@ -106,9 +106,21 @@ lazy_static = { version = "1.5", features = ["spin_no_std"] }
 lock_api = { version = "0.4", default-features = false }
 log = "0.4"
 memory_addr = "0.4"
-page_table_multiarch = { git = "https://github.com/arceos-org/page_table_multiarch.git", tag = "dev-v05", features = [
+page_table_multiarch = { version = "0.5", features = [
     "axerrno",
 ] }
 percpu = "0.2"
 scope-local = "0.1"
 spin = "0.10"
+
+# Local build: use path/git so make run works when axhal (and deps) use version for publish
+[patch.crates-io]
+axalloc = { path = "modules/axalloc" }
+axconfig = { path = "modules/axconfig" }
+axdma = { path = "modules/axdma" }
+axhal = { path = "modules/axhal" }
+axtask = { path = "modules/axtask" }
+axsync = { path = "modules/axsync" }
+axipi = { path = "modules/axipi" }
+# External path deps removed for publishing - use crates.io versions
+# axcpu, axplat, axplat-* already published on crates.io

api/arceos_api/Cargo.toml

@@ -18,7 +18,7 @@ alloc = ["dep:axalloc", "axfeat/alloc"]
 paging = ["dep:axmm", "axfeat/paging"]
 dma = ["dep:axdma", "axfeat/dma"]
 multitask = ["axtask/multitask", "axsync/multitask", "axfeat/multitask"]
-fs = ["dep:axfs", "dep:axdriver", "axfeat/fs"]
+fs = ["dep:axfs", "dep:axdriver", "axfeat/fs", "axmm?/fs"]
 net = ["dep:axnet", "dep:axdriver", "axfeat/net"]
 display = ["dep:axdisplay", "dep:axdriver", "axfeat/display"]
 

api/arceos_posix_api/.gitignore

@@ -1 +0,0 @@
-ctypes_gen.rs

api/arceos_posix_api/build.rs

@@ -109,6 +109,22 @@ typedef struct {{
             .expect("Couldn't write bindings!");
     }
 
-    gen_pthread_mutex("../../ulib/axlibc/include/ax_pthread_mutex.h").unwrap();
-    gen_c_to_rust_bindings("ctypes.h", "src/ctypes_gen.rs");
+    let axlibc_include = std::path::Path::new("../../ulib/axlibc/include");
+    if axlibc_include.exists() {
+        gen_pthread_mutex(
+            axlibc_include
+                .join("ax_pthread_mutex.h")
+                .to_str()
+                .unwrap(),
+        )
+        .unwrap();
+        gen_c_to_rust_bindings("ctypes.h", "src/ctypes_gen.rs");
+    } else {
+        // During `cargo publish` verification, the external headers are not
+        // available. Use the pre-generated ctypes_gen.rs shipped in the crate.
+        eprintln!(
+            "cargo:warning=axlibc include directory not found, \
+             skipping ctypes_gen.rs regeneration"
+        );
+    }
 }