Merge branch 'master' into c-api-extract-instance_context-from-instance

2024-12-12 22:05:33 +00:00 · 2019-08-01 08:54:52 +03:00 · 2019-08-01 08:54:52 +03:00 · 3a84288fd9
commit 3a84288fd9
parent dd91a8208a 2b6e58962b
35 changed files with 247 additions and 193 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -47,16 +47,17 @@ install:
 #  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

 build_script:
-  - cargo build --release --verbose
-  - git submodule init
-  - git submodule update
-  - if %APPVEYOR_REPO_BRANCH%==master cargo build --release --manifest-path wapm-cli/Cargo.toml --features "telemetry update-notifications"
+  - cargo build --release --verbose --features backend-llvm
  - cargo build --release --manifest-path lib/runtime-c-api/Cargo.toml

 test_script:
  - cargo test --manifest-path lib/spectests/Cargo.toml --features clif

 before_deploy:
+  - appveyor PushArtifact target\release\wasmer_runtime_c_api.dll
+  - git submodule init
+  - git submodule update
+  - cargo build --release --manifest-path wapm-cli/Cargo.toml --features "telemetry update-notifications"
  - cd ./src/installer
  - iscc wasmer.iss
  - copy /y .\WasmerInstaller.exe ..\..\WasmerInstaller-%APPVEYOR_REPO_TAG_NAME%.exe
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -75,9 +75,6 @@ jobs:
            make cranelift
            make llvm
            make test-rest
-      - run:
-          name: Release
-          command: make release-fast
      - run:
          name: Integration Tests
          command: make integration-tests
@ -116,10 +113,8 @@ jobs:
          command: |
            make check
            make compile-bench-singlepass
-            # TODO: add compile-bench-llvm and compile-bench-clif when they work
-      - run:
-          name: Release
-          command: make release-fast
+            make compile-bench-llvm
+            # TODO: add compile-bench-clif when it works
      - run:
          name: Integration Tests
          command: make integration-tests
@ -195,11 +190,6 @@ jobs:
            export PATH="$HOME/.cargo/bin:$PATH"
            export LLVM_SYS_80_PREFIX="`pwd`/clang+llvm-8.0.0-x86_64-apple-darwin/"
            make check
-      - run:
-          name: Release
-          command: |
-            export PATH="$HOME/.cargo/bin:$PATH"
-            make release-fast
      - run:
          name: Integration Tests
          command: |
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,9 @@ All PRs to the Wasmer repository must add to this file.
 Blocks of changes will separated by version increments.

 ## **[Unreleased]**
