mini_portile2 2.8.2 → 2.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8c3bc43ff4324b2780fdac7f1832759fe3933330155380eeb4d3be23a55ac25
-  data.tar.gz: 4b9ed8985c6ae4b827b1cd9791a97a8a708fca9f02dd2bc0854e241d05ce71bf
+  metadata.gz: 51973caa0015d6919e11d6e081cec2e26f146cf329e5f2ec9b34b97e1485d13a
+  data.tar.gz: e5a8eeb01caa0e047ba7d0c75e19e726b18aa8af4fa6fc89e40367671d8bc919
 SHA512:
-  metadata.gz: f29569cacecfd0ade1fc031add7f0e1bb7bccf3a180f260b17541d4493de809f7c4b53180ed47d159a01956318c67c16df810984e974718d0b0eeee42d789a52
-  data.tar.gz: b93d7d34b54e9f6e3083642bc11d14720c566eac2dd745ad99004961f6a37d770349a5f4c99cd2e4ed084246025d26ca8e2fdf434d4b1837c59ae02c7173aa60
+  metadata.gz: 7711d008192576bddd38a396a372581cfff4e6e2ec48c95ac669c61db470bad9a9e508cf314ab6fa859069477262c1c8c7d30beb043d3ce6a571c80351ef0e79
+  data.tar.gz: 553bc5519d22489492ee5eb16c80048731523a1cf45e8f7eb3c2f5a29de9b0a61bfa350894cbd0a82a769c6972ddd1083deb379b262f53ea9092a6e4abb910cd

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## mini_portile changelog
 
+### 2.8.3 / 2023-07-18
+
+#### Fixed
+
+- cmake: only use MSYS/NMake generators when available. [#129] (Thanks, @stanhu!)
+
+
 ### 2.8.2 / 2023-04-30
 
 #### Fixed

data/lib/mini_portile2/mini_portile_cmake.rb

@@ -1,4 +1,5 @@
 require 'mini_portile2/mini_portile'
+require 'open3'
 
 class MiniPortileCMake < MiniPortile
   def configure_prefix
@@ -11,9 +12,9 @@ class MiniPortileCMake < MiniPortile
   end
 
   def configure_defaults
-    if MiniPortile.mswin?
+    if MiniPortile.mswin? && generator_available?('NMake')
       ['-G', 'NMake Makefiles']
-    elsif MiniPortile.mingw?
+    elsif MiniPortile.mingw? && generator_available?('MSYS')
       ['-G', 'MSYS Makefiles']
     else
       []
@@ -48,4 +49,14 @@ class MiniPortileCMake < MiniPortile
   def cmake_cmd
     (ENV["CMAKE"] || @cmake_command || "cmake").dup
   end
+
+  private
+
+  def generator_available?(generator_type)
+    stdout_str, status = Open3.capture2("#{cmake_cmd} --help")
+
+    raise 'Unable to determine whether CMake supports #{generator_type} Makefile generator' unless status.success?
+
+    stdout_str.include?("#{generator_type} Makefiles")
+  end
 end

data/lib/mini_portile2/version.rb

@@ -1,3 +1,3 @@
 class MiniPortile
-  VERSION = "2.8.2"
+  VERSION = "2.8.3"
 end

data/test/test_cmake.rb

@@ -59,7 +59,7 @@ class TestCMake < TestCase
   end
 end
 
-class TestCMakeConfig < TestCase
+class TestCMakeConfig < TestCMake
   def test_make_command_configuration
     MiniPortile.stub(:mswin?, false) do
       without_env("MAKE") do
@@ -77,6 +77,30 @@ class TestCMakeConfig < TestCase
     end
   end
 
+  def test_configure_defaults_with_unix_makefiles
+    Open3.stub(:capture2, cmake_help_mock('Unix')) do
+      MiniPortile.stub(:mingw?, true) do
+        assert_equal([], @recipe.configure_defaults)
+      end
+    end
+  end
+
+  def test_configure_defaults_with_msys_makefiles
+    Open3.stub(:capture2, cmake_help_mock('MSYS')) do
+      MiniPortile.stub(:mingw?, true) do
+        assert_equal(['-G', 'MSYS Makefiles'], @recipe.configure_defaults)
+      end
+    end
+  end
+
+  def test_configure_defaults_with_nmake_makefiles
+    Open3.stub(:capture2, cmake_help_mock('NMake')) do
+      MiniPortile.stub(:mswin?, true) do
+        assert_equal(['-G', 'NMake Makefiles'], @recipe.configure_defaults)
+      end
+    end
+  end
+
   def test_cmake_command_configuration
     without_env("CMAKE") do
       assert_equal("cmake", MiniPortileCMake.new("test", "1.0.0").cmake_cmd)
@@ -87,4 +111,20 @@ class TestCMakeConfig < TestCase
       assert_equal("asdf", MiniPortileCMake.new("test", "1.0.0", cmake_command: "xyzzy").cmake_cmd)
     end
   end
+
+  private
+
+  def cmake_help_mock(generator_type)
+    open3_mock = MiniTest::Mock.new
+    cmake_script = <<~SCRIPT
+    echo "The following generators are available on this platform (* marks default):"
+    echo "* #{generator_type} Makefiles               = Generates standard #{generator_type.upcase} makefiles."
+  SCRIPT
+
+    exit_status = MiniTest::Mock.new
+    exit_status.expect(:success?, true)
+    expected_output = [cmake_script, exit_status]
+    open3_mock.expect(:call, expected_output, ['cmake --help'])
+    open3_mock
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_portile2
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.8.3
 platform: ruby
 authors:
 - Luis Lavena
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-30 00:00:00.000000000 Z
+date: 2023-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler