diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 190516ad21a8..cac3dd23fedb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 @@ -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' diff --git a/ci/build-tarballs.sh b/ci/build-tarballs.sh index 3aedcfa10b07..5603e1b59e22 100755 --- a/ci/build-tarballs.sh +++ b/ci/build-tarballs.sh @@ -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 diff --git a/ci/wasmtime.wxs b/ci/wasmtime.wxs index 8110932cb970..ec3a58f9aa13 100644 --- a/ci/wasmtime.wxs +++ b/ci/wasmtime.wxs @@ -64,14 +64,10 @@ - - - - + - diff --git a/src/bin/wasm2obj.rs b/src/bin/wasm2obj.rs deleted file mode 100644 index 12e02b3e2018..000000000000 --- a/src/bin/wasm2obj.rs +++ /dev/null @@ -1,12 +0,0 @@ -//! The `wasm2obj` command line tool. -//! -//! Translates WebAssembly modules to object files. -//! See `wasm2obj --help` for usage. - -use anyhow::Result; -use structopt::StructOpt; -use wasmtime_cli::commands::WasmToObjCommand; - -fn main() -> Result<()> { - WasmToObjCommand::from_args().execute() -} diff --git a/src/bin/wast.rs b/src/bin/wast.rs deleted file mode 100644 index 1407a7eb677d..000000000000 --- a/src/bin/wast.rs +++ /dev/null @@ -1,12 +0,0 @@ -//! The `wast` command line tool. -//! -//! Runs WebAssembly test script files. -//! See `wast --help` for usage. - -use anyhow::Result; -use structopt::StructOpt; -use wasmtime_cli::commands::WastCommand; - -fn main() -> Result<()> { - WastCommand::from_args().execute() -}