Fix binaryen binaries (mac with shared libs) (#137)

This commit is contained in:
Jaco Greeff
2020-11-05 14:47:38 +01:00
committed by GitHub
parent 1c54650396
commit 141f5e6488
3 changed files with 12 additions and 10 deletions

4
.gitignore vendored
View File

@@ -1,4 +1,5 @@
binaryen*
binaryen/
bindgen/
build/
build-docs/
coverage/
@@ -8,7 +9,6 @@ pkg/
target/
tmp/
wabt/
wasm-bindgen/
.DS_Store
.env.local
.env.development.local

View File

@@ -29,13 +29,14 @@ cp src/wasm/* build/wasm/
# build new via wasm-pack
echo "*** Building WASM output"
rustup run $RUST_VER xargo build --target wasm32-unknown-unknown --release
../../wasm-bindgen/wasm-bindgen target/wasm32-unknown-unknown/release/wasm.wasm --out-dir pkg --target web
# rustup run $RUST_VER cargo build --target wasm32-unknown-unknown --release -Z build-std=std,panic_abort
../../bindgen/wasm-bindgen target/wasm32-unknown-unknown/release/wasm.wasm --out-dir pkg --target web
# wasm-pack build --release --scope polkadot --target web
# optimise
echo "*** Optimising WASM output"
# ../../wabt/bin/wasm-strip $WSM
../../binaryen/wasm-opt $WSM -Os -o $OPT
../../binaryen/bin/wasm-opt $WSM -Os -o $OPT
# convert wasm to base64 structure
echo "*** Packing WASM into baseX"
@@ -43,7 +44,7 @@ node ../../scripts/pack-wasm-base.js
# build asmjs version from the input (optimised) WASM
echo "*** Building asm.js version"
../../binaryen/wasm2js --output $ASM $OPT
../../binaryen/bin/wasm2js --output $ASM $OPT
# cleanup the generated asm, converting to cjs
sed -i -e '/import {/d' $ASM

View File

@@ -49,14 +49,15 @@ fi
if [ ! -d "binaryen" ]; then
echo "*** Downloading binaryen"
curl -L $BINARYEN_REPO/releases/download/$BINARYEN_VER/$BINARYEN_ZIP.tar.gz | tar xz
mv binaryen-$BINARYEN_VER/bin binaryen
rm -rf binaryen-$BINARYEN_VER
mv binaryen-$BINARYEN_VER binaryen
ls -alR binaryen
fi
if [ ! -d "wasm-bindgen" ]; then
echo "*** Downloading wasm-bindgen"
if [ ! -d "bindgen" ]; then
echo "*** Downloading bindgen"
curl -L $BINDGEN_REPO/releases/download/$BINDGEN_VER/$BINDGEN_ZIP.tar.gz | tar xz
mv $BINDGEN_ZIP wasm-bindgen
mv $BINDGEN_ZIP bindgen
ls -alR bindgen
fi
# if [ ! -d "wabt" ]; then