Simplify option construction

Author: kateinoigakukun

Rakefile

@@ -68,28 +68,14 @@ BUILD_PROFILES = {
   }
 }
 
-BUILDS = [
-  { src: "head", target: "wasm32-unknown-wasi", profile: "minimal" },
-  { src: "head", target: "wasm32-unknown-wasi", profile: "minimal-debug" },
-  { src: "head", target: "wasm32-unknown-wasi", profile: "minimal-js" },
-  { src: "head", target: "wasm32-unknown-wasi", profile: "minimal-js-debug" },
-  { src: "head", target: "wasm32-unknown-wasi", profile: "full" },
-  { src: "head", target: "wasm32-unknown-wasi", profile: "full-debug" },
-  { src: "head", target: "wasm32-unknown-wasi", profile: "full-js" },
-  { src: "head", target: "wasm32-unknown-wasi", profile: "full-js-debug" },
-  { src: "head", target: "wasm32-unknown-emscripten", profile: "minimal" },
-  { src: "head", target: "wasm32-unknown-emscripten", profile: "full" },
-  { src: "3_2", target: "wasm32-unknown-wasi", profile: "minimal" },
-  { src: "3_2", target: "wasm32-unknown-wasi", profile: "minimal-debug" },
-  { src: "3_2", target: "wasm32-unknown-wasi", profile: "minimal-js" },
-  { src: "3_2", target: "wasm32-unknown-wasi", profile: "minimal-js-debug" },
-  { src: "3_2", target: "wasm32-unknown-wasi", profile: "full" },
-  { src: "3_2", target: "wasm32-unknown-wasi", profile: "full-debug" },
-  { src: "3_2", target: "wasm32-unknown-wasi", profile: "full-js" },
-  { src: "3_2", target: "wasm32-unknown-wasi", profile: "full-js-debug" },
-  { src: "3_2", target: "wasm32-unknown-emscripten", profile: "minimal" },
-  { src: "3_2", target: "wasm32-unknown-emscripten", profile: "full" }
-]
+BUILDS =
+  BUILD_SOURCES.keys.flat_map do |src|
+    %w[wasm32-unknown-wasi wasm32-unknown-emscripten].flat_map do |target|
+      BUILD_PROFILES.keys.map do |profile|
+        { src: src, target: target, profile: profile }
+      end
+    end
+  end
 
 LIB_ROOT = File.dirname(__FILE__)
 
@@ -99,11 +85,13 @@ namespace :build do
   BUILDS.each do |params|
     name = "#{params[:src]}-#{params[:target]}-#{params[:profile]}"
     source = BUILD_SOURCES[params[:src]].merge(name: params[:src])
-    options = params.merge(BUILD_PROFILES[params[:profile]]).merge(src: source)
-    debug = options[:debug]
-    options.delete :profile
-    options.delete :user_exts
-    options.delete :debug
+    profile = BUILD_PROFILES[params[:profile]]
+    options = {
+      src: source,
+      target: params[:target],
+      default_exts: profile[:default_exts]
+    }
+    debug = profile[:debug]
     RubyWasm::BuildTask.new(name, **options) do |t|
       if debug
         t.crossruby.debugflags = %w[-g]
@@ -123,7 +111,7 @@ namespace :build do
 
       toolchain = t.toolchain
       t.crossruby.user_exts =
-        BUILD_PROFILES[params[:profile]][:user_exts].map do |ext|
+        profile[:user_exts].map do |ext|
           srcdir = File.join(LIB_ROOT, "ext", ext)
           RubyWasm::CrossRubyExtProduct.new(srcdir, toolchain)
         end

lib/ruby_wasm/rake_task.rb

@@ -49,8 +49,7 @@ def initialize(
     @baseruby = RubyWasm::BaseRubyProduct.new(@build_dir, @source)
     @openssl = RubyWasm::OpenSSLProduct.new(@build_dir, @target, @toolchain)
 
-    build_params =
-      RubyWasm::BuildParams.new(options.merge(name: name, target: @target))
+    build_params = RubyWasm::BuildParams.new(options.merge(name: name))
 
     @crossruby =
       RubyWasm::CrossRubyProduct.new(

tasks/packaging.rake

@@ -100,29 +100,9 @@ NPM_RELEASE_ARTIFACTS = [
   "npm-ruby-head-wasm-wasi",
   "npm-ruby-3_2-wasm-wasi",
 ]
-RELASE_ARTIFACTS = [
-  # ruby builds
-  "ruby-head-wasm32-unknown-emscripten-full",
-  "ruby-head-wasm32-unknown-emscripten-minimal",
-  "ruby-head-wasm32-unknown-wasi-full",
-  "ruby-head-wasm32-unknown-wasi-full-debug",
-  "ruby-head-wasm32-unknown-wasi-full-js",
-  "ruby-head-wasm32-unknown-wasi-full-js-debug",
-  "ruby-head-wasm32-unknown-wasi-minimal",
-  "ruby-head-wasm32-unknown-wasi-minimal-debug",
-  "ruby-head-wasm32-unknown-wasi-minimal-js",
-  "ruby-head-wasm32-unknown-wasi-minimal-js-debug",
-  "ruby-3_2-wasm32-unknown-emscripten-full",
-  "ruby-3_2-wasm32-unknown-emscripten-minimal",
-  "ruby-3_2-wasm32-unknown-wasi-full",
-  "ruby-3_2-wasm32-unknown-wasi-full-debug",
-  "ruby-3_2-wasm32-unknown-wasi-full-js",
-  "ruby-3_2-wasm32-unknown-wasi-full-js-debug",
-  "ruby-3_2-wasm32-unknown-wasi-minimal",
-  "ruby-3_2-wasm32-unknown-wasi-minimal-debug",
-  "ruby-3_2-wasm32-unknown-wasi-minimal-js",
-  "ruby-3_2-wasm32-unknown-wasi-minimal-js-debug",
-] + NPM_RELEASE_ARTIFACTS
+RELASE_ARTIFACTS = BUILDS.map do |build|
+  "ruby-#{build[:src]}-#{build[:target]}-#{build[:profile]}"
+end + NPM_RELEASE_ARTIFACTS
 
 def release_note
   output = <<EOS