mirror of
https://github.com/zaphar/kitchen.git
synced 2025-07-22 19:40:14 -04:00
update the make files to not use trunk
This commit is contained in:
parent
d0f57894f9
commit
f6a25043dc
16
Makefile
16
Makefile
@ -18,11 +18,17 @@ kitchen: wasm kitchen/src/*.rs
|
|||||||
release: wasmrelease
|
release: wasmrelease
|
||||||
cd kitchen; cargo build --release
|
cd kitchen; cargo build --release
|
||||||
|
|
||||||
wasmrelease: web/index.html web/src/*.rs web/src/components/*.rs
|
static-prep: web/index.html web/static/*.css
|
||||||
cd web; trunk build --release --public-url /ui/
|
mkdir -p web/dist
|
||||||
|
cp -r web/index.html web/dist/
|
||||||
|
cp -r web/static web/dist/
|
||||||
|
|
||||||
wasm: web/index.html web/src/*.rs web/src/components/*.rs
|
wasmrelease: static-prep web/src/*.rs web/src/components/*.rs
|
||||||
cd web; trunk build --public-url /ui/
|
cd web; wasm-pack build --release --target web --out-dir dist/
|
||||||
|
|
||||||
|
wasm: static-prep web/src/*.rs web/src/components/*.rs
|
||||||
|
cd web; wasm-pack build --target web --out-dir dist/
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf web/dist/*
|
rm -rf web/dist/*
|
||||||
|
cargo clean
|
@ -58,7 +58,7 @@
|
|||||||
program = "${kitchen}/bin/kitchen";
|
program = "${kitchen}/bin/kitchen";
|
||||||
};
|
};
|
||||||
devShell = pkgs.mkShell {
|
devShell = pkgs.mkShell {
|
||||||
buildInputs = [ rust-wasm ] ++ (with pkgs; [wasm-bindgen-cli wasm-pack]);
|
buildInputs = [ rust-wasm ] ++ (with pkgs; [wasm-bindgen-cli wasm-pack httplz]);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
@ -26,7 +26,7 @@ stdenv.mkDerivation {
|
|||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
cd web
|
cd web
|
||||||
cp -r static $out
|
cp -r static $out
|
||||||
wasm-pack build --target web --out-dir $out;
|
wasm-pack build --release --target web --out-dir $out;
|
||||||
cp -r index.html $out
|
cp -r index.html $out
|
||||||
'';
|
'';
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user