Change path of rust apps, add workspace manifest

arceos-org · Jul 19, 2024 · 1b98f5a · 1b98f5a
1 parent b797afa
commit 1b98f5a
Show file tree

Hide file tree

Showing 67 changed files with 28 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/Cargo.toml b/Cargo.toml
@@ -0,0 +1,24 @@
+[workspace]
+resolver = "2"
+
+members = [
+    "rust/helloworld",
+    "rust/memtest",
+    "rust/exception",
+    "rust/display",
+    "rust/fs/shell",
+    "rust/net/echoserver",
+    "rust/net/httpclient",
+    "rust/net/httpserver",
+    "rust/net/udpserver",
+    "rust/net/bwbench",
+    "rust/task/parallel",
+    "rust/task/sleep",
+    "rust/task/yield",
+    "rust/task/priority",
+    "rust/task/tls",
+]
+
+[workspace.dependencies]
+axstd = { git = "https://github.com/arceos-org/arceos.git" }
+axnet = { git = "https://github.com/arceos-org/arceos.git" }
diff --git a/README.md b/README.md
@@ -0,0 +1,3 @@
+# arceos-apps
+
+Example apps for [ArceOS](https://github.com/arceos-org/arceos).
diff --git a/display/Cargo.toml → rust/display/Cargo.toml b/display/Cargo.toml → rust/display/Cargo.toml
diff --git a/display/src/display.rs → rust/display/src/display.rs b/display/src/display.rs → rust/display/src/display.rs
diff --git a/display/src/main.rs → rust/display/src/main.rs b/display/src/main.rs → rust/display/src/main.rs
diff --git a/exception/Cargo.toml → rust/exception/Cargo.toml b/exception/Cargo.toml → rust/exception/Cargo.toml
diff --git a/exception/expect_debug_aarch64.out → rust/exception/expect_debug_aarch64.out b/exception/expect_debug_aarch64.out → rust/exception/expect_debug_aarch64.out
diff --git a/exception/expect_debug_riscv64.out → rust/exception/expect_debug_riscv64.out b/exception/expect_debug_riscv64.out → rust/exception/expect_debug_riscv64.out
diff --git a/exception/expect_debug_x86_64.out → rust/exception/expect_debug_x86_64.out b/exception/expect_debug_x86_64.out → rust/exception/expect_debug_x86_64.out
diff --git a/exception/src/main.rs → rust/exception/src/main.rs b/exception/src/main.rs → rust/exception/src/main.rs
diff --git a/exception/test_cmd → rust/exception/test_cmd b/exception/test_cmd → rust/exception/test_cmd
diff --git a/fs/shell/Cargo.toml → rust/fs/shell/Cargo.toml b/fs/shell/Cargo.toml → rust/fs/shell/Cargo.toml
diff --git a/fs/shell/src/cmd.rs → rust/fs/shell/src/cmd.rs b/fs/shell/src/cmd.rs → rust/fs/shell/src/cmd.rs
diff --git a/fs/shell/src/main.rs → rust/fs/shell/src/main.rs b/fs/shell/src/main.rs → rust/fs/shell/src/main.rs
diff --git a/fs/shell/src/ramfs.rs → rust/fs/shell/src/ramfs.rs b/fs/shell/src/ramfs.rs → rust/fs/shell/src/ramfs.rs
diff --git a/helloworld/Cargo.toml → rust/helloworld/Cargo.toml b/helloworld/Cargo.toml → rust/helloworld/Cargo.toml
diff --git a/helloworld/expect_info.out → rust/helloworld/expect_info.out b/helloworld/expect_info.out → rust/helloworld/expect_info.out
diff --git a/helloworld/expect_info_smp4.out → rust/helloworld/expect_info_smp4.out b/helloworld/expect_info_smp4.out → rust/helloworld/expect_info_smp4.out
diff --git a/helloworld/src/main.rs → rust/helloworld/src/main.rs b/helloworld/src/main.rs → rust/helloworld/src/main.rs
diff --git a/helloworld/test_cmd → rust/helloworld/test_cmd b/helloworld/test_cmd → rust/helloworld/test_cmd
diff --git a/memtest/Cargo.toml → rust/memtest/Cargo.toml b/memtest/Cargo.toml → rust/memtest/Cargo.toml
diff --git a/memtest/expect_trace.out → rust/memtest/expect_trace.out b/memtest/expect_trace.out → rust/memtest/expect_trace.out
diff --git a/memtest/src/main.rs → rust/memtest/src/main.rs b/memtest/src/main.rs → rust/memtest/src/main.rs
diff --git a/memtest/test_cmd → rust/memtest/test_cmd b/memtest/test_cmd → rust/memtest/test_cmd
diff --git a/net/bwbench/Cargo.toml → rust/net/bwbench/Cargo.toml b/net/bwbench/Cargo.toml → rust/net/bwbench/Cargo.toml
@@ -8,4 +8,4 @@ authors = ["ChengXiang Qi <kuangjux@outlook.com>"]
 
 [dependencies]
 axstd = { workspace = true, features = ["net"] }
-axnet = { path = "../../../modules/axnet" }
+axnet = { workspace = true }
diff --git a/net/bwbench/src/main.rs → rust/net/bwbench/src/main.rs b/net/bwbench/src/main.rs → rust/net/bwbench/src/main.rs
diff --git a/net/echoserver/Cargo.toml → rust/net/echoserver/Cargo.toml b/net/echoserver/Cargo.toml → rust/net/echoserver/Cargo.toml
diff --git a/net/echoserver/src/main.rs → rust/net/echoserver/src/main.rs b/net/echoserver/src/main.rs → rust/net/echoserver/src/main.rs
diff --git a/net/httpclient/Cargo.toml → rust/net/httpclient/Cargo.toml b/net/httpclient/Cargo.toml → rust/net/httpclient/Cargo.toml
diff --git a/net/httpclient/expect_info.out → rust/net/httpclient/expect_info.out b/net/httpclient/expect_info.out → rust/net/httpclient/expect_info.out
diff --git a/net/httpclient/expect_info_dns.out → rust/net/httpclient/expect_info_dns.out b/net/httpclient/expect_info_dns.out → rust/net/httpclient/expect_info_dns.out
diff --git a/net/httpclient/src/main.rs → rust/net/httpclient/src/main.rs b/net/httpclient/src/main.rs → rust/net/httpclient/src/main.rs
diff --git a/net/httpclient/test_cmd → rust/net/httpclient/test_cmd b/net/httpclient/test_cmd → rust/net/httpclient/test_cmd
diff --git a/net/httpserver/Cargo.toml → rust/net/httpserver/Cargo.toml b/net/httpserver/Cargo.toml → rust/net/httpserver/Cargo.toml
diff --git a/net/httpserver/src/main.rs → rust/net/httpserver/src/main.rs b/net/httpserver/src/main.rs → rust/net/httpserver/src/main.rs
diff --git a/net/udpserver/Cargo.toml → rust/net/udpserver/Cargo.toml b/net/udpserver/Cargo.toml → rust/net/udpserver/Cargo.toml
diff --git a/net/udpserver/src/main.rs → rust/net/udpserver/src/main.rs b/net/udpserver/src/main.rs → rust/net/udpserver/src/main.rs
diff --git a/task/parallel/Cargo.toml → rust/task/parallel/Cargo.toml b/task/parallel/Cargo.toml → rust/task/parallel/Cargo.toml
diff --git a/task/parallel/expect_info_smp1_fifo.out → rust/task/parallel/expect_info_smp1_fifo.out b/task/parallel/expect_info_smp1_fifo.out → rust/task/parallel/expect_info_smp1_fifo.out
diff --git a/task/parallel/expect_info_smp4_cfs.out → rust/task/parallel/expect_info_smp4_cfs.out b/task/parallel/expect_info_smp4_cfs.out → rust/task/parallel/expect_info_smp4_cfs.out
diff --git a/task/parallel/expect_info_smp4_rr.out → rust/task/parallel/expect_info_smp4_rr.out b/task/parallel/expect_info_smp4_rr.out → rust/task/parallel/expect_info_smp4_rr.out
diff --git a/task/parallel/src/main.rs → rust/task/parallel/src/main.rs b/task/parallel/src/main.rs → rust/task/parallel/src/main.rs
diff --git a/task/parallel/test_cmd → rust/task/parallel/test_cmd b/task/parallel/test_cmd → rust/task/parallel/test_cmd
diff --git a/task/priority/Cargo.toml → rust/task/priority/Cargo.toml b/task/priority/Cargo.toml → rust/task/priority/Cargo.toml
diff --git a/task/priority/expect_info_smp1_cfs.out → rust/task/priority/expect_info_smp1_cfs.out b/task/priority/expect_info_smp1_cfs.out → rust/task/priority/expect_info_smp1_cfs.out
diff --git a/task/priority/expect_info_smp1_fifo.out → rust/task/priority/expect_info_smp1_fifo.out b/task/priority/expect_info_smp1_fifo.out → rust/task/priority/expect_info_smp1_fifo.out
diff --git a/task/priority/expect_info_smp1_rr.out → rust/task/priority/expect_info_smp1_rr.out b/task/priority/expect_info_smp1_rr.out → rust/task/priority/expect_info_smp1_rr.out
diff --git a/task/priority/expect_info_smp4_cfs.out → rust/task/priority/expect_info_smp4_cfs.out b/task/priority/expect_info_smp4_cfs.out → rust/task/priority/expect_info_smp4_cfs.out
diff --git a/task/priority/src/main.rs → rust/task/priority/src/main.rs b/task/priority/src/main.rs → rust/task/priority/src/main.rs
diff --git a/task/priority/test_cmd → rust/task/priority/test_cmd b/task/priority/test_cmd → rust/task/priority/test_cmd
diff --git a/task/sleep/Cargo.toml → rust/task/sleep/Cargo.toml b/task/sleep/Cargo.toml → rust/task/sleep/Cargo.toml
diff --git a/task/sleep/expect_info_smp4_fifo.out → rust/task/sleep/expect_info_smp4_fifo.out b/task/sleep/expect_info_smp4_fifo.out → rust/task/sleep/expect_info_smp4_fifo.out
diff --git a/task/sleep/expect_info_smp4_rr.out → rust/task/sleep/expect_info_smp4_rr.out b/task/sleep/expect_info_smp4_rr.out → rust/task/sleep/expect_info_smp4_rr.out
diff --git a/task/sleep/src/main.rs → rust/task/sleep/src/main.rs b/task/sleep/src/main.rs → rust/task/sleep/src/main.rs
diff --git a/task/sleep/test_cmd → rust/task/sleep/test_cmd b/task/sleep/test_cmd → rust/task/sleep/test_cmd
diff --git a/task/tls/Cargo.toml → rust/task/tls/Cargo.toml b/task/tls/Cargo.toml → rust/task/tls/Cargo.toml
diff --git a/task/tls/expect_info_smp1_fifo.out → rust/task/tls/expect_info_smp1_fifo.out b/task/tls/expect_info_smp1_fifo.out → rust/task/tls/expect_info_smp1_fifo.out
diff --git a/task/tls/expect_info_smp4_rr.out → rust/task/tls/expect_info_smp4_rr.out b/task/tls/expect_info_smp4_rr.out → rust/task/tls/expect_info_smp4_rr.out
diff --git a/task/tls/src/main.rs → rust/task/tls/src/main.rs b/task/tls/src/main.rs → rust/task/tls/src/main.rs
diff --git a/task/tls/test_cmd → rust/task/tls/test_cmd b/task/tls/test_cmd → rust/task/tls/test_cmd
diff --git a/task/yield/Cargo.toml → rust/task/yield/Cargo.toml b/task/yield/Cargo.toml → rust/task/yield/Cargo.toml
diff --git a/task/yield/expect_debug_smp1_fifo.out → rust/task/yield/expect_debug_smp1_fifo.out b/task/yield/expect_debug_smp1_fifo.out → rust/task/yield/expect_debug_smp1_fifo.out
diff --git a/task/yield/expect_info_smp4_fifo.out → rust/task/yield/expect_info_smp4_fifo.out b/task/yield/expect_info_smp4_fifo.out → rust/task/yield/expect_info_smp4_fifo.out
diff --git a/task/yield/expect_info_smp4_rr.out → rust/task/yield/expect_info_smp4_rr.out b/task/yield/expect_info_smp4_rr.out → rust/task/yield/expect_info_smp4_rr.out
diff --git a/task/yield/src/main.rs → rust/task/yield/src/main.rs b/task/yield/src/main.rs → rust/task/yield/src/main.rs
diff --git a/task/yield/test_cmd → rust/task/yield/test_cmd b/task/yield/test_cmd → rust/task/yield/test_cmd