+
+## 0.6.0 - 2019-07-31
+- [#603](https://github.com/wasmerio/wasmer/pull/603) Update Wapm-cli, bump version numbers
 - [#595](https://github.com/wasmerio/wasmer/pull/595) Add unstable public API for interfacing with the WASI file system in plugin-like usecases
 - [#598](https://github.com/wasmerio/wasmer/pull/598) LLVM Backend is now supported in Windows
 - [#599](https://github.com/wasmerio/wasmer/pull/599) Fix llvm backend failures in fat spec tests and simd_binaryen spec test.
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1390,7 +1390,7 @@ dependencies = [

 [[package]]
 name = "wasmer"
-version = "0.5.7"
+version = "0.6.0"
 dependencies = [
 "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1399,23 +1399,23 @@ dependencies = [
 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
 "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmer-clif-backend 0.5.7",
- "wasmer-dev-utils 0.5.7",
- "wasmer-emscripten 0.5.7",
- "wasmer-emscripten-tests 0.5.7",
+ "wasmer-clif-backend 0.6.0",
+ "wasmer-dev-utils 0.6.0",
+ "wasmer-emscripten 0.6.0",
+ "wasmer-emscripten-tests 0.6.0",
 "wasmer-kernel-loader 0.1.0",
- "wasmer-llvm-backend 0.5.7",
- "wasmer-middleware-common 0.5.7",
- "wasmer-runtime 0.5.7",
- "wasmer-runtime-core 0.5.7",
- "wasmer-singlepass-backend 0.5.7",
- "wasmer-wasi 0.5.7",
- "wasmer-wasi-tests 0.5.7",
+ "wasmer-llvm-backend 0.6.0",
+ "wasmer-middleware-common 0.6.0",
+ "wasmer-runtime 0.6.0",
+ "wasmer-runtime-core 0.6.0",
+ "wasmer-singlepass-backend 0.6.0",
+ "wasmer-wasi 0.6.0",
+ "wasmer-wasi-tests 0.6.0",
 ]

 [[package]]
 name = "wasmer-clif-backend"
-version = "0.5.7"
+version = "0.6.0"
 dependencies = [
 "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "cranelift-codegen 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1430,17 +1430,17 @@ dependencies = [
 "serde_bytes 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
 "target-lexicon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmer-clif-fork-frontend 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmer-clif-fork-wasm 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmer-runtime-core 0.5.7",
- "wasmer-win-exception-handler 0.5.7",
- "wasmparser 0.34.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmer-clif-fork-frontend 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmer-clif-fork-wasm 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmer-runtime-core 0.6.0",
+ "wasmer-win-exception-handler 0.6.0",
+ "wasmparser 0.35.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wasmer-clif-fork-frontend"
-version = "0.32.0"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cranelift-codegen 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1450,7 +1450,7 @@ dependencies = [

 [[package]]
 name = "wasmer-clif-fork-wasm"
-version = "0.32.0"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cranelift-codegen 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1458,20 +1458,20 @@ dependencies = [
 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmer-clif-fork-frontend 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmparser 0.34.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmer-clif-fork-frontend 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmparser 0.35.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wasmer-dev-utils"
-version = "0.5.7"
+version = "0.6.0"
 dependencies = [
 "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wasmer-emscripten"
-version = "0.5.7"
+version = "0.6.0"
 dependencies = [
 "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1479,21 +1479,21 @@ dependencies = [
 "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmer-runtime-core 0.5.7",
+ "wasmer-runtime-core 0.6.0",
 ]

 [[package]]
 name = "wasmer-emscripten-tests"
-version = "0.5.7"
+version = "0.6.0"
 dependencies = [
 "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmer-clif-backend 0.5.7",
- "wasmer-dev-utils 0.5.7",
- "wasmer-emscripten 0.5.7",
- "wasmer-llvm-backend 0.5.7",
- "wasmer-runtime-core 0.5.7",
- "wasmer-singlepass-backend 0.5.7",
+ "wasmer-clif-backend 0.6.0",
+ "wasmer-dev-utils 0.6.0",
+ "wasmer-emscripten 0.6.0",
+ "wasmer-llvm-backend 0.6.0",
+ "wasmer-runtime-core 0.6.0",
+ "wasmer-singlepass-backend 0.6.0",
 ]

 [[package]]
@ -1501,12 +1501,12 @@ name = "wasmer-kernel-loader"
 version = "0.1.0"
 dependencies = [
 "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmer-runtime-core 0.5.7",
+ "wasmer-runtime-core 0.6.0",
 ]

 [[package]]
 name = "wasmer-llvm-backend"
-version = "0.5.7"
+version = "0.6.0"
 dependencies = [
 "capstone 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1521,51 +1521,51 @@ dependencies = [
 "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmer-runtime-core 0.5.7",
- "wasmparser 0.34.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmer-runtime-core 0.6.0",
+ "wasmparser 0.35.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wasmer-middleware-common"
-version = "0.5.7"
+version = "0.6.0"
 dependencies = [
 "criterion 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmer-clif-backend 0.5.7",
- "wasmer-llvm-backend 0.5.7",
- "wasmer-runtime-core 0.5.7",
- "wasmer-singlepass-backend 0.5.7",
+ "wasmer-clif-backend 0.6.0",
+ "wasmer-llvm-backend 0.6.0",
+ "wasmer-runtime-core 0.6.0",
+ "wasmer-singlepass-backend 0.6.0",
 ]

 [[package]]
 name = "wasmer-runtime"
-version = "0.5.7"
+version = "0.6.0"
 dependencies = [
 "criterion 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmer-clif-backend 0.5.7",
- "wasmer-llvm-backend 0.5.7",
- "wasmer-runtime-core 0.5.7",
- "wasmer-singlepass-backend 0.5.7",
+ "wasmer-clif-backend 0.6.0",
+ "wasmer-llvm-backend 0.6.0",
+ "wasmer-runtime-core 0.6.0",
+ "wasmer-singlepass-backend 0.6.0",
 ]

 [[package]]
 name = "wasmer-runtime-c-api"
-version = "0.5.7"
+version = "0.6.0"
 dependencies = [
 "cbindgen 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmer-runtime 0.5.7",
- "wasmer-runtime-core 0.5.7",
+ "wasmer-runtime 0.6.0",
+ "wasmer-runtime-core 0.6.0",
 ]

 [[package]]
 name = "wasmer-runtime-core"
-version = "0.5.7"
+version = "0.6.0"
 dependencies = [
 "bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "blake2b_simd 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1588,13 +1588,13 @@ dependencies = [
 "serde_bytes 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmparser 0.34.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmparser 0.35.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wasmer-singlepass-backend"
-version = "0.5.7"
+version = "0.6.0"
 dependencies = [
 "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1605,24 +1605,24 @@ dependencies = [
 "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)",
 "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmer-runtime-core 0.5.7",
- "wasmparser 0.34.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmer-runtime-core 0.6.0",
+ "wasmparser 0.35.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wasmer-spectests"
-version = "0.5.7"
+version = "0.6.0"
 dependencies = [
 "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmer-clif-backend 0.5.7",
- "wasmer-llvm-backend 0.5.7",
- "wasmer-runtime-core 0.5.7",
- "wasmer-singlepass-backend 0.5.7",
+ "wasmer-clif-backend 0.6.0",
+ "wasmer-llvm-backend 0.6.0",
+ "wasmer-runtime-core 0.6.0",
+ "wasmer-singlepass-backend 0.6.0",
 ]

 [[package]]
 name = "wasmer-wasi"
-version = "0.5.7"
+version = "0.6.0"
 dependencies = [
 "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "generational-arena 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1630,38 +1630,38 @@ dependencies = [
 "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmer-runtime-core 0.5.7",
+ "wasmer-runtime-core 0.6.0",
 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wasmer-wasi-tests"
-version = "0.5.7"
+version = "0.6.0"
 dependencies = [
 "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmer-clif-backend 0.5.7",
- "wasmer-dev-utils 0.5.7",
- "wasmer-llvm-backend 0.5.7",
- "wasmer-runtime-core 0.5.7",
- "wasmer-singlepass-backend 0.5.7",
- "wasmer-wasi 0.5.7",
+ "wasmer-clif-backend 0.6.0",
+ "wasmer-dev-utils 0.6.0",
+ "wasmer-llvm-backend 0.6.0",
+ "wasmer-runtime-core 0.6.0",
+ "wasmer-singlepass-backend 0.6.0",
+ "wasmer-wasi 0.6.0",
 ]

 [[package]]
 name = "wasmer-win-exception-handler"
-version = "0.5.7"
+version = "0.6.0"
 dependencies = [
 "bindgen 0.46.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "cmake 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmer-runtime-core 0.5.7",
+ "wasmer-runtime-core 0.6.0",
 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wasmparser"
-version = "0.34.0"
+version = "0.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -1895,9 +1895,9 @@ dependencies = [
 "checksum wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d07edd40d190ddcbd0113c2150ccb214f47a02ff36958630ba0e5b8138ece1c1"
 "checksum wabt-sys 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b064c81821100adb4b71923cecfc67fef083db21c3bbd454b0162c7ffe63eeaa"
 "checksum walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d9d7ed3431229a144296213105a390676cc49c9b6a72bd19f3176c98e129fa1"
-"checksum wasmer-clif-fork-frontend 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be2e38b16377f93ac485b6045fdc135dd3f165d25d4992e7b67c5cbc3ca8c760"
-"checksum wasmer-clif-fork-wasm 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "88becfcf874d7587750e1a1c30c47a16ed220f28c433c4b81db4c4626455a6a1"
-"checksum wasmparser 0.34.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8030ec5a7c242a91941947fdb752e9a7c0929aced954ea23c54dad1cd2611850"
+"checksum wasmer-clif-fork-frontend 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bd6bec1587a3b11222f4ff129fd119785713c41de413f54f99d3c03743812f4"
+"checksum wasmer-clif-fork-wasm 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8f323e612fe2549391255a09f89c927d7feb0ec4bf0c2cad9e3c089bdca42fc"
+"checksum wasmparser 0.35.1 (registry+https://github.com/rust-lang/crates.io-index)" = "29f51d6103c622680dc4e17fb8173371efda8e529d97a2ba10ddf847d07705f8"
 "checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "wasmer"
-version = "0.5.7"
+version = "0.6.0"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
 edition = "2018"
 repository = "https://github.com/wasmerio/wasmer"
--- a/4
+++ b/4
@ -104,7 +104,7 @@ test: spectests emtests middleware wasitests circleci-clean test-rest


 # Integration tests
-integration-tests: release-fast
+integration-tests: release-clif
 	echo "Running Integration Tests"
 	./integration_tests/lua/test.sh
 	./integration_tests/nginx/test.sh
@ -130,7 +130,7 @@ release:
 	cargo build --release --features backend-singlepass,backend-llvm,loader-kernel

 # Only one backend (cranelift)
-release-fast:
+release-clif:
 	# If you are in OS-X, you will need mingw-w64 for cross compiling to windows
 	# brew install mingw-w64
 	cargo build --release
--- a/README.md
+++ b/README.md
@ -29,10 +29,13 @@ Install Wasmer with:
 curl https://get.wasmer.io -sSfL | sh
 ```

+> Note: *Wasmer is also available on Windows. Download the [`WasmerInstaller.exe` from the Github Releases](https://github.com/wasmerio/wasmer/releases) page.*
+
 Wasmer runtime can also be embedded in different languages, so you can use WebAssembly anywhere ✨:

-* [🦀 **Rust**](https://github.com/wasmerio/wasmer-rust-example)
-* [**C/C++**](https://github.com/wasmerio/wasmer-c-api)
+* [**🦀 Rust**](https://github.com/wasmerio/wasmer-rust-example)
+* [**🔗 C/C++**](https://github.com/wasmerio/wasmer-c-api)
+* [**#️⃣ C#**](https://github.com/migueldeicaza/WasmerSharp)
 * [**🐘 PHP**](https://github.com/wasmerio/php-ext-wasm)
 * [**🐍 Python**](https://github.com/wasmerio/python-ext-wasm)
 * [**💎 Ruby**](https://github.com/wasmerio/ruby-ext-wasm)
@ -82,7 +85,7 @@ Wasmer is structured into different directories:

 Building Wasmer requires [rustup](https://rustup.rs/).

-To build on Windows, download and run [`rustup-init.exe`](https://win.rustup.rs/)
+To build Wasmer on Windows, download and run [`rustup-init.exe`](https://win.rustup.rs/)
 then follow the onscreen instructions.

 To build on other systems, run:
@ -146,8 +149,8 @@ pkg install cmake

 #### Windows (MSVC)

-Windows support is _highly experimental_. Only simple Wasm programs may be run, and no syscalls are allowed. This means
-nginx and Lua do not work on Windows. See [this issue](https://github.com/wasmerio/wasmer/issues/176) regarding Emscripten syscall polyfills for Windows.
+Windows support is _experimental_. WASI is fully supported, but Emscripten support is on the works (this means
+nginx and Lua do not work on Windows - you can track the progress on [this issue](https://github.com/wasmerio/wasmer/issues/176)).

 1. Install [Visual Studio](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community&rel=15)

@ -181,8 +184,14 @@ git clone https://github.com/wasmerio/wasmer.git
 cd wasmer

 # install tools
-# make sure that `python` is accessible.
-make install
+make release-clif # To build with cranelift (default)
+
+make release-llvm # To build with llvm support
+
+make release-singlepass # To build with singlepass support
+
+# or
+make release # To build with singlepass, cranelift and llvm support
 ```

 ## Testing
@ -240,7 +249,7 @@ Below are some of the goals of this project (in order of priority):

 ## Architecture

-If you would like to know how Wasmer works under the hood, please see [ARCHITECTURE.md](./ARCHITECTURE.md).
+If you would like to know how Wasmer works under the hood, please see [docs/architecture.md](./docs/architecture.md).

 ## License

--- a/docs/architecture.md
+++ b/docs/architecture.md
--- a/lib/clif-backend/Cargo.toml
+++ b/lib/clif-backend/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "wasmer-clif-backend"
-version = "0.5.7"
+version = "0.6.0"
 description = "Wasmer runtime Cranelift compiler backend"
 license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -9,15 +9,15 @@ edition = "2018"
 readme = "README.md"

 [dependencies]
-wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" }
+wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" }
 cranelift-native = { version = "0.31" }
 cranelift-codegen = { version = "0.31" }
 cranelift-entity = { version = "0.31" }
-cranelift-frontend = { package = "wasmer-clif-fork-frontend", version = "0.32" }
-cranelift-wasm = { package = "wasmer-clif-fork-wasm", version = "0.32" }
+cranelift-frontend = { package = "wasmer-clif-fork-frontend", version = "0.33" }
+cranelift-wasm = { package = "wasmer-clif-fork-wasm", version = "0.33" }
 hashbrown = "0.1"
 target-lexicon = "0.4.0"
-wasmparser = "0.34.0"
+wasmparser = "0.35.1"
 byteorder = "1"
 nix = "0.14.0"
 libc = "0.2.49"
@ -35,7 +35,7 @@ version = "0.0.7"

 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["errhandlingapi", "minwindef", "minwinbase", "winnt"] }
-wasmer-win-exception-handler = { path = "../win-exception-handler", version = "0.5.7" }
+wasmer-win-exception-handler = { path = "../win-exception-handler", version = "0.6.0" }

 [features]
 debug = ["wasmer-runtime-core/debug"]
--- a/lib/dev-utils/Cargo.toml
+++ b/lib/dev-utils/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "wasmer-dev-utils"
-version = "0.5.7"
+version = "0.6.0"
 description = "Wasmer runtime core library"
 license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
--- a/lib/emscripten-tests/Cargo.toml
+++ b/lib/emscripten-tests/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "wasmer-emscripten-tests"
-version = "0.5.7"
+version = "0.6.0"
 description = "Tests for our Emscripten implementation"
 license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -9,15 +9,15 @@ publish = false
 build = "build/mod.rs"

 [dependencies]
-wasmer-emscripten = { path = "../emscripten", version = "0.5.7" }
-wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" }
-wasmer-clif-backend = { path = "../clif-backend", version = "0.5.7" }
-wasmer-llvm-backend = { path = "../llvm-backend", version = "0.5.7", optional = true }
-wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.7", optional = true }
+wasmer-emscripten = { path = "../emscripten", version = "0.6.0" }
+wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" }
+wasmer-clif-backend = { path = "../clif-backend", version = "0.6.0" }
+wasmer-llvm-backend = { path = "../llvm-backend", version = "0.6.0", optional = true }
+wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.6.0", optional = true }

 [dev-dependencies]
 wabt = "0.9.0"
-wasmer-dev-utils = { path = "../dev-utils", version = "0.5.7"}
+wasmer-dev-utils = { path = "../dev-utils", version = "0.6.0"}

 [build-dependencies]
 glob = "0.2.11"
--- a/lib/emscripten/Cargo.toml
+++ b/lib/emscripten/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "wasmer-emscripten"
-version = "0.5.7"
+version = "0.6.0"
 description = "Wasmer runtime emscripten implementation library"
 license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -13,7 +13,7 @@ hashbrown = "0.1"
 lazy_static = "1.2.0"
 libc = "0.2.49"
 time = "0.1.41"
-wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" }
+wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" }

 [target.'cfg(windows)'.dependencies]
 rand = "0.6"
--- a/lib/llvm-backend/Cargo.toml
+++ b/lib/llvm-backend/Cargo.toml
@ -1,13 +1,13 @@
 [package]
 name = "wasmer-llvm-backend"
-version = "0.5.7"
+version = "0.6.0"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
 edition = "2018"
 readme = "README.md"

 [dependencies]
-wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" }
-wasmparser = "0.34.0"
+wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" }
+wasmparser = "0.35.1"
 hashbrown = "0.1.8"
 smallvec = "0.6.8"
 goblin = "0.0.20"
--- a/lib/llvm-backend/src/code.rs
+++ b/lib/llvm-backend/src/code.rs
@ -594,14 +594,6 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
    }

    fn feed_event(&mut self, event: Event, module_info: &ModuleInfo) -> Result<(), CodegenError> {
-        let op = match event {
-            Event::Wasm(x) => x,
-            Event::Internal(_x) => {
-                return Ok(());
-            }
-            Event::WasmOwned(ref x) => x,
-        };
-
        let mut state = &mut self.state;
        let builder = self.builder.as_ref().unwrap();
        let context = self.context.as_ref().unwrap();
@ -612,6 +604,38 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
        let signatures = &self.signatures;
        let mut ctx = self.ctx.as_mut().unwrap();

+        let op = match event {
+            Event::Wasm(x) => x,
+            Event::WasmOwned(ref x) => x,
+            Event::Internal(x) => {
+                match x {
+                    InternalEvent::FunctionBegin(_) | InternalEvent::FunctionEnd => {
+                        return Ok(());
+                    }
+                    InternalEvent::Breakpoint(_callback) => {
+                        return Ok(());
+                    }
+                    InternalEvent::GetInternal(idx) => {
+                        if state.reachable {
+                            let idx = idx as usize;
+                            let field_ptr = ctx.internal_field(idx, intrinsics, builder);
+                            let result = builder.build_load(field_ptr, "get_internal");
+                            state.push1(result);
+                        }
+                    }
+                    InternalEvent::SetInternal(idx) => {
+                        if state.reachable {
+                            let idx = idx as usize;
+                            let field_ptr = ctx.internal_field(idx, intrinsics, builder);
+                            let v = state.pop1()?;
+                            builder.build_store(field_ptr, v);
+                        }
+                    }
+                }
+                return Ok(());
+            }
+        };
+
        if !state.reachable {
            match *op {
                Operator::Block { ty: _ } | Operator::Loop { ty: _ } | Operator::If { ty: _ } => {
--- a/lib/llvm-backend/src/intrinsics.rs
+++ b/lib/llvm-backend/src/intrinsics.rs
@ -18,7 +18,7 @@ use wasmer_runtime_core::{
        GlobalIndex, ImportedFuncIndex, LocalFuncIndex, LocalOrImport, MemoryIndex, SigIndex,
        TableIndex, Type,
    },
-    vm::Ctx,
+    vm::{Ctx, INTERNALS_SIZE},
 };

 fn type_to_llvm_ptr(intrinsics: &Intrinsics, ty: Type) -> PointerType {
@ -942,4 +942,31 @@ impl<'a> CtxType<'a> {

        (imported_func_cache.func_ptr, imported_func_cache.ctx_ptr)
    }
+
+    pub fn internal_field(
+        &mut self,
+        index: usize,
+        intrinsics: &Intrinsics,
+        builder: &Builder,
+    ) -> PointerValue {
+        assert!(index < INTERNALS_SIZE);
+
+        let local_internals_ptr_ptr = unsafe {
+            builder.build_struct_gep(
+                self.ctx_ptr_value,
+                offset_to_index(Ctx::offset_internals()),
+                "local_internals_ptr_ptr",
+            )
+        };
+        let local_internals_ptr = builder
+            .build_load(local_internals_ptr_ptr, "local_internals_ptr")
+            .into_pointer_value();
+        unsafe {
+            builder.build_in_bounds_gep(
+                local_internals_ptr,
+                &[intrinsics.i32_ty.const_int(index as u64, false)],
+                "local_internal_field_ptr",
+            )
+        }
+    }
 }
--- a/lib/middleware-common/Cargo.toml
+++ b/lib/middleware-common/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "wasmer-middleware-common"
-version = "0.5.7"
+version = "0.6.0"
 repository = "https://github.com/wasmerio/wasmer"
 description = "Wasmer runtime common middlewares"
 license = "MIT"
@ -9,9 +9,9 @@ edition = "2018"

 [dependencies]
 wasmer-runtime-core = { path = "../runtime-core" }
-wasmer-clif-backend = { path = "../clif-backend", version = "0.5.7" }
-wasmer-llvm-backend = { path = "../llvm-backend", version = "0.5.7", optional = true }
-wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.7", optional = true }
+wasmer-clif-backend = { path = "../clif-backend", version = "0.6.0" }
+wasmer-llvm-backend = { path = "../llvm-backend", version = "0.6.0", optional = true }
+wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.6.0", optional = true }

 [dev-dependencies]
 wabt = "0.9.0"
--- a/lib/middleware-common/benches/metering_benchmark.rs
+++ b/lib/middleware-common/benches/metering_benchmark.rs
@ -135,16 +135,15 @@ static WAT_GAS: &'static str = r#"

 #[cfg(feature = "llvm")]
 fn get_compiler(limit: u64, metering: bool) -> impl Compiler {
-    use wasmer_llvm_backend::code::LLVMModuleCodeGenerator;
+    use wasmer_llvm_backend::ModuleCodeGenerator;
    use wasmer_runtime_core::codegen::{MiddlewareChain, StreamingCompiler};
-    let c: StreamingCompiler<LLVMModuleCodeGenerator, _, _, _, _> =
-        StreamingCompiler::new(move || {
-            let mut chain = MiddlewareChain::new();
-            if metering {
-                chain.push(Metering::new(limit));
-            }
-            chain
-        });
+    let c: StreamingCompiler<ModuleCodeGenerator, _, _, _, _> = StreamingCompiler::new(move || {
+        let mut chain = MiddlewareChain::new();
+        if metering {
+            chain.push(Metering::new(limit));
+        }
+        chain
+    });

    c
 }
--- a/lib/middleware-common/src/metering.rs
+++ b/lib/middleware-common/src/metering.rs
@ -134,24 +134,22 @@ mod tests {
    use super::*;
    use wabt::wat2wasm;

+    use wasmer_runtime_core::codegen::{MiddlewareChain, StreamingCompiler};
    use wasmer_runtime_core::{backend::Compiler, compile_with, imports, Func};

    #[cfg(feature = "llvm")]
    fn get_compiler(limit: u64) -> impl Compiler {
-        use wasmer_llvm_backend::code::LLVMModuleCodeGenerator;
-        use wasmer_runtime_core::codegen::{MiddlewareChain, StreamingCompiler};
-        let c: StreamingCompiler<LLVMModuleCodeGenerator, _, _, _, _> =
-            StreamingCompiler::new(move || {
-                let mut chain = MiddlewareChain::new();
-                chain.push(Metering::new(limit));
-                chain
-            });
+        use wasmer_llvm_backend::ModuleCodeGenerator as LLVMMCG;
+        let c: StreamingCompiler<LLVMMCG, _, _, _, _> = StreamingCompiler::new(move || {
+            let mut chain = MiddlewareChain::new();
+            chain.push(Metering::new(limit));
+            chain
+        });
        c
    }

    #[cfg(feature = "singlepass")]
    fn get_compiler(limit: u64) -> impl Compiler {
-        use wasmer_runtime_core::codegen::{MiddlewareChain, StreamingCompiler};
        use wasmer_singlepass_backend::ModuleCodeGenerator as SinglePassMCG;
        let c: StreamingCompiler<SinglePassMCG, _, _, _, _> = StreamingCompiler::new(move || {
            let mut chain = MiddlewareChain::new();
--- a/lib/runtime-abi/Cargo.toml
+++ b/lib/runtime-abi/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "wasmer-runtime-abi"
-version = "0.5.7"
+version = "0.6.0"
 description = "Wasmer runtime core library"
 license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
--- a/lib/runtime-c-api/Cargo.toml
+++ b/lib/runtime-c-api/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "wasmer-runtime-c-api"
-version = "0.5.7"
+version = "0.6.0"
 description = "Wasmer C API library"
 license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -16,11 +16,11 @@ libc = "0.2"

 [dependencies.wasmer-runtime]
 path = "../runtime"
-version = "0.5.7"
+version = "0.6.0"

 [dependencies.wasmer-runtime-core]
 path = "../runtime-core"
-version = "0.5.7"
+version = "0.6.0"

 [features]
 debug = ["wasmer-runtime/debug"]
--- a/lib/runtime-c-api/src/error.rs
+++ b/lib/runtime-c-api/src/error.rs
@ -11,7 +11,7 @@ thread_local! {
    static LAST_ERROR: RefCell<Option<Box<Error>>> = RefCell::new(None);
 }

-pub(crate) fn update_last_error<E: Error + 'static>(err: E) {
+pub fn update_last_error<E: Error + 'static>(err: E) {
    LAST_ERROR.with(|prev| {
        *prev.borrow_mut() = Some(Box::new(err));
    });
@ -89,8 +89,8 @@ pub unsafe extern "C" fn wasmer_last_error_message(buffer: *mut c_char, length:
 }

 #[derive(Debug)]
-pub(crate) struct CApiError {
-    pub(crate) msg: String,
+pub struct CApiError {
+    pub msg: String,
 }

 impl Display for CApiError {
--- a/lib/runtime-c-api/src/lib.rs
+++ b/lib/runtime-c-api/src/lib.rs
@ -118,6 +118,6 @@ pub struct wasmer_limit_option_t {

 #[repr(C)]
 pub struct wasmer_byte_array {
-    bytes: *const u8,
-    bytes_len: u32,
+    pub bytes: *const u8,
+    pub bytes_len: u32,
 }
--- a/lib/runtime-core/Cargo.toml
+++ b/lib/runtime-core/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "wasmer-runtime-core"
-version = "0.5.7"
+version = "0.6.0"
 description = "Wasmer runtime core library"
 license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -10,7 +10,7 @@ edition = "2018"
 [dependencies]
 nix = "0.14.0"
 page_size = "0.4.1"
-wasmparser = "0.34.0"
+wasmparser = "0.35.1"
 parking_lot = "0.7.1"
 lazy_static = "1.2.0"
 indexmap = "1.0.2"
--- a/lib/runtime/Cargo.toml
+++ b/lib/runtime/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "wasmer-runtime"
-version = "0.5.7"
+version = "0.6.0"
 description = "Wasmer runtime library"
 license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -9,17 +9,17 @@ edition = "2018"
 readme = "README.md"

 [dependencies]
-wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.7", optional = true }
+wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.6.0", optional = true }
 lazy_static = "1.2.0"
 memmap = "0.7.0"

 [dependencies.wasmer-runtime-core]
 path = "../runtime-core"
-version = "0.5.7"
+version = "0.6.0"

 [dependencies.wasmer-clif-backend]
 path = "../clif-backend"
-version = "0.5.7"
+version = "0.6.0"
 optional = true

 [dev-dependencies]
--- a/lib/singlepass-backend/Cargo.toml
+++ b/lib/singlepass-backend/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "wasmer-singlepass-backend"
-version = "0.5.7"
+version = "0.6.0"
 repository = "https://github.com/wasmerio/wasmer"
 description = "Wasmer runtime single pass compiler backend"
 license = "MIT"
@ -9,8 +9,8 @@ edition = "2018"
 readme = "README.md"

 [dependencies]
-wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" }
-wasmparser = "0.34.0"
+wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" }
+wasmparser = "0.35.1"
 dynasm = "0.3.2"
 dynasmrt = "0.3.1"
 lazy_static = "1.2.0"
--- a/lib/spectests/Cargo.toml
+++ b/lib/spectests/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "wasmer-spectests"
-version = "0.5.7"
+version = "0.6.0"
 description = "Wasmer spectests library"
 license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -9,10 +9,10 @@ edition = "2018"
 build = "build/mod.rs"

 [dependencies]
-wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" }
-wasmer-clif-backend = { path = "../clif-backend", version = "0.5.7" }
-wasmer-llvm-backend = { path = "../llvm-backend", version = "0.5.7", optional = true }
-wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.7", optional = true }
+wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" }
+wasmer-clif-backend = { path = "../clif-backend", version = "0.6.0" }
+wasmer-llvm-backend = { path = "../llvm-backend", version = "0.6.0", optional = true }
+wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.6.0", optional = true }

 [build-dependencies]
 wabt = "0.9.0"
--- a/lib/wasi-tests/Cargo.toml
+++ b/lib/wasi-tests/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "wasmer-wasi-tests"
-version = "0.5.7"
+version = "0.6.0"
 description = "Tests for our WASI implementation"
 license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -9,19 +9,19 @@ publish = false
 build = "build/mod.rs"

 [dependencies]
-wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" }
-wasmer-wasi = { path = "../wasi", version = "0.5.7" }
+wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" }
+wasmer-wasi = { path = "../wasi", version = "0.6.0" }
 # hack to get tests to work
-wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.7", optional = true }
-wasmer-llvm-backend = { path = "../llvm-backend", version = "0.5.7", optional = true }
+wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.6.0", optional = true }
+wasmer-llvm-backend = { path = "../llvm-backend", version = "0.6.0", optional = true }


 [build-dependencies]
 glob = "0.2.11"

 [dev-dependencies]
-wasmer-clif-backend = { path = "../clif-backend", version = "0.5.7" }
-wasmer-dev-utils = { path = "../dev-utils", version = "0.5.7"}
+wasmer-clif-backend = { path = "../clif-backend", version = "0.6.0" }
+wasmer-dev-utils = { path = "../dev-utils", version = "0.6.0"}

 [features]
 clif = []
--- a/lib/wasi/Cargo.toml
+++ b/lib/wasi/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "wasmer-wasi"
-version = "0.5.7"
+version = "0.6.0"
 description = "Wasmer runtime WASI implementation library"
 license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -8,7 +8,7 @@ repository = "https://github.com/wasmerio/wasmer"
 edition = "2018"

 [dependencies]
-wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" }
+wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" }
 libc = "0.2.50"
 rand = "0.6.5"
 # wasmer-runtime-abi = { path = "../runtime-abi" }
--- a/lib/win-exception-handler/Cargo.toml
+++ b/lib/win-exception-handler/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "wasmer-win-exception-handler"
-version = "0.5.7"
+version = "0.6.0"
 description = "Wasmer runtime exception handling for Windows"
 license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -8,7 +8,7 @@ repository = "https://github.com/wasmerio/wasmer"
 edition = "2018"

 [target.'cfg(windows)'.dependencies]
-wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" }
+wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" }
 winapi = { version = "0.3", features = ["winbase", "errhandlingapi", "minwindef", "minwinbase", "winnt"] }
 libc = "0.2.49"

--- a/scripts/update_version_numbers.sh
+++ b/scripts/update_version_numbers.sh
@ -1,10 +1,13 @@
-PREVIOUS_VERSION='0.5.6'
-NEXT_VERSION='0.5.7'
+PREVIOUS_VERSION='0.5.7'
+NEXT_VERSION='0.6.0'

 # quick hack
 fd Cargo.toml --exec sed -i '' "s/version = \"$PREVIOUS_VERSION\"/version = \"$NEXT_VERSION\"/"
 echo "manually check changes to Cargo.toml"

+fd wasmer.iss --exec sed -i '' "s/AppVersion=$PREVIOUS_VERSION/AppVersion=$NEXT_VERSION/"
+echo "manually check changes to wasmer.iss"
+
 # Order to upload packages in
 ## runtime-core
 ## win-exception-handler
--- a/src/installer/media/wizard_logo.ico
+++ b/src/installer/media/wizard_logo.ico
--- a/src/installer/media/wizard_logo_2.bmp
+++ b/src/installer/media/wizard_logo_2.bmp
--- a/src/installer/media/wizard_logo_small.bmp
+++ b/src/installer/media/wizard_logo_small.bmp
--- a/src/installer/wasmer.iss
+++ b/src/installer/wasmer.iss
@ -1,6 +1,6 @@
 [Setup]
 AppName=Wasmer
-AppVersion=0.4.0
+AppVersion=0.6.0
 DefaultDirName={pf}\Wasmer
 DefaultGroupName=Wasmer
 Compression=lzma2
@ -9,9 +9,9 @@ OutputDir=.\
 DisableProgramGroupPage=yes
 ChangesEnvironment=yes
 OutputBaseFilename=WasmerInstaller
-WizardImageFile=..\..\media\wizard_logo_2.bmp
-WizardSmallImageFile=..\..\media\wizard_logo_small.bmp
-SetupIconFile=..\..\media\wizard_logo.ico
+WizardImageFile=media\wizard_logo_2.bmp
+WizardSmallImageFile=media\wizard_logo_small.bmp
+SetupIconFile=media\wizard_logo.ico
 DisableWelcomePage=no

 [Files]
@ -82,4 +82,4 @@ begin
    EnvRemovePath(ExpandConstant('{app}') +'\bin');
    EnvAddPath(ExpandConstant('{%USERPROFILE}') +'\globals\wapm_packages\.bin');
    end
-end;
+end;
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 62ec59a53ca3df84019092a750aeb56e08b9d556
+Subproject commit b157153568fc45f0d01ba8443c54fc3c2ce0cb23