From 2419fe11780af5f583fb3dbe4dcd65dcc2f89b8b Mon Sep 17 00:00:00 2001 From: Asakura Mizu Date: Sun, 6 Apr 2025 21:03:14 +0800 Subject: [PATCH 1/2] chore: ignore files --- .gitignore | 3 ++- apps/oscomp/.gitignore | 2 ++ apps/oscomp/testcase_list | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 apps/oscomp/.gitignore delete mode 100644 apps/oscomp/testcase_list diff --git a/.gitignore b/.gitignore index 26a0b42b9..a36b30a8e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ apps/*/build/ **/target/ **/Cargo.lock !/vendor/**/Cargo.lock -/.axconfig.* \ No newline at end of file +/.axconfig.* +*.img \ No newline at end of file diff --git a/apps/oscomp/.gitignore b/apps/oscomp/.gitignore new file mode 100644 index 000000000..5717566f1 --- /dev/null +++ b/apps/oscomp/.gitignore @@ -0,0 +1,2 @@ +testcase_list +*.out \ No newline at end of file diff --git a/apps/oscomp/testcase_list b/apps/oscomp/testcase_list deleted file mode 100644 index 69c64b232..000000000 --- a/apps/oscomp/testcase_list +++ /dev/null @@ -1 +0,0 @@ -/musl/basic/waitpid \ No newline at end of file From 520eacba36377a73ef8b8ac98a9df268d0c9e507 Mon Sep 17 00:00:00 2001 From: Asakura Mizu Date: Sun, 6 Apr 2025 21:16:37 +0800 Subject: [PATCH 2/2] doc: how to set AX_CONFIG_PATH --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index fd540233a..12ca2b957 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,17 @@ make ARCH=x86_64 LOG=info AX_TESTCASE=nimbos run Note: Arguments like `NET`, `BLK`, and `GRAPHIC` enable devices in QEMU, which take effect only at runtime, not at build time. More features can be found in the [Cargo.toml of arceos](https://github.com/oscomp/arceos/blob/main/ulib/axstd/Cargo.toml). +#### Development with Visual Studio Code + +Since ArceOS relies on special build scripts and some environment variables, this usually causes `rust-analyzer` to prompt some annoying errors. You may want to put the following configuration into `.vscode/settings.json` (ie workspace settings): +```json +{ + "rust-analyzer.cargo.extraEnv": { + "AX_CONFIG_PATH": "${workspaceFolder}/.axconfig.toml" + } +} +``` + ## Test for oscomp testcases We can run [testcases of the OS competition](https://github.com/oscomp/testsuits-for-oskernel/tree/pre-2025) with StarryOS. Guidence can be found in [Starry-Tutorial](https://azure-stars.github.io/Starry-Tutorial-Book/ch03-02.html).