Remove the old wast and wasm2obj commands. (#1372)

* Remove the old wast and wasm2obj commands. These are subsumed by the `wasmtime wast` and `wasmtime wasm2obj` commands. Fixes #827. * Remove wasm2obj install commands.
bytecodealliance · Mar 20, 2020 · a7d84af · a7d84af
1 parent ff18c5b
commit a7d84af
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 34 deletions.
diff --git 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
@@ -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
@@ -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" />

diff --git a/src/bin/wasm2obj.rs b/src/bin/wasm2obj.rs
diff --git a/src/bin/wast.rs b/src/bin/wast.rs