Merge wasmerio#2094

2094: Prepare for 1.0.2 release r=nlewycky a=nlewycky # Description Prepare for 1.0.2 release # Review - [x] Add a short description of the the change to the CHANGELOG.md file Co-authored-by: Nick Lewycky <[email protected]>
AmesianX · Feb 5, 2021 · 8b2c385 · 8b2c385
2 parents 77f2e85 + fb429e0
commit 8b2c385
Show file tree

Hide file tree

Showing 33 changed files with 181 additions and 170 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,23 +7,33 @@
 
 ## **[Unreleased]**
 
+### Added
+
+### Changed
+
+### Fixed
+
+## 1.0.2 - 2021-02-04
+
 ### Added
 - [#2053](https://github.com/wasmerio/wasmer/pull/2053) Implement the non-standard `wasi_get_unordered_imports` function in the C API.
 - [#2072](https://github.com/wasmerio/wasmer/pull/2072) Add `wasm_config_set_target`, along with `wasm_target_t`, `wasm_triple_t` and `wasm_cpu_features_t` in the unstable C API.
 - [#2059](https://github.com/wasmerio/wasmer/pull/2059) Ability to capture `stdout` and `stderr` with WASI in the C API.
 - [#2040](https://github.com/wasmerio/wasmer/pull/2040) Add `InstanceHandle::vmoffsets` to expose the offsets of the `vmctx` region.
-- [#2026](https://github.com/wasmerio/wasmer/pull/2010) Expose trap code of a `RuntimeError`, if it's a `Trap`.
+- [#2026](https://github.com/wasmerio/wasmer/pull/2026) Expose trap code of a `RuntimeError`, if it's a `Trap`.
 - [#2054](https://github.com/wasmerio/wasmer/pull/2054) Add `wasm_config_delete` to the Wasm C API.
 - [#2072](https://github.com/wasmerio/wasmer/pull/2072) Added cross-compilation to Wasm C API.
 
 ### Changed
+- [#2085](https://github.com/wasmerio/wasmer/pull/2085) Update to latest inkwell and LLVM 11.
 - [#2037](https://github.com/wasmerio/wasmer/pull/2037) Improved parallelism of LLVM with the Native/Object engine
 - [#2012](https://github.com/wasmerio/wasmer/pull/2012) Refactor Singlepass init stack assembly (more performant now)
 - [#2036](https://github.com/wasmerio/wasmer/pull/2036) Optimize memory allocated for Function type definitions
 - [#2083](https://github.com/wasmerio/wasmer/pull/2083) Mark `wasi_env_set_instance` and `wasi_env_set_memory` as deprecated. You may simply remove the calls with no side-effect.
 - [#2056](https://github.com/wasmerio/wasmer/pull/2056) Change back to depend on the `enumset` crate instead of `wasmer_enumset`
 
 ### Fixed
+- [#2066](https://github.com/wasmerio/wasmer/pull/2066) Include 'extern "C"' in our C headers when included by C++ code.
 - [#2090](https://github.com/wasmerio/wasmer/pull/2090) `wasi_env_t` needs to be freed with `wasi_env_delete` in the C API.
 - [#2084](https://github.com/wasmerio/wasmer/pull/2084) Avoid calling the function environment finalizer more than once when the environment has been cloned in the C API.
 - [#2069](https://github.com/wasmerio/wasmer/pull/2069) Use the new documentation for `include/README.md` in the Wasmer package.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-workspace"
-version = "1.0.1"
+version = "1.0.2"
 description = "Wasmer workspace"
 authors = ["Wasmer Engineering Team <[email protected]>"]
 repository = "https://github.com/wasmerio/wasmer"
@@ -10,21 +10,21 @@ publish = false
 autoexamples = false
 
 [dependencies]
-wasmer = { version = "1.0.1", path = "lib/api", default-features = false }
-wasmer-compiler = { version = "1.0.1", path = "lib/compiler" }
-wasmer-compiler-cranelift = { version = "1.0.1", path = "lib/compiler-cranelift", optional = true }
-wasmer-compiler-singlepass = { version = "1.0.1", path = "lib/compiler-singlepass", optional = true }
-wasmer-compiler-llvm = { version = "1.0.1", path = "lib/compiler-llvm", optional = true }
-wasmer-emscripten = { version = "1.0.1", path = "lib/emscripten", optional = true }
-wasmer-engine = { version = "1.0.1", path = "lib/engine" }
-wasmer-engine-jit = { version = "1.0.1", path = "lib/engine-jit", optional = true }
-wasmer-engine-native = { version = "1.0.1", path = "lib/engine-native", optional = true }
-wasmer-engine-object-file = { version = "1.0.1", path = "lib/engine-object-file", optional = true }
-wasmer-wasi = { version = "1.0.1", path = "lib/wasi", optional = true }
-wasmer-wast = { version = "1.0.1", path = "tests/lib/wast", optional = true }
-wasmer-cache = { version = "1.0.1", path = "lib/cache", optional = true }
-wasmer-types = { version = "1.0.1", path = "lib/wasmer-types" }
-wasmer-middlewares = { version = "1.0.1", path = "lib/middlewares", optional = true }
+wasmer = { version = "1.0.2", path = "lib/api", default-features = false }
+wasmer-compiler = { version = "1.0.2", path = "lib/compiler" }
+wasmer-compiler-cranelift = { version = "1.0.2", path = "lib/compiler-cranelift", optional = true }
+wasmer-compiler-singlepass = { version = "1.0.2", path = "lib/compiler-singlepass", optional = true }
+wasmer-compiler-llvm = { version = "1.0.2", path = "lib/compiler-llvm", optional = true }
+wasmer-emscripten = { version = "1.0.2", path = "lib/emscripten", optional = true }
+wasmer-engine = { version = "1.0.2", path = "lib/engine" }
+wasmer-engine-jit = { version = "1.0.2", path = "lib/engine-jit", optional = true }
+wasmer-engine-native = { version = "1.0.2", path = "lib/engine-native", optional = true }
+wasmer-engine-object-file = { version = "1.0.2", path = "lib/engine-object-file", optional = true }
+wasmer-wasi = { version = "1.0.2", path = "lib/wasi", optional = true }
+wasmer-wast = { version = "1.0.2", path = "tests/lib/wast", optional = true }
+wasmer-cache = { version = "1.0.2", path = "lib/cache", optional = true }
+wasmer-types = { version = "1.0.2", path = "lib/wasmer-types" }
+wasmer-middlewares = { version = "1.0.2", path = "lib/middlewares", optional = true }
 cfg-if = "1.0"
 
 [workspace]

diff --git a/lib/api/Cargo.toml b/lib/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer"
-version = "1.0.1"
+version = "1.0.2"
 description = "High-performant WebAssembly runtime"
 categories = ["wasm"]
 keywords = ["wasm", "webassembly", "runtime", "vm"]
@@ -11,16 +11,16 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmer-vm = { path = "../vm", version = "1.0.1" }
-wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "1.0.1", optional = true }
-wasmer-compiler-cranelift = { path = "../compiler-cranelift", version = "1.0.1", optional = true }
-wasmer-compiler-llvm = { path = "../compiler-llvm", version = "1.0.1", optional = true }
-wasmer-compiler = { path = "../compiler", version = "1.0.1" }
-wasmer-derive = { path = "../derive", version = "1.0.1" }
-wasmer-engine = { path = "../engine", version = "1.0.1" }
-wasmer-engine-jit = { path = "../engine-jit", version = "1.0.1", optional = true }
-wasmer-engine-native = { path = "../engine-native", version = "1.0.1", optional = true }
-wasmer-types = { path = "../wasmer-types", version = "1.0.1" }
+wasmer-vm = { path = "../vm", version = "1.0.2" }
+wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "1.0.2", optional = true }
+wasmer-compiler-cranelift = { path = "../compiler-cranelift", version = "1.0.2", optional = true }
+wasmer-compiler-llvm = { path = "../compiler-llvm", version = "1.0.2", optional = true }
+wasmer-compiler = { path = "../compiler", version = "1.0.2" }
+wasmer-derive = { path = "../derive", version = "1.0.2" }
+wasmer-engine = { path = "../engine", version = "1.0.2" }
+wasmer-engine-jit = { path = "../engine-jit", version = "1.0.2", optional = true }
+wasmer-engine-native = { path = "../engine-native", version = "1.0.2", optional = true }
+wasmer-types = { path = "../wasmer-types", version = "1.0.2" }
 indexmap = { version = "1.4", features = ["serde-1"] }
 cfg-if = "0.1"
 wat = { version = "1.0", optional = true }

diff --git a/lib/c-api/Cargo.toml b/lib/c-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-c-api"
-version = "1.0.1"
+version = "1.0.2"
 description = "Wasmer C API library"
 categories = ["wasm", "api-bindings"]
 keywords = ["wasm", "webassembly", "runtime"]
@@ -15,18 +15,18 @@ edition = "2018"
 crate-type = ["cdylib", "rlib", "staticlib"]
 
 [dependencies]
-wasmer = { version = "1.0.1", path = "../api", default-features = false }
-wasmer-compiler = { version = "1.0.1", path = "../compiler" }
-wasmer-compiler-cranelift = { version = "1.0.1", path = "../compiler-cranelift", optional = true }
-wasmer-compiler-singlepass = { version = "1.0.1", path = "../compiler-singlepass", optional = true }
-wasmer-compiler-llvm = { version = "1.0.1", path = "../compiler-llvm", optional = true }
-wasmer-emscripten = { version = "1.0.1", path = "../emscripten", optional = true }
-wasmer-engine = { version = "1.0.1", path = "../engine" }
-wasmer-engine-jit = { version = "1.0.1", path = "../engine-jit", optional = true }
-wasmer-engine-native = { version = "1.0.1", path = "../engine-native", optional = true }
-wasmer-engine-object-file = { version = "1.0.1", path = "../engine-object-file", optional = true }
-wasmer-wasi = { version = "1.0.1", path = "../wasi", optional = true }
-wasmer-types = { version = "1.0.1", path = "../wasmer-types" }
+wasmer = { version = "1.0.2", path = "../api", default-features = false }
+wasmer-compiler = { version = "1.0.2", path = "../compiler" }
+wasmer-compiler-cranelift = { version = "1.0.2", path = "../compiler-cranelift", optional = true }
+wasmer-compiler-singlepass = { version = "1.0.2", path = "../compiler-singlepass", optional = true }
+wasmer-compiler-llvm = { version = "1.0.2", path = "../compiler-llvm", optional = true }
+wasmer-emscripten = { version = "1.0.2", path = "../emscripten", optional = true }
+wasmer-engine = { version = "1.0.2", path = "../engine" }
+wasmer-engine-jit = { version = "1.0.2", path = "../engine-jit", optional = true }
+wasmer-engine-native = { version = "1.0.2", path = "../engine-native", optional = true }
+wasmer-engine-object-file = { version = "1.0.2", path = "../engine-object-file", optional = true }
+wasmer-wasi = { version = "1.0.2", path = "../wasi", optional = true }
+wasmer-types = { version = "1.0.2", path = "../wasmer-types" }
 enumset = "1.0"
 cfg-if = "1.0"
 lazy_static = "1.4"
@@ -38,7 +38,7 @@ typetag = { version = "0.1", optional = true }
 paste = "1.0"
 # for generating code in the same way thot the wasm-c-api does
 # Commented out for now until we can find a solution to the exported function problem
-# wasmer-wasm-c-api = { version = "1.0.1", path = "crates/wasm-c-api" }
+# wasmer-wasm-c-api = { version = "1.0.2", path = "crates/wasm-c-api" }
 
 [dev-dependencies]
 inline-c = "0.1.4"

diff --git a/lib/c-api/wasmer.h b/lib/c-api/wasmer.h
@@ -32,10 +32,10 @@
 #define WASMER_WASI_ENABLED
 
 // This file corresponds to the following Wasmer version.
-#define WASMER_VERSION "1.0.1"
+#define WASMER_VERSION "1.0.2"
 #define WASMER_VERSION_MAJOR 1
 #define WASMER_VERSION_MINOR 0
-#define WASMER_VERSION_PATCH 1
+#define WASMER_VERSION_PATCH 2
 #define WASMER_VERSION_PRE ""
 
 #endif // WASMER_H_PRELUDE