diff --git a/examples/raytrace-parallel/.gitignore b/examples/raytrace-parallel/.gitignore deleted file mode 100644 index 8b5555eb0..000000000 --- a/examples/raytrace-parallel/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -raytrace_parallel.js -raytrace_parallel_bg.wasm diff --git a/examples/raytrace-parallel/README.md b/examples/raytrace-parallel/README.md index 296e9aa8f..c37eab22e 100644 --- a/examples/raytrace-parallel/README.md +++ b/examples/raytrace-parallel/README.md @@ -9,9 +9,7 @@ online][compiled] You can build the example locally with: ``` -$ ./run.sh +$ python3 run.py ``` -(or running the commands on Windows manually) - -and then visiting http://localhost:8080 in a browser should run the example! +and then visiting http://localhost:8000 in a browser should run the example! diff --git a/examples/raytrace-parallel/build.py b/examples/raytrace-parallel/build.py new file mode 100755 index 000000000..0e14f4907 --- /dev/null +++ b/examples/raytrace-parallel/build.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python3 +import os +import subprocess + +root_dir = os.path.dirname(__file__) + +# A couple of steps are necessary to get this build working which makes it slightly +# nonstandard compared to most other builds. +# +# * First, the Rust standard library needs to be recompiled with atomics +# enabled. to do that we use Cargo's unstable `-Zbuild-std` feature. +# +# * Next we need to compile everything with the `atomics` and `bulk-memory` +# features enabled, ensuring that LLVM will generate atomic instructions, +# shared memory, passive segments, etc. + +os.environ.update( + {"RUSTFLAGS": "-C target-feature=+atomics,+bulk-memory,+mutable-globals"} +) + +subprocess.run( + [ + "cargo", + "build", + "--target", + "wasm32-unknown-unknown", + "--release", + "-Zbuild-std=std,panic_abort", + ], + cwd=root_dir, +).check_returncode() + +# Note the usage of `--target no-modules` here which is required for passing +# the memory import to each wasm module. +subprocess.run( + [ + "cargo", + "run", + "-p", + "wasm-bindgen-cli", + "--", + os.path.join( + root_dir, + "..", + "..", + "target", + "wasm32-unknown-unknown", + "release", + "raytrace_parallel.wasm", + ), + "--out-dir", + os.path.join(root_dir, "pkg"), + "--target", + "no-modules", + ], + cwd=root_dir, +).check_returncode() diff --git a/examples/raytrace-parallel/build.sh b/examples/raytrace-parallel/build.sh index f10dcf29d..09786f553 100755 --- a/examples/raytrace-parallel/build.sh +++ b/examples/raytrace-parallel/build.sh @@ -2,22 +2,4 @@ set -ex -# A couple of steps are necessary to get this build working which makes it slightly -# nonstandard compared to most other builds. -# -# * First, the Rust standard library needs to be recompiled with atomics -# enabled. to do that we use Cargo's unstable `-Zbuild-std` feature. -# -# * Next we need to compile everything with the `atomics` and `bulk-memory` -# features enabled, ensuring that LLVM will generate atomic instructions, -# shared memory, passive segments, etc. - -RUSTFLAGS='-C target-feature=+atomics,+bulk-memory,+mutable-globals' \ - cargo build --target wasm32-unknown-unknown --release -Z build-std=std,panic_abort - -# Note the usage of `--target no-modules` here which is required for passing -# the memory import to each wasm module. -cargo run -p wasm-bindgen-cli -- \ - ../../target/wasm32-unknown-unknown/release/raytrace_parallel.wasm \ - --out-dir . \ - --target no-modules +python3 build.py diff --git a/examples/raytrace-parallel/index.html b/examples/raytrace-parallel/index.html index bc9cae706..2feedce4b 100644 --- a/examples/raytrace-parallel/index.html +++ b/examples/raytrace-parallel/index.html @@ -219,7 +219,7 @@ document.getElementById('render').disabled = true; document.getElementById('concurrency').disabled = true; - + diff --git a/examples/raytrace-parallel/run.py b/examples/raytrace-parallel/run.py new file mode 100755 index 000000000..411fb94d0 --- /dev/null +++ b/examples/raytrace-parallel/run.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python3 +import os +import subprocess + +root_dir = os.path.dirname(__file__) + +subprocess.run(["python3", "build.py"], cwd=root_dir).check_returncode() + +subprocess.run(["python3", "server.py"], cwd=root_dir).check_returncode() diff --git a/examples/raytrace-parallel/run.sh b/examples/raytrace-parallel/run.sh index e32cfb456..1590260c2 100755 --- a/examples/raytrace-parallel/run.sh +++ b/examples/raytrace-parallel/run.sh @@ -2,6 +2,6 @@ set -ex -./build.sh +python3 build.py python3 server.py diff --git a/examples/raytrace-parallel/worker.js b/examples/raytrace-parallel/worker.js index 26d40c62d..2c5863316 100644 --- a/examples/raytrace-parallel/worker.js +++ b/examples/raytrace-parallel/worker.js @@ -1,5 +1,5 @@ // synchronously, using the browser, import out shim JS scripts -importScripts('raytrace_parallel.js'); +importScripts('pkg/raytrace_parallel.js'); // Wait for the main thread to send us the shared module/memory. Once we've got // it, initialize it all with the `wasm_bindgen` global we imported via diff --git a/examples/wasm-audio-worklet/README.md b/examples/wasm-audio-worklet/README.md index 157e0c41a..7b32e68ba 100644 --- a/examples/wasm-audio-worklet/README.md +++ b/examples/wasm-audio-worklet/README.md @@ -9,9 +9,7 @@ online][compiled] You can build the example locally with: ``` -$ ./run.sh +$ python3 run.py ``` -(or running the commands on Windows manually) - and then visiting http://localhost:8080 in a browser should run the example! diff --git a/examples/wasm-audio-worklet/build.py b/examples/wasm-audio-worklet/build.py new file mode 100644 index 000000000..e2e53d165 --- /dev/null +++ b/examples/wasm-audio-worklet/build.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python3 +import os +import subprocess + +root_dir = os.path.dirname(__file__) + +# A couple of steps are necessary to get this build working which makes it slightly +# nonstandard compared to most other builds. +# +# * First, the Rust standard library needs to be recompiled with atomics +# enabled. to do that we use Cargo's unstable `-Zbuild-std` feature. +# +# * Next we need to compile everything with the `atomics` and `bulk-memory` +# features enabled, ensuring that LLVM will generate atomic instructions, +# shared memory, passive segments, etc. + +os.environ.update( + {"RUSTFLAGS": "-C target-feature=+atomics,+bulk-memory,+mutable-globals"} +) + +subprocess.run( + [ + "cargo", + "build", + "--target", + "wasm32-unknown-unknown", + "--release", + "-Zbuild-std=std,panic_abort", + ], + cwd=root_dir, +).check_returncode() + +# Note the usage of `--target no-modules` here which is required for passing +# the memory import to each wasm module. +subprocess.run( + [ + "cargo", + "run", + "-p", + "wasm-bindgen-cli", + "--", + os.path.join( + root_dir, + "..", + "..", + "target", + "wasm32-unknown-unknown", + "release", + "wasm_audio_worklet.wasm", + ), + "--out-dir", + os.path.join(root_dir, "pkg"), + "--target", + "web", + "--split-linked-modules", + ], + cwd=root_dir, +).check_returncode() diff --git a/examples/wasm-audio-worklet/build.sh b/examples/wasm-audio-worklet/build.sh index 576fec806..09786f553 100755 --- a/examples/wasm-audio-worklet/build.sh +++ b/examples/wasm-audio-worklet/build.sh @@ -2,21 +2,4 @@ set -ex -# A couple of steps are necessary to get this build working which makes it slightly -# nonstandard compared to most other builds. -# -# * First, the Rust standard library needs to be recompiled with atomics -# enabled. to do that we use Cargo's unstable `-Zbuild-std` feature. -# -# * Next we need to compile everything with the `atomics` and `bulk-memory` -# features enabled, ensuring that LLVM will generate atomic instructions, -# shared memory, passive segments, etc. - -RUSTFLAGS='-C target-feature=+atomics,+bulk-memory,+mutable-globals' \ - cargo build --target wasm32-unknown-unknown --release -Z build-std=std,panic_abort - -cargo run -p wasm-bindgen-cli -- \ - ../../target/wasm32-unknown-unknown/release/wasm_audio_worklet.wasm \ - --out-dir . \ - --target web \ - --split-linked-modules +python3 build.py diff --git a/examples/wasm-audio-worklet/index.html b/examples/wasm-audio-worklet/index.html index 9cb5882cb..0f4eaa169 100644 --- a/examples/wasm-audio-worklet/index.html +++ b/examples/wasm-audio-worklet/index.html @@ -5,7 +5,7 @@