Merge pull request #413 from oneclick/fiddle

Update SXS patching for bundled DLLs reg. fiddle as a bundled gem

Author: larskanis

recipes/sandbox/10-define-variables.rake

@@ -11,3 +11,9 @@ self.ssl_dir = case
   else
     "lib/ruby/#{package.rubylibver}/etc/ssl"
 end
+self.fiddle_so_path = case
+  when package.rubyver2 == "3.4"
+    "lib/ruby/#{package.rubylibver}/#{package.ruby_arch}/fiddle.so"
+  when package.rubyver2 == "3.5"
+    "lib/ruby/gems/#{package.rubylibver}/extensions/#{package.ruby_arch.sub(/i.86-mingw/, "x86-mingw")}/#{package.rubylibver}/fiddle-1.1.6/fiddle.so"
+end

recipes/sandbox/60-side-by-side-assembly-ruby-3.4+.rake

@@ -14,7 +14,7 @@ if package.rubyver2 >= "3.4"
   end
 
   ext_dll_defs = {
-    "lib/ruby/#{package.rubylibver}/#{package.ruby_arch}/fiddle.so" => /^libffi-\d.dll$/,
+    self.fiddle_so_path => /^libffi-\d.dll$/,
     "lib/ruby/#{package.rubylibver}/#{package.ruby_arch}/openssl.so" => /^libssl-[\d_]+(-x64)?.dll$|^libcrypto-[\d_]+(-x64)?.dll$/,
     "lib/ruby/#{package.rubylibver}/#{package.ruby_arch}/psych.so" => /^libyaml-[-\d]+.dll$/,
     "lib/ruby/#{package.rubylibver}/#{package.ruby_arch}/zlib.so" => /^zlib\d.dll$/,

resources/files/ridk_use/ridk_use.rb

@@ -22,6 +22,7 @@ def forwardslachs(path)
 def find_each_ruby_from_registry
   return to_enum(:find_each_ruby_from_registry) unless block_given?
 
+  require "rubygems"
   require "win32/registry"
   [
     [Win32::Registry::HKEY_CURRENT_USER, RUBY_INSTALL_KEY],
@@ -167,6 +168,7 @@ def switch_ruby_per_cmd(rubypath, rubies, ps1)
 
 def modify_default(rubypath, rubies, default)
   return unless default
+  require "rubygems"
   require "win32/registry"
 
   if default == :system