Remove rake dependency from wasi_vfs and wit-bindgen product

Author: kateinoigakukun

lib/ruby_wasm/build_system/product/crossruby.rb

@@ -130,7 +130,7 @@ def build_exts
     def build(remake: false, reconfigure: false)
       FileUtils.mkdir_p dest_dir
       FileUtils.mkdir_p build_dir
-      [@source, @baseruby, @libyaml, @zlib].each(&:build)
+      [@source, @baseruby, @libyaml, @zlib, @wasi_vfs].each(&:build)
       dep_tasks.each(&:invoke)
       configure(reconfigure: reconfigure)
       build_exts
@@ -168,7 +168,6 @@ def with_zlib(zlib)
 
     def with_wasi_vfs(wasi_vfs)
       @wasi_vfs = wasi_vfs
-      wasi_vfs.install_task&.tap { |t| @dep_tasks << t }
     end
 
     def dest_dir

lib/ruby_wasm/build_system/product/wasi_vfs.rb

@@ -1,10 +1,7 @@
-require "rake"
 require_relative "./product"
 
 module RubyWasm
   class WasiVfsProduct < BuildProduct
-    attr_reader :install_task, :cli_install_task
-
     WASI_VFS_VERSION = "0.1.1"
 
     def initialize(build_dir)
@@ -43,29 +40,25 @@ def name
       lib_product_build_dir
     end
 
-    def define_task
-      file(lib_wasi_vfs_a) do
-        require "tmpdir"
-        lib_wasi_vfs_url =
-          "https://github.com/kateinoigakukun/wasi-vfs/releases/download/v#{WASI_VFS_VERSION}/libwasi_vfs-wasm32-unknown-unknown.zip"
-        Dir.mktmpdir do |tmpdir|
-          sh "curl -L #{lib_wasi_vfs_url} -o #{tmpdir}/libwasi_vfs.zip"
-          sh "unzip #{tmpdir}/libwasi_vfs.zip -d #{tmpdir}"
-          mkdir_p File.dirname(lib_wasi_vfs_a)
-          mv File.join(tmpdir, "libwasi_vfs.a"), lib_wasi_vfs_a
-        end
+    def build
+      return if !@need_fetch_lib && File.exist?(lib_wasi_vfs_a)
+      require "tmpdir"
+      lib_wasi_vfs_url =
+        "https://github.com/kateinoigakukun/wasi-vfs/releases/download/v#{WASI_VFS_VERSION}/libwasi_vfs-wasm32-unknown-unknown.zip"
+      Dir.mktmpdir do |tmpdir|
+        system "curl -L #{lib_wasi_vfs_url} -o #{tmpdir}/libwasi_vfs.zip"
+        system "unzip #{tmpdir}/libwasi_vfs.zip -d #{tmpdir}"
+        FileUtils.mkdir_p File.dirname(lib_wasi_vfs_a)
+        FileUtils.mv File.join(tmpdir, "libwasi_vfs.a"), lib_wasi_vfs_a
       end
-      lib_install_deps = @need_fetch_lib ? [lib_wasi_vfs_a] : []
-      @install_task = task "wasi-vfs:install" => lib_install_deps
+    end
 
-      file(cli_bin_path) do
-        mkdir_p cli_product_build_dir
-        zipfiel = File.join(cli_product_build_dir, "wasi-vfs-cli.zip")
-        sh "curl -L -o #{zipfiel} #{self.cli_download_url}"
-        sh "unzip #{zipfiel} -d #{cli_product_build_dir}"
-      end
-      cli_install_deps = @need_fetch_cli ? [cli_bin_path] : []
-      @cli_install_task = task "wasi-vfs-cli:install" => cli_install_deps
+    def install_cli
+      return if !@need_fetch_cli && File.exist?(cli_bin_path)
+      FileUtils.mkdir_p cli_product_build_dir
+      zipfile = File.join(cli_product_build_dir, "wasi-vfs-cli.zip")
+      system "curl -L -o #{zipfile} #{self.cli_download_url}"
+      system "unzip #{zipfile} -d #{cli_product_build_dir}"
     end
 
     def cli_download_url

