diff options
| author | Justin Worthe <justin@worthe-it.co.za> | 2017-11-08 21:52:56 +0200 |
|---|---|---|
| committer | Justin Worthe <justin@worthe-it.co.za> | 2017-11-08 21:52:56 +0200 |
| commit | bb980395891d50845f3f3ce3848ea321f5dc9558 (patch) | |
| tree | f3be3f630be5d1ecef32787606d7cef5c2b58655 | |
| parent | cd5b98b9a0311caa567be7445ea453ca99281b95 (diff) | |
Moved webassembly build automation to a makefile
| -rw-r--r-- | Makefile | 26 | ||||
| -rw-r--r-- | README.org | 6 | ||||
| -rwxr-xr-x | make-web.sh | 11 |
3 files changed, 28 insertions, 15 deletions
diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..a528626 --- /dev/null +++ b/Makefile @@ -0,0 +1,26 @@ +all: build + +build-web: + cargo build --target=wasm32-unknown-emscripten --release + mkdir -p target/site + cp target/wasm32-unknown-emscripten/release/rusty_microphone.js target/site/ + cp target/wasm32-unknown-emscripten/release/deps/*.wasm target/site/ + cp target/wasm32-unknown-emscripten/release/deps/*.asm.js target/site/ + cp web/* target/site/ + +build-desktop: + cargo build --release + +build: build-desktop build-web + +test: + cargo test --release + +bench: + cargo bench + +clean: + cargo clean + + +.PHONY: all build-web build-desktop build test bench clean @@ -105,7 +105,5 @@ some HTML, and the Web Audio API, I will create an application that I can embed in my website to allow others to use without needing to compile or install it themselves. -Progress can be seen by running ~make-web.sh~ and opening -~web/index.html~. At first, this will just log to the console (open -your browser's dev tools to see it). Eventually, there will be a -graphical UI component here. +Progress can be seen by running ~make build-web~ and opening +~target/site/index.html~. This requires Make to be installed. diff --git a/make-web.sh b/make-web.sh deleted file mode 100755 index 4e86b77..0000000 --- a/make-web.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -DIR="$(dirname "$0")" - -if cargo build --target=wasm32-unknown-emscripten --release; then - cp $DIR/target/wasm32-unknown-emscripten/release/rusty_microphone.js "$DIR/web/" - cp $DIR/target/wasm32-unknown-emscripten/release/deps/*.wasm "$DIR/web/" - cp $DIR/target/wasm32-unknown-emscripten/release/deps/*.wast "$DIR/web/" - cp $DIR/target/wasm32-unknown-emscripten/release/deps/*.map "$DIR/web/" - cp $DIR/target/wasm32-unknown-emscripten/release/deps/*.js "$DIR/web/" -fi |