Skip to content

Commit

Permalink
Wasmtime 0.13.0 and Cranelift 0.61.0. (bytecodealliance#1398)
Browse files Browse the repository at this point in the history
This also updates the publishing scripts to work with newly added
and reorganized crates.
  • Loading branch information
sunfishcode authored Mar 26, 2020
1 parent cde01a4 commit 6fa9be7
Show file tree
Hide file tree
Showing 55 changed files with 285 additions and 388 deletions.
273 changes: 82 additions & 191 deletions Cargo.lock

Large diffs are not rendered by default.

21 changes: 10 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmtime-cli"
version = "0.12.0"
version = "0.13.0"
authors = ["The Wasmtime Project Developers"]
description = "Command-line interface for Wasmtime"
license = "Apache-2.0 WITH LLVM-exception"
Expand All @@ -11,7 +11,6 @@ repository = "https://github.com/bytecodealliance/wasmtime"
readme = "README.md"
edition = "2018"
default-run = "wasmtime"
publish = false

[lib]
doctest = false
Expand All @@ -23,14 +22,14 @@ doc = false

[dependencies]
# Enable all supported architectures by default.
wasmtime = { path = "crates/api", default-features = false }
wasmtime-debug = { path = "crates/debug" }
wasmtime-environ = { path = "crates/environ" }
wasmtime-jit = { path = "crates/jit" }
wasmtime-obj = { path = "crates/obj" }
wasmtime-wast = { path = "crates/wast" }
wasmtime-wasi = { path = "crates/wasi" }
wasi-common = { path = "crates/wasi-common" }
wasmtime = { path = "crates/api", version = "0.13.0", default-features = false }
wasmtime-debug = { path = "crates/debug", version = "0.13.0" }
wasmtime-environ = { path = "crates/environ", version = "0.13.0" }
wasmtime-jit = { path = "crates/jit", version = "0.13.0" }
wasmtime-obj = { path = "crates/obj", version = "0.13.0" }
wasmtime-wast = { path = "crates/wast", version = "0.13.0" }
wasmtime-wasi = { path = "crates/wasi", version = "0.13.0" }
wasi-common = { path = "crates/wasi-common", version = "0.13.0" }
structopt = { version = "0.3.5", features = ["color", "suggestions"] }
faerie = "0.15.0"
anyhow = "1.0.19"
Expand All @@ -42,7 +41,7 @@ libc = "0.2.60"
rayon = "1.2.1"

[dev-dependencies]
wasmtime-runtime = { path = "crates/runtime" }
wasmtime-runtime = { path = "crates/runtime", version = "0.13.0" }
more-asserts = "0.2.1"
# This feature requires the wasm32-wasi target be installed. It enables
# wasm32-wasi integration tests. To enable, run
Expand Down
8 changes: 7 additions & 1 deletion RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@

--------------------------------------------------------------------------------

## 0.13.0
## 0.14.0

Unreleased

--------------------------------------------------------------------------------

## 0.13.0

Released 2020-03-24.

### Added

* Lots of documentation of `wasmtime` has been updated. Be sure to check out the
Expand Down
30 changes: 15 additions & 15 deletions cranelift/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "cranelift-tools"
authors = ["The Cranelift Project Developers"]
version = "0.60.0"
version = "0.61.0"
description = "Binaries for testing the Cranelift libraries"
license = "Apache-2.0 WITH LLVM-exception"
documentation = "https://github.com/bytecodealliance/wasmtime/blob/master/cranelift/docs/index.md"
Expand All @@ -15,20 +15,20 @@ path = "src/clif-util.rs"

[dependencies]
cfg-if = "0.1"
cranelift-codegen = { path = "codegen", version = "0.60.0" }
cranelift-entity = { path = "entity", version = "0.60.0" }
cranelift-reader = { path = "reader", version = "0.60.0" }
cranelift-frontend = { path = "frontend", version = "0.60.0" }
cranelift-serde = { path = "serde", version = "0.60.0", optional = true }
cranelift-wasm = { path = "wasm", version = "0.60.0", optional = true }
cranelift-native = { path = "native", version = "0.60.0" }
cranelift-filetests = { path = "filetests", version = "0.60.0" }
cranelift-module = { path = "module", version = "0.60.0" }
cranelift-faerie = { path = "faerie", version = "0.60.0" }
cranelift-object = { path = "object", version = "0.60.0" }
cranelift-simplejit = { path = "simplejit", version = "0.60.0" }
cranelift-preopt = { path = "preopt", version = "0.60.0" }
cranelift = { path = "umbrella", version = "0.60.0" }
cranelift-codegen = { path = "codegen", version = "0.61.0" }
cranelift-entity = { path = "entity", version = "0.61.0" }
cranelift-reader = { path = "reader", version = "0.61.0" }
cranelift-frontend = { path = "frontend", version = "0.61.0" }
cranelift-serde = { path = "serde", version = "0.61.0", optional = true }
cranelift-wasm = { path = "wasm", version = "0.61.0", optional = true }
cranelift-native = { path = "native", version = "0.61.0" }
cranelift-filetests = { path = "filetests", version = "0.61.0" }
cranelift-module = { path = "module", version = "0.61.0" }
cranelift-faerie = { path = "faerie", version = "0.61.0" }
cranelift-object = { path = "object", version = "0.61.0" }
cranelift-simplejit = { path = "simplejit", version = "0.61.0" }
cranelift-preopt = { path = "preopt", version = "0.61.0" }
cranelift = { path = "umbrella", version = "0.61.0" }
filecheck = "0.5.0"
clap = "2.32.0"
serde = "1.0.8"
Expand Down
4 changes: 2 additions & 2 deletions cranelift/bforest/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
authors = ["The Cranelift Project Developers"]
name = "cranelift-bforest"
version = "0.60.0"
version = "0.61.0"
description = "A forest of B+-trees"
license = "Apache-2.0 WITH LLVM-exception"
documentation = "https://docs.rs/cranelift-bforest"
Expand All @@ -12,7 +12,7 @@ keywords = ["btree", "forest", "set", "map"]
edition = "2018"

[dependencies]
cranelift-entity = { path = "../entity", version = "0.60.0", default-features = false }
cranelift-entity = { path = "../entity", version = "0.61.0", default-features = false }

[badges]
maintenance = { status = "experimental" }
10 changes: 5 additions & 5 deletions cranelift/codegen/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
authors = ["The Cranelift Project Developers"]
name = "cranelift-codegen"
version = "0.60.0"
version = "0.61.0"
description = "Low-level code generator library"
license = "Apache-2.0 WITH LLVM-exception"
documentation = "https://docs.rs/cranelift-codegen"
Expand All @@ -13,9 +13,9 @@ build = "build.rs"
edition = "2018"

[dependencies]
cranelift-codegen-shared = { path = "./shared", version = "0.60.0" }
cranelift-entity = { path = "../entity", version = "0.60.0" }
cranelift-bforest = { path = "../bforest", version = "0.60.0" }
cranelift-codegen-shared = { path = "./shared", version = "0.61.0" }
cranelift-entity = { path = "../entity", version = "0.61.0" }
cranelift-bforest = { path = "../bforest", version = "0.61.0" }
hashbrown = { version = "0.7", optional = true }
target-lexicon = "0.10"
log = { version = "0.4.6", default-features = false }
Expand All @@ -30,7 +30,7 @@ byteorder = { version = "1.3.2", default-features = false }
# accomodated in `tests`.

[build-dependencies]
cranelift-codegen-meta = { path = "meta", version = "0.60.0" }
cranelift-codegen-meta = { path = "meta", version = "0.61.0" }

[features]
default = ["std", "unwind"]
Expand Down
6 changes: 3 additions & 3 deletions cranelift/codegen/meta/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[package]
name = "cranelift-codegen-meta"
authors = ["The Cranelift Project Developers"]
version = "0.60.0"
version = "0.61.0"
description = "Metaprogram for cranelift-codegen code generator library"
license = "Apache-2.0 WITH LLVM-exception"
repository = "https://github.com/bytecodealliance/wasmtime"
readme = "README.md"
edition = "2018"

[dependencies]
cranelift-codegen-shared = { path = "../shared", version = "0.60.0" }
cranelift-entity = { path = "../../entity", version = "0.60.0" }
cranelift-codegen-shared = { path = "../shared", version = "0.61.0" }
cranelift-entity = { path = "../../entity", version = "0.61.0" }

[badges]
maintenance = { status = "experimental" }
Expand Down
2 changes: 1 addition & 1 deletion cranelift/codegen/shared/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
authors = ["The Cranelift Project Developers"]
name = "cranelift-codegen-shared"
version = "0.60.0"
version = "0.61.0"
description = "For code shared between cranelift-codegen-meta and cranelift-codegen"
license = "Apache-2.0 WITH LLVM-exception"
repository = "https://github.com/bytecodealliance/wasmtime"
Expand Down
2 changes: 1 addition & 1 deletion cranelift/entity/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
authors = ["The Cranelift Project Developers"]
name = "cranelift-entity"
version = "0.60.0"
version = "0.61.0"
description = "Data structures using entity references as mapping keys"
license = "Apache-2.0 WITH LLVM-exception"
documentation = "https://docs.rs/cranelift-entity"
Expand Down
11 changes: 3 additions & 8 deletions cranelift/faerie/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cranelift-faerie"
version = "0.60.0"
version = "0.61.0"
authors = ["The Cranelift Project Developers"]
description = "Emit Cranelift output to native object files with Faerie"
repository = "https://github.com/bytecodealliance/wasmtime"
Expand All @@ -10,17 +10,12 @@ readme = "README.md"
edition = "2018"

[dependencies]
cranelift-module = { path = "../module", version = "0.60.0" }
cranelift-module = { path = "../module", version = "0.61.0" }
cranelift-codegen = { path = "../codegen", version = "0.61.0", default-features = false, features = ["std"] }
faerie = "0.15.0"
goblin = "0.1.0"
anyhow = "1.0"
target-lexicon = "0.10"

[dependencies.cranelift-codegen]
path = "../codegen"
version = "0.60.0"
default-features = false
features = ["std"]

[badges]
maintenance = { status = "experimental" }
10 changes: 5 additions & 5 deletions cranelift/filetests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "cranelift-filetests"
authors = ["The Cranelift Project Developers"]
version = "0.60.0"
version = "0.61.0"
description = "Test driver and implementations of the filetest commands"
license = "Apache-2.0 WITH LLVM-exception"
documentation = "https://docs.rs/cranelift-filetests"
Expand All @@ -10,10 +10,10 @@ publish = false
edition = "2018"

[dependencies]
cranelift-codegen = { path = "../codegen", version = "0.60.0", features = ["testing_hooks"] }
cranelift-native = { path = "../native", version = "0.60.0" }
cranelift-reader = { path = "../reader", version = "0.60.0" }
cranelift-preopt = { path = "../preopt", version = "0.60.0" }
cranelift-codegen = { path = "../codegen", version = "0.61.0", features = ["testing_hooks"] }
cranelift-native = { path = "../native", version = "0.61.0" }
cranelift-reader = { path = "../reader", version = "0.61.0" }
cranelift-preopt = { path = "../preopt", version = "0.61.0" }
file-per-thread-logger = "0.1.2"
filecheck = "0.5.0"
gimli = { version = "0.20.0", default-features = false, features = ["read"] }
Expand Down
4 changes: 2 additions & 2 deletions cranelift/frontend/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
authors = ["The Cranelift Project Developers"]
name = "cranelift-frontend"
version = "0.60.0"
version = "0.61.0"
description = "Cranelift IR builder helper"
license = "Apache-2.0 WITH LLVM-exception"
documentation = "https://docs.rs/cranelift-frontend"
Expand All @@ -11,7 +11,7 @@ readme = "README.md"
edition = "2018"

[dependencies]
cranelift-codegen = { path = "../codegen", version = "0.60.0", default-features = false }
cranelift-codegen = { path = "../codegen", version = "0.61.0", default-features = false }
target-lexicon = "0.10"
log = { version = "0.4.6", default-features = false }
hashbrown = { version = "0.7", optional = true }
Expand Down
6 changes: 3 additions & 3 deletions cranelift/module/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cranelift-module"
version = "0.60.0"
version = "0.61.0"
authors = ["The Cranelift Project Developers"]
description = "Support for linking functions and data with Cranelift"
repository = "https://github.com/bytecodealliance/wasmtime"
Expand All @@ -11,8 +11,8 @@ readme = "README.md"
edition = "2018"

[dependencies]
cranelift-codegen = { path = "../codegen", version = "0.60.0", default-features = false }
cranelift-entity = { path = "../entity", version = "0.60.0" }
cranelift-codegen = { path = "../codegen", version = "0.61.0", default-features = false }
cranelift-entity = { path = "../entity", version = "0.61.0" }
hashbrown = { version = "0.6", optional = true }
log = { version = "0.4.6", default-features = false }
thiserror = "1.0.4"
Expand Down
5 changes: 3 additions & 2 deletions cranelift/native/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
[package]
name = "cranelift-native"
version = "0.60.0"
version = "0.61.0"
authors = ["The Cranelift Project Developers"]
description = "Support for targeting the host with Cranelift"
documentation = "https://docs.rs/cranelift-native"
repository = "https://github.com/bytecodealliance/wasmtime"
categories = ["no-std"]
license = "Apache-2.0 WITH LLVM-exception"
readme = "README.md"
edition = "2018"

[dependencies]
cranelift-codegen = { path = "../codegen", version = "0.60.0", default-features = false }
cranelift-codegen = { path = "../codegen", version = "0.61.0", default-features = false }
target-lexicon = "0.10"

[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]
Expand Down
11 changes: 3 additions & 8 deletions cranelift/object/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cranelift-object"
version = "0.60.0"
version = "0.61.0"
authors = ["The Cranelift Project Developers"]
description = "Emit Cranelift output to native object files with `object`"
repository = "https://github.com/bytecodealliance/wasmtime"
Expand All @@ -10,15 +10,10 @@ readme = "README.md"
edition = "2018"

[dependencies]
cranelift-module = { path = "../module", version = "0.60.0" }
cranelift-module = { path = "../module", version = "0.61.0" }
cranelift-codegen = { path = "../codegen", version = "0.61.0", default-features = false, features = ["std"] }
object = { version = "0.18", default-features = false, features = ["write"] }
target-lexicon = "0.10"

[dependencies.cranelift-codegen]
path = "../codegen"
version = "0.60.0"
default-features = false
features = ["std"]

[badges]
maintenance = { status = "experimental" }
6 changes: 3 additions & 3 deletions cranelift/preopt/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
authors = ["The Cranelift Project Developers"]
name = "cranelift-preopt"
version = "0.60.0"
version = "0.61.0"
description = "Support for optimizations in Cranelift"
license = "Apache-2.0 WITH LLVM-exception"
documentation = "https://docs.rs/cranelift-preopt"
Expand All @@ -12,8 +12,8 @@ keywords = ["optimize", "compile", "compiler", "jit"]
edition = "2018"

[dependencies]
cranelift-codegen = { path = "../codegen", version = "0.60.0", default-features = false }
cranelift-entity = { path = "../entity", version = "0.60.0" }
cranelift-codegen = { path = "../codegen", version = "0.61.0", default-features = false }
cranelift-entity = { path = "../entity", version = "0.61.0" }
# This is commented out because it doesn't build on Rust 1.25.0, which
# cranelift currently supports.
# rustc_apfloat = { version = "0.1.2", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions cranelift/reader/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
authors = ["The Cranelift Project Developers"]
name = "cranelift-reader"
version = "0.60.0"
version = "0.61.0"
description = "Cranelift textual IR reader"
license = "Apache-2.0 WITH LLVM-exception"
documentation = "https://docs.rs/cranelift-reader"
Expand All @@ -10,7 +10,7 @@ readme = "README.md"
edition = "2018"

[dependencies]
cranelift-codegen = { path = "../codegen", version = "0.60.0" }
cranelift-codegen = { path = "../codegen", version = "0.61.0" }
target-lexicon = "0.10"

[badges]
Expand Down
6 changes: 3 additions & 3 deletions cranelift/serde/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cranelift-serde"
version = "0.60.0"
version = "0.61.0"
authors = ["The Cranelift Project Developers"]
description = "Serializer/Deserializer for Cranelift IR"
repository = "https://github.com/bytecodealliance/wasmtime"
Expand All @@ -18,8 +18,8 @@ clap = "2.32.0"
serde = "1.0.8"
serde_derive = "1.0.75"
serde_json = "1.0.26"
cranelift-codegen = { path = "../codegen", version = "0.60.0" }
cranelift-reader = { path = "../reader", version = "0.60.0" }
cranelift-codegen = { path = "../codegen", version = "0.61.0" }
cranelift-reader = { path = "../reader", version = "0.61.0" }

[badges]
maintenance = { status = "experimental" }
Loading

0 comments on commit 6fa9be7

Please sign in to comment.