lib/ruby_wasm/build_system/toolchain/wit_bindgen.rb

@@ -12,26 +12,20 @@ def initialize(
       @revision = revision
     end
 
-    def define_task
-      file @bin_path do
-        RubyWasm::Toolchain.check_executable("cargo")
-        sh *[
-             "cargo",
-             "install",
-             "--git",
-             "https://github.com/bytecodealliance/wit-bindgen",
-             "--rev",
-             @revision,
-             "--root",
-             @tool_dir,
-             "wit-bindgen-cli"
-           ]
-      end
-      @task ||= task "wit-bindgen:install" => @bin_path
-    end
-
-    def install_task
-      @task
+    def install
+      return if File.exist?(@bin_path)
+      RubyWasm::Toolchain.check_executable("cargo")
+      system *[
+               "cargo",
+               "install",
+               "--git",
+               "https://github.com/bytecodealliance/wit-bindgen",
+               "--rev",
+               @revision,
+               "--root",
+               @tool_dir,
+               "wit-bindgen-cli"
+             ]
     end
   end
 end

lib/ruby_wasm/rake_task.rb

@@ -45,7 +45,7 @@ def initialize(
 
     @libyaml = RubyWasm::LibYAMLProduct.new(@build_dir, @target, @toolchain)
     @zlib = RubyWasm::ZlibProduct.new(@build_dir, @target, @toolchain)
-    @wasi_vfs = add_product RubyWasm::WasiVfsProduct.new(@build_dir)
+    @wasi_vfs = RubyWasm::WasiVfsProduct.new(@build_dir)
     @source = RubyWasm::BuildSource.new(src, @build_dir)
     @baseruby = RubyWasm::BaseRubyProduct.new(@build_dir, @source)
 

tasks/check.rake

@@ -1,7 +1,7 @@
 namespace :check do
   wit_bindgen = RubyWasm::WitBindgen.new(build_dir: "build")
-  wit_bindgen.define_task
-  task :bindgen_c => wit_bindgen.install_task do
+  task :bindgen_c do
+    wit_bindgen.install
     wits = [
       ["ext/witapi/bindgen/rb-abi-guest.wit", "--export"],
       ["ext/js/bindgen/rb-js-abi-host.wit", "--import"],
@@ -12,7 +12,8 @@ namespace :check do
     end
   end
 
-  task :bindgen_js => wit_bindgen.install_task do
+  task :bindgen_js do
+    wit_bindgen.install
     sh *[
       wit_bindgen.bin_path, "host", "js",
       "--import", "ext/witapi/bindgen/rb-abi-guest.wit",
@@ -23,4 +24,4 @@ namespace :check do
 
   desc "Check wit-bindgen'ed sources are up-to-date"
   task :bindgen => [:bindgen_c, :bindgen_js]
-end
+end

tasks/packaging.rake

@@ -10,7 +10,6 @@ WAPM_PACKAGES = [
 
 namespace :npm do
   wasi_vfs = RubyWasm::WasiVfsProduct.new("build")
-  wasi_vfs.define_task
   wasi_sdk = TOOLCHAINS["wasi-sdk"]
   tools = {
     "WASI_VFS_CLI" => wasi_vfs.cli_bin_path,
@@ -21,7 +20,8 @@ namespace :npm do
     pkg_dir = "#{Dir.pwd}/packages/npm-packages/#{pkg[:name]}"
 
     desc "Build npm package #{pkg[:name]}"
-    task pkg[:name] => ["build:#{pkg[:build]}", wasi_vfs.cli_install_task, wasi_sdk.binaryen_install_task] do
+    task pkg[:name] => ["build:#{pkg[:build]}", wasi_sdk.binaryen_install_task] do
+      wasi_vfs.install_cli
       sh "npm ci", chdir: pkg_dir
       sh tools, "#{pkg_dir}/build-package.sh #{base_dir}/rubies/#{pkg[:build]}"
       sh "npm pack", chdir: pkg_dir