Merge pull request #1286 from wasmerio/wapm-wax

Updated Windows Wasmer icons. Add wax

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## **[Unreleased]**
 
+- [#1286](https://github.com/wasmerio/wasmer/pull/1286) Updated Windows Wasmer icons. Add wax
 - [#1284](https://github.com/wasmerio/wasmer/pull/1284) Implement string and memory instructions in `wasmer-interface-types`
 - [#1272](https://github.com/wasmerio/wasmer/pull/1272) Fix off-by-one error bug when accessing memory with a `WasmPtr` that contains the last valid byte of memory. Also changes the behavior of `WasmPtr<T, Array>` with a length of 0 and `WasmPtr<T>` where `std::mem::size_of::<T>()` is 0 to always return `None`
 

Makefile

@@ -287,6 +287,8 @@ build-install-package:
 	mkdir -p ./install/bin
 	cp ./wapm-cli/target/release/wapm ./install/bin/
 	cp ./target/release/wasmer ./install/bin/
+	# Create the wax binary as symlink to wapm
+	cd ./install/bin/ && ln -s wapm wax
 	tar -C ./install -zcvf wasmer.tar.gz bin/wapm bin/wasmer
 
 UNAME_S := $(shell uname -s)
@@ -315,7 +317,7 @@ endif
 	cp lib/runtime-c-api/doc/index.md ./capi/README.md
 	tar -C ./capi -zcvf wasmer-c-api.tar.gz lib include README.md LICENSE
 
-WAPM_VERSION = 0.4.3
+WAPM_VERSION = v0.5.0
 build-wapm:
 	git clone --branch $(WAPM_VERSION) https://github.com/wasmerio/wapm-cli.git
 	cargo build --release --manifest-path wapm-cli/Cargo.toml --features "telemetry update-notifications"

src/installer/wasmer.iss

@@ -23,6 +23,7 @@ Root: HKCU; Subkey: "Environment"; ValueType:string; ValueName: "WASMER_CACHE_DI
 [Files]
 Source: "..\..\target\release\wasmer.exe"; DestDir: "{app}\bin"
 Source: "..\..\wapm-cli\target\release\wapm.exe"; DestDir: "{app}\bin"
+Source: "wax.cmd"; DestDir: "{app}\bin"
 
 [Dirs]
 Name: "{%USERPROFILE}\.wasmer"

src/installer/wax.cmd

@@ -0,0 +1,2 @@
+@echo off
+wapm.exe execute %*