Ensure piet-web example build script works on Windows

linebender · Jan 7, 2019 · cecc179 · cecc179
1 parent cb1d234
commit cecc179
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/piet-web/Cargo.toml b/piet-web/Cargo.toml
@@ -15,7 +15,7 @@ crate-type = ["cdylib", "rlib"]
 kurbo = "0.1.2"
 piet = { path = "../piet" }
 
-wasm-bindgen = "0.2.29"
+wasm-bindgen = "0.2.30"
 
 [dependencies.web-sys]
 version = "0.3.6"

diff --git a/piet-web/README.md b/piet-web/README.md
@@ -2,7 +2,10 @@
 
 Ensure both cargo and [npm] are installed.
 
-`$ cargo install -f wasm-bindgen`
+Make sure that wasm-bindgen is installed. This needs to be the same version of
+wasm-bindgen used by piet-web.
+
+`$ cargo install -f wasm-bindgen-cli`
 
 `$ cd examples/basic && ./build.sh`
 

diff --git a/piet-web/examples/basic/Cargo.toml b/piet-web/examples/basic/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 [dependencies]
 piet = { path = "../../../piet" }
 piet-web = { path = "../.." }
-wasm-bindgen = "0.2.29"
+wasm-bindgen = "0.2.30"
 kurbo = "0.1.2"
 
 [dependencies.web-sys]

diff --git a/piet-web/examples/basic/build.sh b/piet-web/examples/basic/build.sh
@@ -2,7 +2,7 @@
 
 set -ex
 
-# Build the `hello_world.wasm` file using Cargo/rustc
+# Build the `hello_world.wasm` file using Cargo
 cargo build --target wasm32-unknown-unknown
 
 # Run the `wasm-bindgen` CLI tool to postprocess the wasm file emitted by the
@@ -11,5 +11,6 @@ wasm-bindgen ../../../target/wasm32-unknown-unknown/debug/piet_web_example.wasm
 
 # Finally, package everything up using Webpack and start a server so we can
 # browse the result
-npm install --prefix basic-web-static
-npm run serve --prefix basic-web-static
+cd basic-web-static
+npm install
+npm run serve