respect WASI_VFS_CLI and WASMOPT

Author: kateinoigakukun

packages/npm-packages/ruby-wasm-wasi/tools/pack-ruby-wasm.sh

@@ -15,7 +15,7 @@ package_dir="$(cd "$(dirname "$0")/.." && pwd)"
 
 mkdir -p "$dist_dir"
 
-wasm-opt --strip-debug "$ruby_root/usr/local/bin/ruby" -o "$dist_dir/ruby.wasm"
+"$WASMOPT" --strip-debug "$ruby_root/usr/local/bin/ruby" -o "$dist_dir/ruby.wasm"
 
 # Build +stdlib versions (removing files that are not used in normal use cases)
 
@@ -24,7 +24,7 @@ cp -R "$ruby_root" "$workdir/ruby-root"
 rm -rf $workdir/ruby-root/usr/local/include
 rm -f $workdir/ruby-root/usr/local/lib/libruby-static.a
 rm -f $workdir/ruby-root/usr/local/bin/ruby
-wasi-vfs pack "$dist_dir/ruby.wasm" --mapdir /usr::$workdir/ruby-root/usr -o "$dist_dir/ruby+stdlib.wasm"
-wasi-vfs pack "$ruby_root/usr/local/bin/ruby" --mapdir /usr::$workdir/ruby-root/usr -o "$dist_dir/ruby.debug+stdlib.wasm"
+"$WASI_VFS_CLI" pack "$dist_dir/ruby.wasm" --mapdir /usr::$workdir/ruby-root/usr -o "$dist_dir/ruby+stdlib.wasm"
+"$WASI_VFS_CLI" pack "$ruby_root/usr/local/bin/ruby" --mapdir /usr::$workdir/ruby-root/usr -o "$dist_dir/ruby.debug+stdlib.wasm"
 
 cp $dist_dir/*.wasm "$package_dir/dist/"

tasks/packaging.rake

@@ -22,7 +22,7 @@ namespace :npm do
     desc "Build npm package #{pkg[:name]}"
     task pkg[:name] => ["build:#{pkg[:build]}", wasi_vfs.cli_install_task] do
       sh "npm ci", chdir: pkg_dir
-      sh "#{pkg_dir}/build-package.sh #{base_dir}/rubies/#{pkg[:build]}"
+      sh tools, "#{pkg_dir}/build-package.sh #{base_dir}/rubies/#{pkg[:build]}"
       sh "npm pack", chdir: pkg_dir
     end