Skip to content

Remove the old wast and wasm2obj commands. #1372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunfishcode merged 2 commits into from
Mar 20, 2020
Merged

Remove the old wast and wasm2obj commands. #1372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b678bf
Remove the old wast and wasm2obj commands.
sunfishcode Feb 27, 2020
b430ff1
Remove wasm2obj install commands.
sunfishcode Mar 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ jobs:
- run: rustup target add wasm32-wasi

# Build `wasmtime` and executables
- run: $CENTOS cargo build --release --bin wasmtime --bin wasm2obj
- run: $CENTOS cargo build --release --bin wasmtime
shell: bash
# Build `libwasmtime.so`
- run: $CENTOS cargo build --release --manifest-path crates/c-api/Cargo.toml
Expand All @@ -388,9 +388,9 @@ jobs:
shell: bash

# Move binaries to dist folder
- run: cp target/release/{wasmtime,wasm2obj} dist
- run: cp target/release/wasmtime dist
if: matrix.os != 'windows-latest'
- run: cp target/release/{wasmtime,wasm2obj}.exe dist
- run: cp target/release/wasmtime.exe dist
shell: bash
if: matrix.os == 'windows-latest'

Expand Down
4 changes: 2 additions & 2 deletions ci/build-tarballs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ mktarball() {
bin_pkgname=wasmtime-$TAG-$platform
mkdir tmp/$bin_pkgname
cp LICENSE README.md tmp/$bin_pkgname
mv bins-$src/{wasmtime,wasm2obj}$exe tmp/$bin_pkgname
chmod +x tmp/$bin_pkgname/{wasmtime,wasm2obj}$exe
mv bins-$src/wasmtime$exe tmp/$bin_pkgname
chmod +x tmp/$bin_pkgname/wasmtime$exe
mktarball $bin_pkgname

if [ "$exe" = ".exe" ]; then
Expand Down
6 changes: 1 addition & 5 deletions ci/wasmtime.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,10 @@
<Component Id="wasmtime.exe" Guid="*">
<File Id="wasmtime.exe" Source="target\release\wasmtime.exe" KeyPath="yes" Checksum="yes"/>
</Component>
<Component Id="wasm2obj.exe" Guid="*">
<File Id="wasm2obj.exe" Source="target\release\wasm2obj.exe" KeyPath="yes" Checksum="yes"/>
</Component>
</DirectoryRef>

<Feature Id="InstallWasmtime" Title="Wasmtime and Wasm2obj" Level="1">
<Feature Id="InstallWasmtime" Title="Wasmtime" Level="1">
<ComponentRef Id="wasmtime.exe" />
<ComponentRef Id="wasm2obj.exe" />
<ComponentRef Id="LICENSE" />
<ComponentRef Id="README" />
<ComponentRef Id="InstallDir" />
Expand Down
12 changes: 0 additions & 12 deletions src/bin/wasm2obj.rs
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/bin/wast.rs
View file
Open in desktop

This file was deleted.