Fixes for 0.15 (#1449)

* Wasmtime 0.15.0 and Cranelift 0.62.0. (#1398)

* Bump more ad-hoc versions.

* Add build.rs to wasi-common's Cargo.toml.

* Update the env var name in more places.

* Remove a redundant echo.
This commit is contained in:
Dan Gohman
2020-04-03 13:13:37 -07:00
committed by GitHub
parent f6e3ab03a2
commit fde5ddf159
51 changed files with 232 additions and 223 deletions

View File

@@ -1,6 +1,6 @@
[package]
name = "wasmtime"
version = "0.14.0"
version = "0.15.0"
authors = ["The Wasmtime Project Developers"]
description = "High-level API to expose the Wasmtime runtime"
documentation = "https://docs.rs/wasmtime"
@@ -10,10 +10,10 @@ readme = "README.md"
edition = "2018"
[dependencies]
wasmtime-runtime = { path = "../runtime", version = "0.14.0" }
wasmtime-environ = { path = "../environ", version = "0.14.0" }
wasmtime-jit = { path = "../jit", version = "0.14.0" }
wasmtime-profiling = { path = "../profiling", version = "0.14.0" }
wasmtime-runtime = { path = "../runtime", version = "0.15.0" }
wasmtime-environ = { path = "../environ", version = "0.15.0" }
wasmtime-jit = { path = "../jit", version = "0.15.0" }
wasmtime-profiling = { path = "../profiling", version = "0.15.0" }
wasmparser = "0.51.2"
target-lexicon = { version = "0.10.0", default-features = false }
anyhow = "1.0.19"
@@ -30,7 +30,7 @@ winapi = "0.3.7"
[dev-dependencies]
# for wasmtime.rs
wasi-common = { path = "../wasi-common", version = "0.14.0" }
wasi-common = { path = "../wasi-common", version = "0.15.0" }
pretty_env_logger = "0.4.0"
rayon = "1.2.1"
file-per-thread-logger = "0.1.1"

View File

@@ -1,6 +1,6 @@
[package]
name = "wasmtime-c-api"
version = "0.14.0"
version = "0.15.0"
authors = ["The Wasmtime Project Developers"]
description = "C API to expose the Wasmtime runtime"
license = "Apache-2.0 WITH LLVM-exception"

View File

@@ -1,6 +1,6 @@
[package]
name = "wasmtime-c-api-macros"
version = "0.1.0"
version = "0.15.0"
authors = ["The Wasmtime Project Developers"]
edition = "2018"
publish = false

View File

@@ -1,6 +1,6 @@
[package]
name = "wasmtime-debug"
version = "0.14.0"
version = "0.15.0"
authors = ["The Wasmtime Project Developers"]
description = "Debug utils for WebAsssembly code in Cranelift"
license = "Apache-2.0 WITH LLVM-exception"
@@ -15,7 +15,7 @@ edition = "2018"
gimli = "0.20.0"
wasmparser = "0.51.2"
faerie = "0.15.0"
wasmtime-environ = { path = "../environ", version = "0.14.0" }
wasmtime-environ = { path = "../environ", version = "0.15.0" }
target-lexicon = { version = "0.10.0", default-features = false }
anyhow = "1.0"
thiserror = "1.0.4"

View File

@@ -1,6 +1,6 @@
[package]
name = "wasmtime-environ"
version = "0.14.0"
version = "0.15.0"
authors = ["The Wasmtime Project Developers"]
description = "Standalone environment support for WebAsssembly code in Cranelift"
license = "Apache-2.0 WITH LLVM-exception"
@@ -13,11 +13,11 @@ edition = "2018"
[dependencies]
anyhow = "1.0"
cranelift-codegen = { path = "../../cranelift/codegen", version = "0.61.0", features = ["enable-serde"] }
cranelift-entity = { path = "../../cranelift/entity", version = "0.61.0", features = ["enable-serde"] }
cranelift-wasm = { path = "../../cranelift/wasm", version = "0.61.0", features = ["enable-serde"] }
cranelift-codegen = { path = "../../cranelift/codegen", version = "0.62.0", features = ["enable-serde"] }
cranelift-entity = { path = "../../cranelift/entity", version = "0.62.0", features = ["enable-serde"] }
cranelift-wasm = { path = "../../cranelift/wasm", version = "0.62.0", features = ["enable-serde"] }
wasmparser = "0.51.2"
lightbeam = { path = "../lightbeam", optional = true, version = "0.14.0" }
lightbeam = { path = "../lightbeam", optional = true, version = "0.15.0" }
indexmap = "1.0.2"
rayon = "1.2.1"
thiserror = "1.0.4"
@@ -44,7 +44,7 @@ tempfile = "3"
target-lexicon = { version = "0.10.0", default-features = false }
pretty_env_logger = "0.4.0"
rand = { version = "0.7.0", default-features = false, features = ["small_rng"] }
cranelift-codegen = { path = "../../cranelift/codegen", version = "0.61.0", features = ["enable-serde", "all-arch"] }
cranelift-codegen = { path = "../../cranelift/codegen", version = "0.62.0", features = ["enable-serde", "all-arch"] }
filetime = "0.2.7"
lazy_static = "1.3.0"

View File

@@ -4,7 +4,7 @@ description = "Fuzzing infrastructure for Wasmtime"
edition = "2018"
name = "wasmtime-fuzzing"
publish = false
version = "0.14.0"
version = "0.15.0"
[dependencies]
anyhow = "1.0.22"
@@ -15,7 +15,7 @@ log = "0.4.8"
rayon = "1.2.1"
wasmparser = "0.51.2"
wasmprinter = "0.2.1"
wasmtime = { path = "../api", version = "0.14.0" }
wasmtime = { path = "../api", version = "0.15.0" }
[dev-dependencies]
wat = "1.0.10"

View File

@@ -1,6 +1,6 @@
[package]
name = "wasmtime-jit"
version = "0.14.0"
version = "0.15.0"
authors = ["The Wasmtime Project Developers"]
description = "JIT-style execution for WebAsssembly code in Cranelift"
documentation = "https://docs.rs/wasmtime-jit"
@@ -12,15 +12,15 @@ readme = "README.md"
edition = "2018"
[dependencies]
cranelift-codegen = { path = "../../cranelift/codegen", version = "0.61.0", features = ["enable-serde"] }
cranelift-entity = { path = "../../cranelift/entity", version = "0.61.0", features = ["enable-serde"] }
cranelift-wasm = { path = "../../cranelift/wasm", version = "0.61.0", features = ["enable-serde"] }
cranelift-native = { path = "../../cranelift/native", version = "0.61.0" }
cranelift-frontend = { path = "../../cranelift/frontend", version = "0.61.0" }
wasmtime-environ = { path = "../environ", version = "0.14.0" }
wasmtime-runtime = { path = "../runtime", version = "0.14.0" }
wasmtime-debug = { path = "../debug", version = "0.14.0" }
wasmtime-profiling = { path = "../profiling", version = "0.14.0" }
cranelift-codegen = { path = "../../cranelift/codegen", version = "0.62.0", features = ["enable-serde"] }
cranelift-entity = { path = "../../cranelift/entity", version = "0.62.0", features = ["enable-serde"] }
cranelift-wasm = { path = "../../cranelift/wasm", version = "0.62.0", features = ["enable-serde"] }
cranelift-native = { path = "../../cranelift/native", version = "0.62.0" }
cranelift-frontend = { path = "../../cranelift/frontend", version = "0.62.0" }
wasmtime-environ = { path = "../environ", version = "0.15.0" }
wasmtime-runtime = { path = "../runtime", version = "0.15.0" }
wasmtime-debug = { path = "../debug", version = "0.15.0" }
wasmtime-profiling = { path = "../profiling", version = "0.15.0" }
region = "2.0.0"
thiserror = "1.0.4"
target-lexicon = { version = "0.10.0", default-features = false }

View File

@@ -1,6 +1,6 @@
[package]
name = "lightbeam"
version = "0.14.0"
version = "0.15.0"
authors = ["The Lightbeam Project Developers"]
description = "An optimising one-pass streaming compiler for WebAssembly"
license = "Apache-2.0 WITH LLVM-exception"
@@ -19,7 +19,7 @@ memoffset = "0.5.3"
itertools = "0.8.2"
capstone = "0.6.0"
thiserror = "1.0.9"
cranelift-codegen = { path = "../../cranelift/codegen", version = "0.61.0" }
cranelift-codegen = { path = "../../cranelift/codegen", version = "0.62.0" }
multi_mut = "0.1"
either = "1.5"
typemap = "0.3"

View File

@@ -1,6 +1,6 @@
[package]
name = "run-examples"
version = "0.14.0"
version = "0.15.0"
authors = ["The Wasmtime Project Developers"]
edition = "2018"
publish = false

View File

@@ -1,6 +1,6 @@
[package]
name = "wasmtime-rust"
version = "0.14.0"
version = "0.15.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
description = "Rust extension for Wasmtime"
license = "Apache-2.0 WITH LLVM-exception"
@@ -15,9 +15,9 @@ test = false
doctest = false
[dependencies]
wasmtime-rust-macro = { path = "./macro", version = "0.14.0" }
wasmtime-wasi = { path = "../../wasi", version = "0.14.0" }
wasmtime = { path = "../../api", version = "0.14.0" }
wasmtime-rust-macro = { path = "./macro", version = "0.15.0" }
wasmtime-wasi = { path = "../../wasi", version = "0.15.0" }
wasmtime = { path = "../../api", version = "0.15.0" }
anyhow = "1.0.19"
[badges]

View File

@@ -1,6 +1,6 @@
[package]
name = "wasmtime-rust-macro"
version = "0.14.0"
version = "0.15.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
description = "Macro support crate for wasmtime-rust"
license = "Apache-2.0 WITH LLVM-exception"

View File

@@ -1,6 +1,6 @@
[package]
name = "wasmtime-obj"
version = "0.14.0"
version = "0.15.0"
authors = ["The Wasmtime Project Developers"]
description = "Native object file output for WebAsssembly code in Wasmtime"
license = "Apache-2.0 WITH LLVM-exception"
@@ -12,7 +12,7 @@ edition = "2018"
[dependencies]
anyhow = "1.0"
wasmtime-environ = { path = "../environ", version = "0.14.0" }
wasmtime-environ = { path = "../environ", version = "0.15.0" }
faerie = "0.15.0"
more-asserts = "0.2.1"

View File

@@ -1,6 +1,6 @@
[package]
name = "wasmtime-profiling"
version = "0.14.0"
version = "0.15.0"
authors = ["The Wasmtime Project Developers"]
description = "Runtime library support for Wasmtime"
license = "Apache-2.0 WITH LLVM-exception"
@@ -20,8 +20,8 @@ object = { version = "0.18.0", optional = true }
scroll = { version = "0.10.1", optional = true }
serde = { version = "1.0.99", features = ["derive"] }
target-lexicon = "0.10.0"
wasmtime-environ = { path = "../environ", version = "0.14.0" }
wasmtime-runtime = { path = "../runtime", version = "0.14.0" }
wasmtime-environ = { path = "../environ", version = "0.15.0" }
wasmtime-runtime = { path = "../runtime", version = "0.15.0" }
ittapi-rs = { version = "0.1.5", optional = true }
[badges]

View File

@@ -1,6 +1,6 @@
[package]
name = "wasmtime-runtime"
version = "0.14.0"
version = "0.15.0"
authors = ["The Wasmtime Project Developers"]
description = "Runtime library support for Wasmtime"
documentation = "https://docs.rs/wasmtime-runtime"
@@ -12,7 +12,7 @@ readme = "README.md"
edition = "2018"
[dependencies]
wasmtime-environ = { path = "../environ", version = "0.14.0" }
wasmtime-environ = { path = "../environ", version = "0.15.0" }
region = "2.0.0"
libc = { version = "0.2.60", default-features = false }
memoffset = "0.5.3"

View File

@@ -1,6 +1,6 @@
[package]
name = "test-programs"
version = "0.14.0"
version = "0.15.0"
authors = ["The Wasmtime Project Developers"]
readme = "README.md"
edition = "2018"
@@ -10,9 +10,9 @@ publish = false
cfg-if = "0.1.9"
[dev-dependencies]
wasi-common = { path = "../wasi-common", version = "0.14.0" }
wasmtime-wasi = { path = "../wasi", version = "0.14.0" }
wasmtime = { path = "../api", version = "0.14.0" }
wasi-common = { path = "../wasi-common", version = "0.15.0" }
wasmtime-wasi = { path = "../wasi", version = "0.15.0" }
wasmtime = { path = "../api", version = "0.15.0" }
target-lexicon = "0.10.0"
pretty_env_logger = "0.4.0"
tempfile = "3.1.0"

View File

@@ -17,7 +17,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "wasi-tests"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
"more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

View File

@@ -1,6 +1,6 @@
[package]
name = "wasi-tests"
version = "0.14.0"
version = "0.15.0"
authors = ["The Wasmtime Project Developers"]
readme = "README.md"
edition = "2018"

View File

@@ -1,6 +1,6 @@
[package]
name = "wasi-common"
version = "0.14.0"
version = "0.15.0"
authors = ["The Wasmtime Project Developers"]
description = "WASI implementation in Rust"
license = "Apache-2.0 WITH LLVM-exception"
@@ -9,12 +9,12 @@ keywords = ["webassembly", "wasm"]
repository = "https://github.com/bytecodealliance/wasmtime"
readme = "README.md"
edition = "2018"
include = ["src/**/*", "LICENSE", "WASI/phases"]
include = ["src/**/*", "LICENSE", "WASI/phases", "build.rs"]
# This doesn't actually link to a native library, but it allows us to set env
# vars like `DEP_WASI_COMMON_14_*` for crates that have build scripts and depend
# vars like `DEP_WASI_COMMON_15_*` for crates that have build scripts and depend
# on this crate, allowing other crates to use the same witx files.
links = "wasi-common-14"
links = "wasi-common-15"
[dependencies]
anyhow = "1.0"
@@ -26,14 +26,14 @@ log = "0.4"
filetime = "0.2.7"
lazy_static = "1.4.0"
num = { version = "0.2.0", default-features = false }
wig = { path = "wig", version = "0.14.0" }
wiggle = { path = "../wiggle", default-features = false, version = "0.14.0" }
wig = { path = "wig", version = "0.15.0" }
wiggle = { path = "../wiggle", default-features = false, version = "0.15.0" }
[target.'cfg(unix)'.dependencies]
yanix = { path = "yanix", version = "0.14.0" }
yanix = { path = "yanix", version = "0.15.0" }
[target.'cfg(windows)'.dependencies]
winx = { path = "winx", version = "0.14.0" }
winx = { path = "winx", version = "0.15.0" }
winapi = "0.3"
cpu-time = "1.0"

View File

@@ -1,6 +1,6 @@
[package]
name = "wig"
version = "0.14.0"
version = "0.15.0"
authors = ["Dan Gohman <sunfish@mozilla.com>"]
description = "WebAssembly Interface Generator"
license = "Apache-2.0 WITH LLVM-exception"

View File

@@ -1,6 +1,6 @@
[package]
name = "winx"
version = "0.14.0"
version = "0.15.0"
authors = ["Jakub Konka <kubkon@jakubkonka.com>"]
description = "Windows API helper library"
documentation = "https://docs.rs/winx"

View File

@@ -1,6 +1,6 @@
[package]
name = "yanix"
version = "0.14.0"
version = "0.15.0"
authors = ["The Wasmtime Project Developers"]
description = "Yet Another Nix crate: a Unix API helper library"
documentation = "https://docs.rs/yanix"

View File

@@ -1,6 +1,6 @@
[package]
name = "wasmtime-wasi"
version = "0.14.0"
version = "0.15.0"
authors = ["The Cranelift Project Developers"]
description = "WASI API support for Wasmtime"
documentation = "https://docs.rs/wasmtime-wasi"
@@ -14,11 +14,11 @@ edition = "2018"
[dependencies]
anyhow = "1.0"
log = { version = "0.4.8", default-features = false }
wasi-common = { path = "../wasi-common", version = "0.14.0" }
wasmtime = { path = "../api", version = "0.14.0", default-features = false }
wasmtime-runtime = { path = "../runtime", version = "0.14.0" }
wig = { path = "../wasi-common/wig", version = "0.14.0" }
wiggle = { path = "../wiggle", version = "0.14.0" }
wasi-common = { path = "../wasi-common", version = "0.15.0" }
wasmtime = { path = "../api", version = "0.15.0", default-features = false }
wasmtime-runtime = { path = "../runtime", version = "0.15.0" }
wig = { path = "../wasi-common/wig", version = "0.15.0" }
wiggle = { path = "../wiggle", version = "0.15.0" }
[badges]
maintenance = { status = "actively-developed" }

View File

@@ -1,4 +1,4 @@
fn main() {
let wasi_root = std::env::var("DEP_WASI_COMMON_14_WASI").unwrap();
let wasi_root = std::env::var("DEP_WASI_COMMON_15_WASI").unwrap();
println!("cargo:rustc-env=WASI_ROOT={}", wasi_root);
}

View File

@@ -1,6 +1,6 @@
[package]
name = "wasmtime-wast"
version = "0.14.0"
version = "0.15.0"
authors = ["The Wasmtime Project Developers"]
description = "wast testing support for wasmtime"
license = "Apache-2.0 WITH LLVM-exception"
@@ -12,7 +12,7 @@ edition = "2018"
[dependencies]
anyhow = "1.0.19"
wasmtime = { path = "../api", version = "0.14.0", default-features = false }
wasmtime = { path = "../api", version = "0.15.0", default-features = false }
wast = "11.0.0"
[badges]

View File

@@ -1,6 +1,6 @@
[package]
name = "wiggle"
version = "0.14.0"
version = "0.15.0"
authors = ["Pat Hickey <phickey@fastly.com>", "Jakub Konka <kubkonk@jakubkonka.com>", "Alex Crichton <alex@alexcrichton.com>"]
edition = "2018"
license = "Apache-2.0 WITH LLVM-exception"
@@ -13,7 +13,7 @@ include = ["src/**/*", "LICENSE"]
[dependencies]
thiserror = "1"
witx = { path = "../wasi-common/WASI/tools/witx", version = "0.8.4", optional = true }
wiggle-macro = { path = "macro", version = "0.14.0" }
wiggle-macro = { path = "macro", version = "0.15.0" }
[badges]
maintenance = { status = "actively-developed" }

View File

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

View File

@@ -1,6 +1,6 @@
[package]
name = "wiggle-macro"
version = "0.14.0"
version = "0.15.0"
authors = ["Pat Hickey <phickey@fastly.com>", "Jakub Konka <kubkon@jakubkonka.com>", "Alex Crichton <alex@alexcrichton.com>"]
edition = "2018"
license = "Apache-2.0 WITH LLVM-exception"
@@ -14,7 +14,7 @@ include = ["src/**/*", "LICENSE"]
proc-macro = true
[dependencies]
wiggle-generate = { path = "../generate", version = "0.14.0" }
wiggle-generate = { path = "../generate", version = "0.15.0" }
witx = { path = "../../wasi-common/WASI/tools/witx", version = "0.8.4" }
syn = { version = "1.0", features = ["full"] }

View File

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