Skip to content

Commit

Permalink
Merge #1620
Browse files Browse the repository at this point in the history
1620: Fix up package release commands in MakeFile r=MarkMcCaskey a=MarkMcCaskey

We didn't ship wapm in the last release, this fixes this and adds some other misc changes which should be on master.

Resolves #1610 



Co-authored-by: Mark McCaskey <mark@wasmer.io>
  • Loading branch information
bors[bot] and Mark McCaskey authored Sep 14, 2020
2 parents 850fef7 + 43e1aca commit 8269518
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 8 deletions.
13 changes: 12 additions & 1 deletion Cargo.lock

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

10 changes: 4 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion scripts/publish.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

0 comments on commit 8269518

Please sign in to comment.