🔧 Use cargo env variable for target and allow to override it as well as SKIA_BINARIES_URL

This commit is contained in:
Belén Albeza 2025-04-16 15:05:31 +02:00
parent 16012a3881
commit 689cddfd0c
3 changed files with 8 additions and 6 deletions

View file

@ -24,7 +24,7 @@ EMSDK_QUIET=1 . /usr/local/emsdk/emsdk_env.sh;
export EM_CACHE="/tmp/emsdk_cache"; export EM_CACHE="/tmp/emsdk_cache";
_CARGO_PARAMS="--target=wasm32-unknown-emscripten"; _CARGO_PARAMS="";
if [ "$_BUILD_MODE" = "release" ]; then if [ "$_BUILD_MODE" = "release" ]; then
_CARGO_PARAMS="--release $_CARGO_PARAMS" _CARGO_PARAMS="--release $_CARGO_PARAMS"
@ -40,4 +40,3 @@ fi
export EMCC_CFLAGS; export EMCC_CFLAGS;
export _CARGO_PARAMS; export _CARGO_PARAMS;
export SKIA_BINARIES_URL="https://github.com/penpot/skia-binaries/releases/download/0.81.0-3/skia-binaries-24dee32a277b6c7b5357-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache.tar.gz"

View file

@ -6,6 +6,9 @@ pushd $_SCRIPT_DIR;
. ./_build_env . ./_build_env
export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"wasm32-unknown-emscripten"};
export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.81.0-3/skia-binaries-24dee32a277b6c7b5357-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache.tar.gz"}
cargo build $_CARGO_PARAMS cargo build $_CARGO_PARAMS
cp target/wasm32-unknown-emscripten/$_BUILD_MODE/render_wasm.js ../frontend/resources/public/js/ cp target/wasm32-unknown-emscripten/$_BUILD_MODE/render_wasm.js ../frontend/resources/public/js/

View file

@ -6,10 +6,10 @@ pushd $_SCRIPT_DIR;
. ./_build_env . ./_build_env
export SKIA_BINARIES_URL="https://github.com/penpot/skia-binaries/releases/download/0.81.0-3/skia-binaries-24dee32a277b6c7b5357-x86_64-unknown-linux-gnu-gl-svg-textlayout-binary-cache.tar.gz" export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.81.0-3/skia-binaries-24dee32a277b6c7b5357-x86_64-unknown-linux-gnu-gl-svg-textlayout-binary-cache.tar.gz"}
export _CARGO_PARAMS="--target=x86_64-unknown-linux-gnu"; export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"x86_64-unknown-linux-gnu"};
cargo test $_CARGO_PARAMS --bin render_wasm -- --show-output cargo test --bin render_wasm -- --show-output
# Exit with the same status code as cargo test # Exit with the same status code as cargo test
exit $? exit $?