From 43e1aca3c8cc58d4d309cb2fc85a5244754eab41 Mon Sep 17 00:00:00 2001 From: Mark McCaskey Date: Mon, 14 Sep 2020 11:52:45 -0700 Subject: [PATCH] Fix up package release commands in MakeFile --- Cargo.lock | 13 ++++++++++++- Makefile | 10 ++++------ scripts/publish.py | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a0c7110606d..e719cdfdea8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -131,7 +131,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "which", + "which 3.1.1", ] [[package]] @@ -2384,6 +2384,7 @@ dependencies = [ "wasmer-object", "wasmer-types", "wasmer-vm", + "which 4.0.2", ] [[package]] @@ -2617,6 +2618,16 @@ dependencies = [ "libc", ] +[[package]] +name = "which" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef" +dependencies = [ + "libc", + "thiserror", +] + [[package]] name = "winapi" version = "0.3.9" diff --git a/Makefile b/Makefile index c2a96b244af..3cb273b8abb 100644 --- a/Makefile +++ b/Makefile @@ -141,6 +141,7 @@ test-deprecated: package-wapm: mkdir -p "package/bin" + cp ./wapm-cli/target/release/wapm package/bin/ ifeq ($(OS), Windows_NT) echo "" else @@ -156,10 +157,7 @@ else cp target/release/wasmer package/bin/ endif -# Comment out WAPM for now to speed up release process. -# cp ./wapm-cli/target/release/wapm package/bin/ -# # Create the wax binary as symlink to wapm -# cd package/bin/ && ln -sf wapm wax && chmod +x wax + package-capi: mkdir -p "package/include" @@ -172,12 +170,12 @@ ifeq ($(OS), Windows_NT) else ifeq ($(UNAME_S), Darwin) cp target/release/libwasmer_c_api.dylib package/lib/libwasmer.dylib - # cp target/release/libwasmer_c_api.a package/lib/libwasmer.a + cp target/release/libwasmer_c_api.a package/lib/libwasmer.a # Fix the rpath for the dylib install_name_tool -id "@rpath/libwasmer.dylib" package/lib/libwasmer.dylib else cp target/release/libwasmer_c_api.so package/lib/libwasmer.so - # cp target/release/libwasmer_c_api.a package/lib/libwasmer.a + cp target/release/libwasmer_c_api.a package/lib/libwasmer.a endif endif diff --git a/scripts/publish.py b/scripts/publish.py index 1dc2301854f..595329707f9 100644 --- a/scripts/publish.py +++ b/scripts/publish.py @@ -21,7 +21,7 @@ # TODO: find this automatically -target_version = "1.0.0-alpha01.1" +target_version = "1.0.0-alpha02.0" # TODO: generate this by parsing toml files dep_graph = {