Merge branch 'master' into feature/serialization-of-wasi-state

.azure/install-llvm.yml

@@ -31,20 +31,21 @@ steps:
 
   - bash: |
       set -ex
-      if [ -x "`command -v llvm-config`" ]; then
-        echo `command -v cmake` `llvm-config --version` installed
-      else
-        curl -OL https://github.com/wasmerio/windows-llvm-build/releases/download/v8.0.0/llvm-8.0.0-install.zip
-        7z x llvm-8.0.0-install.zip
-        LLVM_PATH=`pwd`/llvm-8.0.0-install
-        LLVM_PATH_WIN=$SYSTEM_DEFAULTWORKINGDIRECTORY\\llvm-8.0.0-install
-        echo "##vso[task.prependpath]$LLVM_PATH/bin"
-        echo "##vso[task.setvariable variable=LLVM_SYS_80_PREFIX]$LLVM_PATH_WIN"
-        # chocolatey install cmake --installargs 'ADD_CMAKE_TO_PATH=System'
-      fi
+      curl -OL https://github.com/wasmerio/windows-llvm-build/releases/download/v8.0.0/llvm-8.0.0-install.zip
+      7z x llvm-8.0.0-install.zip
+      llvm=`pwd`/llvm-8.0.0-install
+      echo "##vso[task.prependpath]$llvm/bin"
+      echo "##vso[task.setvariable variable=LLVM_SYS_80_PREFIX;]$llvm"
     displayName: "Install LLVM (Windows)"
     condition: eq(variables['Agent.OS'], 'Windows_NT')
 
+  # Just to make sure the paths and vars are set properly
+  - powershell: |
+      Write-Host "##vso[task.prependpath]$pwd/llvm-8.0.0-install/bin"
+      Write-Host "##vso[task.setvariable variable=LLVM_SYS_80_PREFIX;]$pwd/llvm-8.0.0-install/"
+    displayName: Install LLVM (Windows)
+    condition: eq(variables['Agent.OS'], 'Windows_NT')
+
   - bash: |
       set -ex
       env

.azure/install-rust.yml

@@ -6,6 +6,15 @@
 # Wasm-bindgen template: https://github.com/rustwasm/wasm-bindgen/blob/master/ci/azure-install-rust.yml
 
 steps:
+  # - bash: |
+  #     set -ex
+  #     brew install [email protected] curl
+  #     brew link [email protected] --force
+  #     echo "##vso[task.prependpath]/usr/local/opt/openssl/bin"
+  #     echo "##vso[task.setvariable variable=LDFLAGS;]-L/usr/local/opt/openssl/lib"
+  #     echo "##vso[task.setvariable variable=CPPFLAGS;]-I/usr/local/opt/openssl/include"
+  #   displayName: "Fix Cargo SSL (macOS)"
+  #   condition: eq(variables['Agent.OS'], 'Darwin')
   - bash: |
       set -ex
       if [ -x "`command -v rustup`" ]; then
@@ -15,24 +24,24 @@ steps:
         echo "##vso[task.prependpath]$HOME/.cargo/bin"
       fi
     displayName: "Install Rust (Linux, macOS)"
-    condition: not(eq(variables['Agent.OS'], 'Windows_NT'))
+    condition: ne(variables['Agent.OS'], 'Windows_NT')
 
