Skip to content

Commit

Permalink
Merge branch 'master' into run-without-run
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark McCaskey committed Nov 20, 2019
2 parents cb7fcb9 + 6831a6d commit b2d19e1
Show file tree
Hide file tree
Showing 38 changed files with 800 additions and 404 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@

## **[Unreleased]**

- [#987](https://github.com/wasmerio/wasmer/pull/987) Fix `runtime-c-api` header files when compiled by gnuc.

## 0.10.2 - 2019-11-18

- [#968](https://github.com/wasmerio/wasmer/pull/968) Added `--invoke` option to the command
- [#964](https://github.com/wasmerio/wasmer/pull/964) Enable cross-compilation for specific target
- [#971](https://github.com/wasmerio/wasmer/pull/971) In LLVM backend, use unaligned loads and stores for non-atomic accesses to wasmer memory.
- [#960](https://github.com/wasmerio/wasmer/pull/960) Fix `runtime-c-api` header files when compiled by clang.
- [#925](https://github.com/wasmerio/wasmer/pull/925) Host functions can be closures with a captured environment.
- [#917](https://github.com/wasmerio/wasmer/pull/917) Host functions (aka imported functions) may not have `&mut vm::Ctx` as first argument, i.e. the presence of the `&mut vm::Ctx` argument is optional.
Expand Down
146 changes: 73 additions & 73 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer"
version = "0.10.1"
version = "0.10.2"
authors = ["The Wasmer Engineering Team <[email protected]>"]
edition = "2018"
repository = "https://github.com/wasmerio/wasmer"
Expand Down
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,12 @@ nginx and Lua do not work on Windows - you can track the progress on [this issue

2. Install [Rust for Windows](https://win.rustup.rs)

3. Install [Python for Windows](https://www.python.org/downloads/release/python-2714/). The Windows x86-64 MSI installer is fine.
Make sure to enable "Add python.exe to Path" during installation.

4. Install [Git for Windows](https://git-scm.com/download/win). Allow it to add `git.exe` to your PATH (default
3. Install [Git for Windows](https://git-scm.com/download/win). Allow it to add `git.exe` to your PATH (default
settings for the installer are fine).

5. Install [CMake](https://cmake.org/download/). Ensure CMake is in your PATH.
4. Install [CMake](https://cmake.org/download/). Ensure CMake is in your PATH.

6. Install [LLVM 8.0](https://prereleases.llvm.org/win-snapshots/LLVM-8.0.0-r351033-win64.exe)
5. Install [LLVM 8.0](https://prereleases.llvm.org/win-snapshots/LLVM-8.0.0-r351033-win64.exe)
</p>
</details>

Expand Down
3 changes: 2 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ jobs:
dependsOn:
- Build_CLI
- Build_Library
condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), startsWith(variables['Build.SourceBranch'], 'refs/tags'))
steps:
# - download: current
- task: DownloadPipelineArtifact@1
Expand Down Expand Up @@ -259,3 +259,4 @@ trigger:
- master
- staging
- trying
- refs/tags/*
2 changes: 1 addition & 1 deletion docs/feature_matrix.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
| - | :-: | :-: | :-: |
| Cranelift Backend ||||
| LLVM Backend ||||
| Singlepass Backend | [#347](https://github.com/wasmerio/wasmer/issues/347) | ||
| Singlepass Backend | || [#347](https://github.com/wasmerio/wasmer/issues/347) |
| WASI |||* |

* `poll_fd` is not fully implemented for Windows yet
Expand Down
6 changes: 3 additions & 3 deletions lib/clif-backend/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer-clif-backend"
version = "0.10.1"
version = "0.10.2"
description = "Wasmer runtime Cranelift compiler backend"
license = "MIT"
authors = ["The Wasmer Engineering Team <[email protected]>"]
Expand All @@ -11,7 +11,7 @@ edition = "2018"
readme = "README.md"

[dependencies]
wasmer-runtime-core = { path = "../runtime-core", version = "0.10.1" }
wasmer-runtime-core = { path = "../runtime-core", version = "0.10.2" }
cranelift-native = "0.44.0"
cranelift-codegen = "0.44.0"
cranelift-entity = "0.44.0"
Expand All @@ -37,7 +37,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.10.1" }
wasmer-win-exception-handler = { path = "../win-exception-handler", version = "0.10.2" }

[features]
debug = ["wasmer-runtime-core/debug"]
Loading

0 comments on commit b2d19e1

Please sign in to comment.