Get windows builds on github runners working again.

Author: cfis

Rakefile

@@ -21,25 +21,6 @@ Rake::ExtensionTask.new do |ext|
   ext.name = SO_NAME
   ext.ext_dir = "ext/libxml"
   ext.lib_dir = "lib/#{RUBY_VERSION.sub(/\.\d+$/, '')}"
-  if RUBY_PLATFORM.match(/mingw/)
-    ext.config_options <<
-      if (dir = ENV['WINDOWS_XML2_INCLUDE'])
-        "--with-xml2-include=#{dir}"
-      else
-        case RUBY_PLATFORM
-        when 'i386-mingw32'
-          '--with-xml2-include=C:/msys64/mingw32/include/libxml2'
-        when 'x64-mingw32'
-          '--with-xml2-include=C:/msys64/mingw64/include/libxml2'
-        when 'x64-mingw-ucrt'
-          '--with-xml2-include=C:/msys64/ucrt64/include/libxml2'
-        else
-          raise "Unknown Windows Ruby, please set ENV['WINDOWS_XML2_INCLUDE']"
-        end
-      end
-  else
-    ext.config_options << '--with-xml2-include=/usr/include/libxml2'
-  end
 end
 
 # Setup generic gem
@@ -49,21 +30,20 @@ Gem::PackageTask.new(spec) do |pkg|
 end
 
 # Setup Windows Gem
-if RUBY_PLATFORM.match(/mswin|mingw/)
-  binaries = (FileList['lib/**/*.so',
-                       'lib/**/*dll'])
+if RUBY_PLATFORM.match(/mingw/)
+  binaries = (FileList['lib/**/*.so'])
 
   # Windows specification
-  win_spec = spec.clone
-  win_spec.platform = Gem::Platform::CURRENT
-  win_spec.files += binaries.to_a
-  win_spec.instance_variable_set(:@cache_file, nil)
+  mingw_spec = spec.clone
+  mingw_spec.platform = Gem::Platform::CURRENT
+  mingw_spec.files += binaries.to_a
+  mingw_spec.instance_variable_set(:@cache_file, nil)
 
   # Unset extensions
-  win_spec.extensions = nil
+  mingw_spec.extensions = nil
 
   # Rake task to build the windows package
-  Gem::PackageTask.new(win_spec) do |pkg|
+  Gem::PackageTask.new(mingw_spec) do |pkg|
     pkg.package_dir = 'pkg'
     pkg.need_tar = false
   end

ext/libxml/extconf.rb

@@ -23,32 +23,46 @@ def crash(str)
   end
 else
   dir_config('xml2')
+  pkg_config('libxml-2.0')
 end
 
-found_header = find_header('libxml/xmlversion.h',
-                           '/opt/include/libxml2',
-                           '/opt/local/include/libxml2',
-                           '/opt/homebrew/opt/libxml2/include/libxml2',
-                           '/usr/local/include/libxml2',
-                           '/usr/include/libxml2',
-                           '/usr/local/include',
-                           '/usr/local/opt/libxml2/include/libxml2')
+include_dirs = []
+lib_dirs = []
+
+if (msystem_prefix = ENV['MSYSTEM_PREFIX']) && !msystem_prefix.empty?
+  include_dirs.concat([
+    "#{msystem_prefix}/include/libxml2",
+    "#{msystem_prefix}/include"
+  ])
+  lib_dirs << "#{msystem_prefix}/lib"
+end
+
+include_dirs.concat([
+  '/opt/include/libxml2',
+  '/opt/local/include/libxml2',
+  '/opt/homebrew/opt/libxml2/include/libxml2',
+  '/usr/local/include/libxml2',
+  '/usr/include/libxml2',
+  '/usr/local/include',
+  '/usr/local/opt/libxml2/include/libxml2'
+])
+
+lib_dirs.concat([
+  '/opt/lib',
+  '/opt/local/lib',
+  '/opt/homebrew/opt/libxml2/lib',
+  '/usr/lib',
+  '/usr/local/lib',
+  '/usr/local/opt/libxml2/lib'
+])
+
+found_header = find_header('libxml/xmlversion.h', *include_dirs)
 
 found_lib = find_library('xml2', 'xmlParseDoc',
-                           '/opt/lib',
-                           '/opt/local/lib',
-                           '/opt/homebrew/opt/libxml2/lib',
-                           '/usr/lib',
-                           '/usr/local/lib',
-                           '/usr/local/opt/libxml2/lib')
+                         *lib_dirs)
 
 found_lib ||= find_library('libxml2', 'xmlParseDoc',
-                           '/opt/lib',
-                           '/opt/local/lib',
-                           '/opt/homebrew/opt/libxml2/lib',
-                           '/usr/lib',
-                           '/usr/local/lib',
-                           '/usr/local/opt/libxml2/lib')
+                           *lib_dirs)
 
 if !found_header || !found_lib
     crash(<<~EOL)