zaphar/kitchen
1
0
Fork 0
mirror of https://github.com/zaphar/kitchen.git synced 2025-07-24 19:59:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

build: unify make and nix builds

Browse Source
This commit is contained in:
Jeremy Wall 2024-06-30 20:53:35 -05:00
parent ec18d9de97
commit 6bc9f2ea2e
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nix/kitchenWasm/default.nix
View File

@ -32,8 +32,10 @@ stdenv.mkDerivation {
mkdir -p $out mkdir -p $out
cd web cd web
cp -r static $out cp -r static $out
cargo build --lib --release --target wasm32-unknown-unknown --target-dir $out ${features} --offline sh ../scripts/wasm-build.sh release
wasm-bindgen $out/wasm32-unknown-unknown/release/kitchen_wasm.wasm --out-dir $out --typescript --target web #cargo build --lib --release --target wasm32-unknown-unknown --target-dir $out ${features} --offline
#wasm-bindgen $out/wasm32-unknown-unknown/release/kitchen_wasm.wasm --out-dir $out --typescript --target web
#sh ../scripts/wasm-opt.sh release
wasm-opt $out/kitchen_wasm_bg.wasm -o $out/kitchen_wasm_bg-opt.wasm -O wasm-opt $out/kitchen_wasm_bg.wasm -o $out/kitchen_wasm_bg-opt.wasm -O
rm -f $out/kitchen_wasm_bg.wasm rm -f $out/kitchen_wasm_bg.wasm
mv $out/kitchen_wasm_bg-opt.wasm $out/kitchen_wasm_bg.wasm mv $out/kitchen_wasm_bg-opt.wasm $out/kitchen_wasm_bg.wasm

4
scripts/wasm-build.sh
View File

@ -1,8 +1,8 @@
set -x set -x
buildtype=$1; buildtype=$1;
if [ -eq ${buildtype} = "release" ]; then if [ ${buildtype} = "release" ]; then
builtype_flag="--release" buildtype_flag="--release"
fi fi
cargo build --lib ${buildtype_flag} --target wasm32-unknown-unknown --target-dir $out --features debug_logs cargo build --lib ${buildtype_flag} --target wasm32-unknown-unknown --target-dir $out --features debug_logs

2
scripts/wasm-opt.sh
View File

@ -1,6 +1,6 @@
set -x set -x
buildtype=$1; buildtype=$1;
wasm-opt $out/wasm32-unkown-unkown/${buildtype}/${project}_wasm.wasm --out-dir dist/ -0 wasm-opt $out/wasm32-unknown-unkown/${buildtype}/${project}_wasm.wasm --out-dir dist/ -O
rm -f $out/${project}_wasm_bg.wasm rm -f $out/${project}_wasm_bg.wasm
mv $out/${project}_wasm_bg-opt.wasm dist/${project}_wasm_bg.wasm mv $out/${project}_wasm_bg-opt.wasm dist/${project}_wasm_bg.wasm