-  - bash: |
-      set -ex
-      if [ -x "`command -v rustup`" ]; then
-        echo `command -v rustup` `rustup -V` installed
-      else
-        choco install rust -y
-        # curl -sSf -o rustup-init.exe https://win.rustup.rs
-        # ./rustup-init.exe -y --default-toolchain $RUST_TOOLCHAIN
-        # echo "##vso[task.prependpath]$USERPROFILE/.cargo/bin"
-      fi
-    displayName: "Install Rust (Windows)"
-    condition: eq(variables['Agent.OS'], 'Windows_NT')
+  # - bash: |
+  #     set -ex
+  #     if [ -x "`command -v rustup`" ]; then
+  #       echo `command -v rustup` `rustup -V` installed
+  #     else
+  #       choco install rust -y
+  #       # curl -sSf -o rustup-init.exe https://win.rustup.rs
+  #       # ./rustup-init.exe -y --default-toolchain $RUST_TOOLCHAIN
+  #       # echo "##vso[task.prependpath]$USERPROFILE/.cargo/bin"
+  #     fi
+  #   displayName: "Install Rust (Windows)"
+  #   condition: eq(variables['Agent.OS'], 'Windows_NT')
 
   - bash: |
       set -ex
-      rustup update $RUST_TOOLCHAIN
+      rustup update --no-self-update $RUST_TOOLCHAIN
       rustup default $RUST_TOOLCHAIN
 
       rustc -Vv

.azure/install-sccache.yml

@@ -28,10 +28,17 @@ steps:
   - bash: |
       set -ex
       env
+      mkdir -p $SCCACHE_DIR
       SCCACHE_ERROR_LOG=`pwd`/sccache.log RUST_LOG=debug $RUSTC_WRAPPER --start-server
       $RUSTC_WRAPPER -s
       cat sccache.log
     displayName: "start sccache"
     env:
       SCCACHE_AZURE_CONNECTION_STRING: $(SCCACHE_AZURE_CONNECTION_STRING)
       SCCACHE_AZURE_BLOB_CONTAINER: $(SCCACHE_AZURE_BLOB_CONTAINER)
+      SCCACHE_DIR: $(Pipeline.Workspace)/.sccache
+  - task: CacheBeta@0
+    inputs:
+      key: sccache | $(Agent.OS) | Cargo.lock
+      path: $(Pipeline.Workspace)/.sccache
+    displayName: Cache Cargo Target

Cargo.toml

@@ -99,6 +99,7 @@ backend-singlepass = [
     "wasmer-wasi-tests/singlepass"
 ]
 wasi = ["wasmer-wasi"]
+managed = ["backend-singlepass", "wasmer-runtime-core/managed"]
 # vfs = ["wasmer-runtime-abi"]
 
 [[example]]

Makefile

@@ -1,4 +1,4 @@
-.PHONY: spectests emtests clean build install lint precommit
+.PHONY: spectests emtests clean build install lint precommit docs
 
 # Generate files
 generate-spectests:
@@ -97,9 +97,11 @@ llvm: spectests-llvm emtests-llvm wasitests-llvm
 capi:
 	cargo build --release
 	cargo build -p wasmer-runtime-c-api --release
+
+test-capi: capi
 	cargo test -p wasmer-runtime-c-api --release
 
-test-rest: capi
+test-rest:
 	cargo test --release --all --exclude wasmer-runtime-c-api --exclude wasmer-emscripten --exclude wasmer-spectests --exclude wasmer-wasi --exclude wasmer-middleware-common --exclude wasmer-middleware-common-tests --exclude wasmer-singlepass-backend --exclude wasmer-clif-backend --exclude wasmer-llvm-backend --exclude wasmer-wasi-tests --exclude wasmer-emscripten-tests
 
 circleci-clean:
@@ -182,3 +184,6 @@ publish-release:
 # must install graphviz for `dot`
 dep-graph:
 	cargo deps --optional-deps --filter wasmer-wasi wasmer-wasi-tests wasmer-kernel-loader wasmer-dev-utils wasmer-llvm-backend wasmer-emscripten wasmer-emscripten-tests wasmer-runtime-core wasmer-runtime wasmer-middleware-common wasmer-middleware-common-tests wasmer-singlepass-backend wasmer-clif-backend wasmer --manifest-path Cargo.toml | dot -Tpng > wasmer_depgraph.png
+
+docs:
+	cargo doc --features=backend-singlepass,backend-llvm,wasi,managed