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

Fixes needed for 0.19.0 (#2035)

Browse Source 
* Add some more wiggle crates to publish

* Fix build of wasi-common on crates.io

* Bump crates to 0.19.1 to fix crates.io build
This commit is contained in:
Alex Crichton
2020-07-16 17:27:21 -05:00
committed by GitHub
parent 5e0268a542
commit 2f368ed5d6
7 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@@ -2292,7 +2292,7 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
[[package]] [[package]]
name = "wasi-common" name = "wasi-common"
version = "0.19.0" version = "0.19.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cfg-if", "cfg-if",
@@ -2587,7 +2587,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmtime-wasi" name = "wasmtime-wasi"
version = "0.19.0" version = "0.19.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"log", "log",
@@ -2620,7 +2620,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmtime-wiggle-macro" name = "wasmtime-wiggle-macro"
version = "0.19.0" version = "0.19.1"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

2
crates/wasi-common/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "wasi-common" name = "wasi-common"
version = "0.19.0" version = "0.19.1"
authors = ["The Wasmtime Project Developers"] authors = ["The Wasmtime Project Developers"]
description = "WASI implementation in Rust" description = "WASI implementation in Rust"
license = "Apache-2.0 WITH LLVM-exception" license = "Apache-2.0 WITH LLVM-exception"

2
crates/wasi/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "wasmtime-wasi" name = "wasmtime-wasi"
version = "0.19.0" version = "0.19.1"
authors = ["The Cranelift Project Developers"] authors = ["The Cranelift Project Developers"]
description = "WASI API support for Wasmtime" description = "WASI API support for Wasmtime"
documentation = "https://docs.rs/wasmtime-wasi" documentation = "https://docs.rs/wasmtime-wasi"

2
crates/wasi/src/lib.rs
View File

@@ -10,7 +10,7 @@ wasmtime_wiggle::wasmtime_integration!({
// The wiggle code to integrate with lives here: // The wiggle code to integrate with lives here:
target: wasi_common::wasi, target: wasi_common::wasi,
// This must be the same witx document as used above: // This must be the same witx document as used above:
witx: ["../wasi-common/WASI/phases/snapshot/witx/wasi_snapshot_preview1.witx"], witx: ["phases/snapshot/witx/wasi_snapshot_preview1.witx"],
// This must be the same ctx type as used for the target: // This must be the same ctx type as used for the target:
ctx: WasiCtx, ctx: WasiCtx,
// This macro will emit a struct to represent the instance, // This macro will emit a struct to represent the instance,

2
crates/wiggle/wasmtime/macro/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "wasmtime-wiggle-macro" name = "wasmtime-wiggle-macro"
version = "0.19.0" version = "0.19.1"
authors = ["Pat Hickey <phickey@fastly.com>", "Jakub Konka <kubkonk@jakubkonka.com>", "Alex Crichton <alex@alexcrichton.com>"] authors = ["Pat Hickey <phickey@fastly.com>", "Jakub Konka <kubkonk@jakubkonka.com>", "Alex Crichton <alex@alexcrichton.com>"]
edition = "2018" edition = "2018"
license = "Apache-2.0 WITH LLVM-exception" license = "Apache-2.0 WITH LLVM-exception"

6
crates/wiggle/wasmtime/macro/src/lib.rs
View File

@@ -48,9 +48,9 @@ use config::{MissingMemoryConf, ModuleConf, TargetConf};
#[proc_macro] #[proc_macro]
pub fn wasmtime_integration(args: TokenStream) -> TokenStream { pub fn wasmtime_integration(args: TokenStream) -> TokenStream {
let mut config = parse_macro_input!(args as config::Config); let mut config = parse_macro_input!(args as config::Config);
config.witx.make_paths_relative_to( config
std::env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR env var"), .witx
); .make_paths_relative_to(std::env::var("WASI_ROOT").expect("WASI_ROOT env var"));
let doc = config.load_document(); let doc = config.load_document();
let names = Names::new(&config.ctx.name, quote!(wasmtime_wiggle)); let names = Names::new(&config.ctx.name, quote!(wasmtime_wiggle));

2
scripts/publish-wasmtime.sh
View File

@@ -23,6 +23,8 @@ for cargo_toml in \
crates/wasi-common/wig/Cargo.toml \ crates/wasi-common/wig/Cargo.toml \
crates/wiggle/generate/Cargo.toml \ crates/wiggle/generate/Cargo.toml \
crates/wiggle/macro/Cargo.toml \ crates/wiggle/macro/Cargo.toml \
crates/wiggle/wasmtime/macro/Cargo.toml \
crates/wiggle/wasmtime/Cargo.toml \
crates/wiggle/Cargo.toml \ crates/wiggle/Cargo.toml \
crates/wasi-common/Cargo.toml \ crates/wasi-common/Cargo.toml \
crates/lightbeam/Cargo.toml \ crates/lightbeam/Cargo.toml \