0.2.16

- redoxer install will call cargo install
- redoxer toolchain will install toolchain
parent cd00734a
This diff is collapsed.
[package]
name = "redoxer"
version = "0.2.15"
version = "0.2.16"
description = "Method for quickly running programs inside of Redox from a KVM capable OS."
license = "MIT"
authors = ["Jeremy Soller <jackpot51@gmail.com>"]
......@@ -11,9 +11,9 @@ edition = "2018"
dirs = "2.0.2"
redox_installer = "0.2.6"
redox_syscall = "0.1.56"
redoxfs = "0.4.0"
redoxfs = "0.4.1"
tempfile = "3.1.0"
toml = "0.5.6"
[target.'cfg(target_os = "linux")'.dependencies]
proc-mounts = "0.2.3"
proc-mounts = "0.2.4"
......@@ -25,7 +25,7 @@ RUN cargo install --path /root/redoxer
RUN cargo install redoxfs
# Install redoxer toolchain
RUN redoxer install
RUN redoxer toolchain
# Run test application
RUN redoxer exec true
......@@ -7,7 +7,7 @@ capable OS.
cargo install redoxer
## Install redoxer toolchain
redoxer install
redoxer toolchain
## Build project with redoxer
redoxer build
......
......@@ -61,7 +61,7 @@ pub fn main() {
process::exit(0);
},
Err(err) => {
eprintln!("redoxer install: {}", err);
eprintln!("redoxer env: {}", err);
process::exit(1);
}
}
......
use std::{io, process};
use crate::toolchain;
fn inner() -> io::Result<()> {
let _toolchain_dir = toolchain()?;
Ok(())
}
pub fn main() {
match inner() {
Ok(()) => {
process::exit(0);
},
Err(err) => {
eprintln!("redoxer install: {}", err);
process::exit(1);
}
}
}
......@@ -5,7 +5,6 @@ pub (crate) use self::toolchain::toolchain;
mod cargo;
mod env;
mod exec;
mod install;
mod redoxfs;
mod toolchain;
......@@ -58,10 +57,11 @@ fn usage() {
eprintln!("redoxer doc - cargo doc with Redox target");
eprintln!("redoxer env - execute a command in cross-compilation environment");
eprintln!("redoxer exec - execute a command in Redox VM");
eprintln!("redoxer install - install toolchain");
eprintln!("redoxer install - cargo install with Redox target");
eprintln!("redoxer run - cargo run with Redox target in Redox VM");
eprintln!("redoxer rustc - cargo rustc with Redox target");
eprintln!("redoxer test - cargo test with Redox target in Redox VM");
eprintln!("redoxer toolchain - install toolchain");
process::exit(1);
}
......@@ -72,12 +72,13 @@ fn main() {
"build" |
"check" |
"doc" |
"install" |
"run" |
"rustc" |
"test" => cargo::main(),
"env" => env::main(),
"exec" => exec::main(),
"install" => install::main(),
"toolchain" => toolchain::main(),
_ => usage(),
},
None => usage(),
......
use std::{fs, io};
use std::path::{Path, PathBuf};
use std::process::Command;
use std::process::{self, Command};
use crate::{redoxer_dir, status_error, TARGET};
......@@ -73,3 +73,15 @@ pub fn toolchain() -> io::Result<PathBuf> {
Ok(toolchain_dir)
}
pub fn main() {
match toolchain() {
Ok(_) => {
process::exit(0);
},
Err(err) => {
eprintln!("redoxer toolchain: {}", err);
process::exit(1);
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment