T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

less general mechanism for examples cargo feature

Browse Source
This commit is contained in:
Pat Hickey
2021-05-06 16:21:43 -07:00
parent b19d86268c
commit 35a9d4e3c9
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/misc/run-examples/src/main.rs
View File

@@ -13,11 +13,7 @@ fn main() -> anyhow::Result<()> {
continue; continue;
} }
examples.insert(( examples.insert((path.file_stem().unwrap().to_str().unwrap().to_owned(), dir));
path.clone(),
path.file_stem().unwrap().to_str().unwrap().to_owned(),
dir,
));
} }
println!("======== Building libwasmtime.a ==========="); println!("======== Building libwasmtime.a ===========");
@@ -25,7 +21,7 @@ fn main() -> anyhow::Result<()> {
.args(&["build"]) .args(&["build"])
.current_dir("crates/c-api"))?; .current_dir("crates/c-api"))?;
for (example_path, example, is_dir) in examples { for (example, is_dir) in examples {
if example == "README" { if example == "README" {
continue; continue;
} }
@@ -51,13 +47,9 @@ fn main() -> anyhow::Result<()> {
println!("======== Rust example `{}` ============", example); println!("======== Rust example `{}` ============", example);
let mut cargo_cmd = Command::new("cargo"); let mut cargo_cmd = Command::new("cargo");
cargo_cmd.arg("run").arg("--example").arg(&example); cargo_cmd.arg("run").arg("--example").arg(&example);
if is_dir {
let mut features_path = std::path::PathBuf::from(example_path); if example.contains("tokio") {
features_path.push("CARGO_FEATURES"); cargo_cmd.arg("--features").arg("wasmtime-wasi/tokio");
if features_path.exists() {
let features = std::fs::read_to_string(features_path)?;
cargo_cmd.arg("--features").arg(features);
}
} }
run(&mut cargo_cmd)?; run(&mut cargo_cmd)?;

1
examples/tokio/CARGO_FEATURES
View File

@@ -1 +0,0 @@
wasmtime-wasi/tokio