diff --git a/Cargo.lock b/Cargo.lock index ac0b2c4..4d9725d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -142,9 +142,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.4.11" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" dependencies = [ "clap_builder", "clap_derive", @@ -152,9 +152,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -164,9 +164,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ "heck", "proc-macro2", @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" @@ -1007,7 +1007,7 @@ dependencies = [ [[package]] name = "ruxgo" -version = "0.9.0" +version = "0.9.1" dependencies = [ "bytes", "clap", @@ -1185,9 +1185,9 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "syn" diff --git a/Cargo.toml b/Cargo.toml index c9aece0..35ff5b0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ruxgo" -version = "0.9.0" +version = "0.9.1" edition = "2021" authors = ["Zewei Yang "] description = "A Cargo-like build tool for building C and C++ applications" @@ -8,7 +8,7 @@ license = "Apache-2.0" homepage = "https://github.com/syswonder/ruxgo" repository = "https://github.com/syswonder/ruxgo" documentation = "https://ruxgo.syswonder.org/" -keywords = ["toml", "build-tool", "rust", "c++", "c"] +keywords = ["build-tool", "apps", "c++", "c", "toml"] [dependencies] toml = "0.7.2" @@ -17,7 +17,7 @@ itertools="0.10.5" sha1 = "0.10.6" rayon = "1.7.0" indicatif = "0.17.3" -clap = { version = "4.4.11", features = ["derive"] } +clap = { version = "4.5.2", features = ["derive"] } directories = "5.0.1" serde = { version = "1.0.190", features = ["derive"] } serde_json = "1.0" diff --git a/README.md b/README.md index 60b2f5f..7c17e89 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,12 @@ To build the `ruxgo` executable from source, you will first need to install Rust Once you have installed Rust, the following command can be used to build and install Ruxgo: +```sh +cargo install ruxgo +``` + +The version published to [crates.io](https://crates.io/) will ever so slightly be behind the version hosted on GitHub. If you need the latest version you can build the git version of ruxgo yourself. + ```sh cargo install --git https://github.com/syswonder/ruxgo.git ruxgo ``` diff --git a/apps/redis/ruxos/config_linux_pkg.toml b/apps/redis/ruxos/config_linux_pkg.toml deleted file mode 100644 index c00c3d8..0000000 --- a/apps/redis/ruxos/config_linux_pkg.toml +++ /dev/null @@ -1,36 +0,0 @@ -[build] -compiler = "gcc" -packages = ["Ybeichen/redis, redis-7.0.12"] - -[os] -name = "ruxos" -services = ["alloc","paging","irq","fp_simd","multitask","fs","blkfs","net","pipe","epoll","poll","rtc","virtio-9p"] -ulib = "ruxlibc" - -[os.platform] -name = "x86_64-qemu-q35" -smp = "2" -mode = "release" -log = "error" - -[os.platform.qemu] -blk = "y" -net = "y" -graphic = "n" -disk_img = "disk.img" -args = "./redis-server,/v9fs/redis.conf" -v9p = "y" -v9p_path = "./" -net_dev = "user" -IP = "10.0.2.15" -GW = "10.0.2.2" - -[[targets]] -name = "ruxos_redis" -src = "" -include_dir = "" -type = "exe" -cflags = "-static -no-pie" # Local compilation needs -linker = "rust-lld -flavor gnu" -ldflags = "--allow-multiple-definition" # If ruxmusl is used, add --allow-multiple-definition -deps = ["libredis_server"] \ No newline at end of file diff --git a/doc/ruxgo_book/src/installation.md b/doc/ruxgo_book/src/installation.md index 3d3f60e..855d2c6 100644 --- a/doc/ruxgo_book/src/installation.md +++ b/doc/ruxgo_book/src/installation.md @@ -1,17 +1,21 @@ # Ruxgo 安装 -要从源代码构建`ruxgo`可执行文件,你首先需要安装 Rust 和 Cargo。按照[Rust安装页面](https://www.rust-lang.org/tools/install)上的说明操作。Ruxgo 目前至少需要 Rust 1.74 版本。 +要安装`ruxgo`可执行文件,您首先需要安装 Rust 和 Cargo。按照[Rust安装页面](https://www.rust-lang.org/tools/install)上的说明操作。Ruxgo 目前至少需要 Rust 1.74 版本。 -一旦你安装了 Rust,就可以使用以下命令来构建和安装 Ruxgo: +一旦您安装了 Rust,就可以使用以下命令来构建和安装 Ruxgo: ```sh -cargo install --git https://github.com/syswonder/ruxgo.git ruxgo +cargo install ruxgo ``` -这将自动下载、构建 Ruxgo,并将其安装到 Cargo 的全局二进制目录(默认为`~/.cargo/bin/`)。 +这将自动从[crates.io](https://crates.io/)下载并构建 Ruxgo,并将其安装到 Cargo 的全局二进制目录(默认为`~/.cargo/bin/`)。 + +发布到 crates.io 的版本将稍微落后于 GitHub 上托管的版本。如果您需要最新版本,您可以自己构建 Ruxgo 的 git 版本: -要卸载,请执行命令`cargo uninstall ruxgo`。 +```sh +cargo install --git https://github.com/syswonder/ruxgo.git ruxgo +``` **注意:** -如果你在安装时遇到问题,可能需要安装一些构建依赖项,请参考 RuxOS 下的[README.md](https://github.com/syswonder/ruxos?tab=readme-ov-file#install-build-dependencies). \ No newline at end of file +如果您在安装时遇到问题,可能需要安装一些构建依赖项,请参考 RuxOS 下的[README.md](https://github.com/syswonder/ruxos?tab=readme-ov-file#install-build-dependencies). \ No newline at end of file