Pass tools path through env var for wapm build

Author: kateinoigakukun

packages/wapm-packages/irb/build-package.sh

@@ -21,7 +21,7 @@ cp -R "$ruby_root" "$workdir/ruby-root"
 
 (
   cd "$workdir" && \
-  wasm-opt --strip-debug ruby-root/usr/local/bin/ruby -o ./ruby-root/ruby.wasm && \
-  wasi-vfs pack ./ruby-root/ruby.wasm --mapdir /usr::./ruby-root/usr --mapdir /gems::$package_dir/gems -o "$dist_dir/irb.wasm" && \
+  "$WASMOPT" --strip-debug ruby-root/usr/local/bin/ruby -o ./ruby-root/ruby.wasm && \
+  "$WASI_VFS_CLI" pack ./ruby-root/ruby.wasm --mapdir /usr::./ruby-root/usr --mapdir /gems::$package_dir/gems -o "$dist_dir/irb.wasm" && \
   wasi-preset-args "$dist_dir/irb.wasm" -o "$dist_dir/irb.wasm" -- -I/gems/lib /gems/libexec/irb --prompt default
 )

packages/wapm-packages/ruby/build-package.sh

@@ -21,6 +21,6 @@ cp -R "$ruby_root" "$workdir/ruby-root"
 
 (
   cd "$workdir" && \
-  wasm-opt --strip-debug ruby-root/usr/local/bin/ruby -o ./ruby-root/ruby.wasm && \
-  wasi-vfs pack ./ruby-root/ruby.wasm --mapdir /usr::./ruby-root/usr -o "$dist_dir/ruby.wasm"
+  "$WASMOPT" --strip-debug ruby-root/usr/local/bin/ruby -o ./ruby-root/ruby.wasm && \
+  "$WASI_VFS_CLI" pack ./ruby-root/ruby.wasm --mapdir /usr::./ruby-root/usr -o "$dist_dir/ruby.wasm"
 )

tasks/packaging.rake

@@ -1,10 +1,11 @@
+wasi_vfs = RubyWasm::WasiVfsProduct.new("build")
+wasi_sdk = TOOLCHAINS["wasi-sdk"]
+tools = {
+  "WASI_VFS_CLI" => wasi_vfs.cli_bin_path,
+  "WASMOPT" => wasi_sdk.wasm_opt,
+}
+
 namespace :npm do
-  wasi_vfs = RubyWasm::WasiVfsProduct.new("build")
-  wasi_sdk = TOOLCHAINS["wasi-sdk"]
-  tools = {
-    "WASI_VFS_CLI" => wasi_vfs.cli_bin_path,
-    "WASMOPT" => wasi_sdk.wasm_opt,
-  }
   NPM_PACKAGES.each do |pkg|
     base_dir = Dir.pwd
     pkg_dir = "#{Dir.pwd}/packages/npm-packages/#{pkg[:name]}"
@@ -72,8 +73,10 @@ namespace :wapm do
 
     desc "Build wapm package #{pkg[:name]}"
     task "#{pkg[:name]}-build" => ["build:#{pkg[:build]}"] do
+      wasi_vfs.install_cli
+      wasi_sdk.install_binaryen
       base_dir = Dir.pwd
-      sh "./build-package.sh #{base_dir}/rubies/#{pkg[:build]}", chdir: pkg_dir
+      sh tools, "./build-package.sh #{base_dir}/rubies/#{pkg[:build]}", chdir: pkg_dir
     end
 
     desc "Publish wapm package #{pkg[:name]}"