wxruby3 0.9.4 → 0.9.7

data/lib/wx/wxruby/cmd/test.rb

@@ -10,21 +10,71 @@ require 'fileutils'
 module WxRuby
   module Commands
     class Test
+
+      DESC = 'Run wxRuby3 regression tests.'
+
       def self.description
-        "    test\t\t\tRun wxRuby3 regression tests."
+        "    test -h|[options] [TEST [...]]\t#{DESC}"
+      end
+
+      def self.options
+        Commands.options['test'] ||= { verbose: Commands.options[:verbose], excludes: [] }
+      end
+
+      def self.parse_args(args)
+        opts = OptionParser.new
+        opts.banner = "#{DESC}\n\nUsage: wxruby test -h|--help OR wxruby test [options] [TEST [...]]\n\n" +
+          "TEST == test name\n" +
+          "Runs all tests (except any specified to exclude) if no test specified.\n\n"
+        opts.separator ''
+        opts.on('--list',
+                "display the list of names of the installed tests")  do |v|
+          tests = Dir[File.join(WxRuby::ROOT, 'tests', '*.rb')].collect { |t| File.basename(t, '.*') }
+          $stdout.puts <<~__INFO
+            Installed wxRuby tests:
+              #{tests.join(', ')}
+
+            __INFO
+          exit(0)
+        end
+        opts.on('--exclude=TEST',
+                "exclude the specified test from running")  {|v| Test.options[:excludes] << v }
+        opts.on('-h', '--help',
+                'Show this message.') do |v|
+          puts opts
+          puts
+          exit(0)
+        end
+        opts.parse!(args)
       end
 
       def self.run(argv)
-        if argv == :describe
-          description
-        else
-          Dir[File.join(WxRuby::ROOT, 'tests', '*.rb')].each do |test|
+        return description if argv == :describe
+
+        parse_args(argv)
+
+        tests = if argv.empty?
+                  Dir[File.join(WxRuby::ROOT, 'tests', '*.rb')]
+                else
+                  argv.collect do |a|
+                    fn = File.join(WxRuby::ROOT, 'tests', a+'.rb')
+                    unless File.file?(fn)
+                      $stderr.puts "ERROR: Invalid test [#{a}] specified."
+                      exit(1)
+                    end
+                    fn
+                  end
+                end
+        tests.each do |test|
+          unless Test.options[:excludes].include?(File.basename(test, '.*'))
             exit(1) unless system(RUBY, test)
           end
         end
       end
     end
 
-    self.register('test', Test)
+    if self.setup_done?
+      self.register('test', Test)
+    end
   end
 end

data/rakefile

@@ -0,0 +1,14 @@
+###
+# wxRuby3 rake file
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+# Influential environment variables
+# WXRUBY_VERBOSE    : define verbosity for (rake) build scripts
+# WXRUBY_VERSION    : define the version info (x.x.x) for this tree
+# WXRUBY_EXCLUDED   : exclude certain classes from being compiled, even if present
+#
+# WXWIN             : install folder of wxWidgets library if not system default
+# WXXML             : folder containing doxygen generated wxWidgets XML interface specs if not using wxRuby bootstrap
+
+task :default => 'wxruby:help'

data/rakelib/bin.rake

@@ -0,0 +1,48 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 rake file
+###
+
+require 'rake/clean'
+
+require_relative './bin'
+
+directory 'bin'
+
+file File.join('bin', 'wxruby') => 'bin' do |t|
+  File.open(t.name, 'w') { |f| f.puts WXRuby3::Bin.wxruby }
+  File.chmod(0755, t.name)
+end
+
+namespace :wxruby do
+
+  namespace :bin do
+
+    task :build => ['wxruby:bin:check', File.join('bin', 'wxruby')]
+
+    task :check do
+      WXRuby3::Bin.binaries.each do |bin|
+        if File.exist?(File.join('bin', bin))
+          content = IO.read(File.join('bin', bin))
+          rm_f(File.join('bin', bin)) unless content == WXRuby3::Bin.__send__(bin.gsub('.','_').to_sym)
+        end
+      end
+    end
+  end
+end
+
+CLOBBER.include File.join('bin', 'wxruby')
+
+if WXRuby3.config.windows?
+
+  file File.join('bin', 'wxruby.bat') => ['bin'] do |t|
+    File.open(t.name, 'w') { |f| f.puts WXRuby3::Bin.wxruby_bat }
+  end
+  Rake::Task['wxruby:bin:build'].enhance [File.join('bin', 'wxruby.bat')]
+
+  CLOBBER.include File.join('bin', 'wxruby.bat')
+
+end

data/rakelib/bin.rb

@@ -0,0 +1,62 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 rake bin support
+###
+
+require_relative './lib/config'
+
+module WXRuby3
+
+  module Bin
+
+    class << self
+      def wxruby
+        <<~_SH_TXT
+          #!#{WXRuby3.config.windows? ? '/bin/' : (`which env`).strip+' '}#{RB_CONFIG['ruby_install_name']}
+          #---------------------------------
+          # This file is generated
+          #---------------------------------
+          module WxRuby
+            ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+          end
+          require 'wx/wxruby/base'
+          WxRuby.run
+          _SH_TXT
+      end
+
+      def wxruby_bat
+        <<~_BAT_TXT
+          @echo off
+          if not "%~f0" == "~f0" goto WinNT
+          #{RB_CONFIG['ruby_install_name']} -Sx "%0" %1 %2 %3 %4 %5 %6 %7 %8 %9
+          goto endofruby
+          :WinNT
+          if not exist "%~d0%~p0#{RB_CONFIG['ruby_install_name']}" goto rubyfrompath
+          if exist "%~d0%~p0#{RB_CONFIG['ruby_install_name']}" "%~d0%~p0#{RB_CONFIG['ruby_install_name']}" -x "%~f0" %*
+          goto endofruby
+          :rubyfrompath
+          #{RB_CONFIG['ruby_install_name']} -x "%~f0" %*
+          goto endofruby
+          #!/bin/#{RB_CONFIG['ruby_install_name']}
+          #
+          module WxRuby
+            ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+          end
+          require 'wx/wxruby/base'
+          WxRuby.run
+          __END__
+          :endofruby
+          _BAT_TXT
+      end
+
+      def binaries
+        %w{wxruby}
+      end
+    end
+
+  end
+
+end

data/rakelib/build.rb

@@ -11,8 +11,11 @@ require_relative './lib/config'
 
 if WXRuby3.is_bootstrapped?
 
-  Rake.application.options.always_multitask =
-    Rake.application.top_level_tasks.size == 1 && Rake.application.top_level_tasks.first == 'build'
+  # only if not part of installed Gem
+  if File.file?(File.join(__dir__, 'package.rake'))
+    Rake.application.options.always_multitask =
+      Rake.application.top_level_tasks.size == 1 && Rake.application.top_level_tasks.first == 'build'
+  end
 
   require_relative './lib/director'
 
@@ -102,22 +105,23 @@ if WXRuby3.is_bootstrapped?
 
   file WXRuby3::Director.enum_cache_control_path do |t_|
     WXRuby3::Director.all_packages.each { |p| p.extract(genint: false) }
-    touch(WXRuby3::Director.enum_cache_control_path)
+    touch(WXRuby3::Director.enum_cache_control_path, verbose: !WXRuby3.config.run_silent?)
   end
 
   # Compile an object file from a generated c++ source
   rule ".#{WXRuby3.config.obj_ext}" => [
     proc { |tn| "#{WXRuby3.config.src_dir}/#{File.basename(tn, ".*")}.cpp" }
   ] do | t |
-    sh "#{WXRuby3.config.cpp} -c #{WXRuby3.config.verbose_flag} " +
-         "#{WXRuby3.config.cxxflags} #{WXRuby3::Director.cpp_flags(t.source)} " +
-         "#{WXRuby3.config.cpp_out_flag}#{t.name} #{t.source}"
+    WXRuby3.config.sh "#{WXRuby3.config.cpp} -c #{WXRuby3.config.verbose_flag} " +
+                        "#{WXRuby3.config.cxxflags} #{WXRuby3::Director.cpp_flags(t.source)} " +
+                        "#{WXRuby3.config.cpp_out_flag}#{t.name} #{t.source}",
+                      fail_on_error: true
   end
 
   if WXRuby3.config.windows?
     # compile an object file from the standard wxRuby resource file
     file File.join(WXRuby3.config.obj_dir, 'wx_rc.o') => File.join(WXRuby3.config.swig_dir, 'wx.rc') do |t|
-      sh "#{WXRuby3.config.rescomp} -i#{t.source} -o#{t.name}"
+      WXRuby3.config.sh "#{WXRuby3.config.rescomp} -i#{t.source} -o#{t.name}", fail_on_error: true
     end
   end
 

data/rakelib/config.rake

@@ -33,7 +33,9 @@ namespace :wxruby do
     end
 
     WXRuby3.config.build_paths.each do |p|
-      directory p
+      directory p do
+        mkdir_p(p, verbose: !WXRuby3.config.run_silent?)
+      end
     end
   end
 

data/rakelib/configure.rb

@@ -70,6 +70,10 @@ module WXRuby3
                 "the path to swig executable [#{get_config('swig')}]")  {|v| CONFIG['swig'] = v}
         opts.on('--doxygen=path',
                 "the path to doxygen executable [#{get_config('doxygen')}]")  {|v| CONFIG['doxygen'] = v}
+        opts.on('--git=path',
+                "the path to git executable [#{get_config('git')}]")  {|v| CONFIG['git'] = v}
+        opts.on('--[no-]autoinstall',
+                "do (not) attempt to automatically install any required packages")  {|v| CONFIG['autoinstall'] = !!v }
 
         opts.separator ""
 
@@ -110,20 +114,36 @@ module WXRuby3
           # check wxWidgets availability through 'wx-config' command
           if instance.check_wx_config
             if instance.wx_config("--version") < '3.2.0'
-              STDERR.puts "ERROR: Incompatible wxWidgets version. wxRuby requires a wxWidgets >= 3.2.0 release."
-              exit(1)
+              if get_cfg_string('wxwin').empty? && get_cfg_string('wxxml').empty?
+                # no custom wxWidgets build specified so switch to assuming we should include building wxWidgets ourselves
+                set_config('with-wxwin', true)
+              else
+                # if someone wants to customize they HAVE to do it right
+                STDERR.puts "ERROR: Incompatible wxWidgets version. wxRuby requires a wxWidgets >= 3.2.0 release."
+                exit(1)
+              end
             end
           else
-            STDERR.puts "ERROR: Cannot find wxWidgets. wxRuby requires a wxWidgets >= 3.2.0 release."
-            exit(1)
+            if get_cfg_string('wxwin').empty? && get_cfg_string('wxxml').empty?
+              # no custom wxWidgets build specified so switch to assuming we should include building wxWidgets ourselves
+              set_config('with-wxwin', true)
+            else
+              # if someone wants to customize they HAVE to do it right
+              STDERR.puts "ERROR: Cannot find wxWidgets. wxRuby requires a wxWidgets >= 3.2.0 release."
+              exit(1)
+            end
           end
         # else we're are assumed to build wxWidgets ourselves so cannot test anything yet
         end
 
-        if get_cfg_string('wxxml').empty?
-          # no pre-generated XML specified so we are going to need Git and Doxygen
-          instance.check_git
-          instance.check_doxygen
+        if get_cfg_string('wxxml').empty? && !get_cfg_string('wxwin').empty?
+          # in case of a custom wxWidgets build and no explicit xml path check if the custom build holds this
+          xml_path = File.join(get_cfg_string('wxwin'), 'docs', 'doxygen', 'out', 'xml')
+          # if not there see if the standard setup 'wxw_root/<install dir>' was used
+          xml_path = File.join(get_cfg_string('wxwin'), '..', 'docs', 'doxygen', 'out', 'xml') unless File.directory?(xml_path)
+          if File.directory?(xml_path) && !Dir.glob(File.join(xml_path, '*.xml')).empty?
+            set_config('wxxml', xml_path)
+          end
         end
 
       end

data/rakelib/doc.rake

@@ -16,7 +16,9 @@ namespace :wxruby do
 
 end
 
-directory WXRuby3.config.rb_docgen_path
+directory WXRuby3.config.rb_docgen_path do
+  mkdir_p(WXRuby3.config.rb_docgen_path, verbose: !WXRuby3.config.run_silent?)
+end
 
 file File.join(WXRuby3.config.rb_docgen_path, 'window.rb') => [WXRuby3.config.rb_docgen_path, *all_doc_targets]
 

data/rakelib/gem.rake

@@ -0,0 +1,169 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 rake file
+###
+
+require_relative './gem'
+
+namespace :wxruby do
+
+  namespace :gem do
+
+    task :srcgem => ['bin:build', WXRuby3::Gem.gem_file('wxruby3', WXRuby3::WXRUBY_VERSION)]
+
+    if WXRuby3.is_bootstrapped?
+      task :bingem => ['bin:build', File.join(WXRuby3.config.rb_docgen_path, 'window.rb'), WXRuby3::Gem.gem_file('wxruby3', WXRuby3::WXRUBY_VERSION, :bin)]
+    end
+
+    # this task only exists for installed source gems (where package tasks have been removed)
+    unless File.file?(File.join(__dir__, 'package.rake'))
+
+      task :setup => 'config:bootstrap' do |_t, args|
+        begin
+          $stdout.print "Building wxRuby3 extensions..." if WXRuby3.config.run_silent?
+          WXRuby3.config.set_silent_run_incremental
+          Rake::Task['wxruby:build'].invoke
+          WXRuby3.config.set_silent_run_batched
+          $stdout.puts 'done!' if WXRuby3.config.run_silent?
+          Rake::Task['wxruby:post:srcgem'].invoke
+          # all is well -> cleanup
+          if args.extras.include?(':keep_log')
+            $stdout.puts "Log: #{WXRuby3.config.silent_log_name}"
+          else
+            rm_f(WXRuby3.config.silent_log_name, verbose: WXRuby3.config.verbose?)
+          end
+        rescue Exception => ex
+          $stderr.puts <<~__ERR_TXT
+            #{ex.message}#{WXRuby3.config.verbose? ? "\n#{ex.backtrace.join("\n")}" : ''}
+
+            For error details check #{WXRuby3.config.silent_log_name}
+            __ERR_TXT
+          exit(1)
+        end
+        $stdout.puts <<~__MSG
+      
+          wxRuby3 has been successfully installed including the 'wxruby' utility.
+      
+          You can run the regression tests to verify the installation by executing:
+      
+          $ ./wxruby test
+      
+          The wxRuby3 sample selector can be run by executing:
+      
+          $ ./wxruby sampler
+      
+          Have fun using wxRuby3.
+          __MSG
+      end
+    end
+
+  end
+
+end
+
+# source gem file
+file WXRuby3::Gem.gem_file('wxruby3', WXRuby3::WXRUBY_VERSION) => WXRuby3::Gem.manifest do
+  gemspec = WXRuby3::Gem.define_spec('wxruby3', WXRuby3::WXRUBY_VERSION) do |gem|
+    gem.summary = %Q{wxWidgets extension for Ruby}
+    gem.description = %Q{wxRuby3 is a Ruby library providing an extension for the wxWidgets C++ UI framework}
+    gem.email = 'mcorino@m2c-software.nl'
+    gem.homepage = "https://github.com/mcorino/wxRuby3"
+    gem.authors = ['Martin Corino']
+    gem.files = WXRuby3::Gem.manifest
+    gem.require_paths = %w{lib}
+    gem.bindir = 'bin'
+    gem.executables = WXRuby3::Bin.binaries
+    gem.required_ruby_version = '>= 2.5'
+    gem.licenses = ['MIT']
+    gem.add_dependency 'nokogiri', '~> 1.12'
+    gem.add_dependency 'rake'
+    gem.add_dependency 'minitest', '~> 5.15'
+    gem.add_dependency 'test-unit', '~> 3.5'
+    gem.rdoc_options <<
+      '--exclude=\\.dll' <<
+      '--exclude=\\.so' <<
+      '--exclude=lib/wx.rb' <<
+      '--exclude=lib/wx/*.rb' <<
+      "'--exclude=lib/wx/(aui|core|grid|html|pg|prt|rbn|rtc|stc|wxruby)/.*'"
+    gem.metadata = {
+      "bug_tracker_uri"   => "https://github.com/mcorino/wxRuby3/issues",
+      "source_code_uri"   => "https://github.com/mcorino/wxRuby3",
+      "documentation_uri" => "https://mcorino.github.io/wxRuby3",
+      "homepage_uri"      => "https://github.com/mcorino/wxRuby3",
+    }
+    gem.post_install_message = <<~__MSG
+
+      The wxRuby3 Gem has been successfully installed.
+      Before being able to use wxRuby3 you need to run the post-install setup process
+      by executing the command 'wxruby setup'.
+
+      Run 'wxruby setup -h' to see information on the available commandline options.
+
+      __MSG
+  end
+  WXRuby3::Gem.build_gem(gemspec)
+end
+
+desc 'Build wxRuby 3 gem'
+task :gem => 'wxruby:gem:srcgem'
+
+if WXRuby3.is_bootstrapped?
+
+  # binary gem file
+  file WXRuby3::Gem.gem_file('wxruby3', WXRuby3::WXRUBY_VERSION, :bin) => WXRuby3::Gem.manifest(:bin) + ['ext/mkrf_conf_bingem.rb'] do
+    WXRuby3::Install.install_wxwin_shlibs
+    begin
+      # create gemspec
+      gemspec = WXRuby3::Gem.define_spec('wxruby3', WXRuby3::WXRUBY_VERSION, :bin) do |gem|
+        gem.summary = %Q{wxWidgets extension for Ruby}
+        gem.description = %Q{wxRuby3 is a Ruby library providing an extension for the wxWidgets C++ UI framework}
+        gem.email = 'mcorino@m2c-software.nl'
+        gem.homepage = "https://github.com/mcorino/wxRuby3"
+        gem.authors = ['Martin Corino']
+        gem.files = WXRuby3::Gem.manifest(:bin)
+        gem.require_paths = %w{lib}
+        gem.require_paths << 'ext' if WXRuby3.config.get_config('with-wxwin')
+        gem.bindir = 'bin'
+        gem.executables = WXRuby3::Bin.binaries
+        gem.extensions = ['ext/mkrf_conf_bingem.rb']
+        gem.required_ruby_version = ">= #{WXRuby3::Config.rb_ver_major}.#{WXRuby3::Config.rb_ver_minor}",
+                                    "< #{WXRuby3::Config.rb_ver_major}.#{WXRuby3::Config.rb_ver_minor+1}"
+        gem.licenses = ['MIT']
+        gem.add_dependency 'rake'
+        gem.add_dependency 'minitest', '~> 5.15'
+        gem.add_dependency 'test-unit', '~> 3.5'
+        gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so'
+        gem.metadata = {
+          "bug_tracker_uri"   => "https://github.com/mcorino/wxRuby3/issues",
+          "source_code_uri"   => "https://github.com/mcorino/wxRuby3",
+          "documentation_uri" => "https://mcorino.github.io/wxRuby3",
+          "homepage_uri"      => "https://github.com/mcorino/wxRuby3",
+        }
+        gem.post_install_message = <<~__MSG
+    
+          wxRuby3 has been successfully installed including the 'wxruby' utility.
+    
+          You can run the regression tests to verify the installation by executing:
+    
+          $ ./wxruby test
+    
+          The wxRuby3 sample selector can be run by executing:
+    
+          $ ./wxruby sampler
+    
+          Have fun using wxRuby3.
+          __MSG
+      end
+      WXRuby3::Gem.build_gem(gemspec)
+    ensure
+      WXRuby3::Install.remove_wxwin_shlibs
+    end
+  end
+
+  desc 'Build wxRuby 3 binary gem'
+  task :bingem => 'wxruby:gem:bingem'
+
+end

data/rakelib/gem.rb

@@ -0,0 +1,82 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 rake gem support
+###
+
+require 'set'
+require 'rubygems'
+require 'rubygems/package'
+begin
+  require 'rubygems/builder'
+rescue LoadError
+end
+
+require_relative './lib/config'
+require_relative './install'
+
+module WXRuby3
+
+  module Gem
+
+    def self.manifest(gemtype = :src)
+      # create MANIFEST list with included files
+      manifest = Rake::FileList.new
+      manifest.include %w[bin/*] # *nix executables in bin/
+      manifest.exclude %w[bin/*.bat] unless WXRuby3.config.windows?
+      manifest.include %w[assets/**/* lib/**/* samples/**/* tests/**/*]
+      if gemtype == :bin
+        if WXRuby3.config.get_config('with-wxwin')
+          manifest.include "ext/*.#{WXRuby3.config.dll_mask}"
+        end
+        manifest.include 'ext/mkrf_conf_bingem.rb'
+        manifest.include %w[rakelib/prepost.* rakelib/install.rb rakelib/lib/config.rb rakelib/lib/config/**/* rakelib/lib/ext/**/* rakelib/yard/**/*]
+        manifest.include WXRuby3::BUILD_CFG
+      else
+        manifest.exclude "lib/*.#{WXRuby3.config.dll_mask}"
+        manifest.include 'ext/wxruby3/wxruby.ico', 'ext/wxruby3/swig/**/*', 'ext/wxruby3/include/**/*'
+        manifest.exclude 'ext/wxruby3/swig/classes/**/*'
+        manifest.include 'rakelib/**/*'
+        manifest.exclude %w[rakelib/run.* rakelib/help.* rakelib/package.* rakelib/memcheck.* rakelib/memcheck/**/*]
+        manifest.include 'rakefile'
+      end
+      manifest.include %w{LICENSE README.md CREDITS.md INSTALL.md .yardopts}
+      manifest
+    end
+
+    def self.define_spec(name, version, gemtype = :src, &block)
+      gemspec = ::Gem::Specification.new(name, version)
+      if gemtype == :bin
+        platform = ::Gem::Platform.local.to_s
+        gemspec.platform = platform
+      end
+      gemspec.required_rubygems_version = ::Gem::Requirement.new(">= 0") if gemspec.respond_to? :required_rubygems_version=
+      block.call(gemspec) if block_given?
+      gemspec
+    end
+
+    def self.gem_name(name, version, gemtype = :src)
+      define_spec(name, version, gemtype).full_name
+    end
+
+    def self.gem_file(name, version, gemtype = :src)
+      File.join('pkg', "#{WXRuby3::Gem.gem_name(name, version, gemtype)}.gem")
+    end
+
+    def self.build_gem(gemspec)
+      if defined?(::Gem::Package) && ::Gem::Package.respond_to?(:build)
+        gem_file_name = ::Gem::Package.build(gemspec)
+      else
+        gem_file_name = ::Gem::Builder.new(gemspec).build
+      end
+
+      FileUtils.mkdir_p('pkg')
+
+      FileUtils.mv(gem_file_name, 'pkg')
+    end
+
+  end
+
+end

data/rakelib/install.rb

@@ -57,6 +57,7 @@ module WXRuby3
 
       def install_wxwin_shlibs
         if WXRuby3.config.get_config('with-wxwin')
+          $stdout.print "Installing wxRuby3 extensions..." if WXRuby3.config.run_silent?
           # prepare required wxWidgets shared libs
           wxwin_inshlibs = []
           WXRuby3::Install.wxwin_shlibs.each do |shlib|
@@ -89,6 +90,7 @@ module WXRuby3
               exit(1)
             end
           end
+          $stdout.puts 'done!' if WXRuby3.config.run_silent?
         end
       end
 

data/rakelib/lib/config/linux.rb

@@ -7,6 +7,7 @@
 ###
 
 require_relative './unixish'
+require_relative 'pkgman/base'
 
 module WXRuby3
 
@@ -17,6 +18,7 @@ module WXRuby3
       def self.included(base)
         base.class_eval do
           include Config::UnixLike
+
           alias :base_ldflags :ldflags
           def ldflags(target)
             "-Wl,-soname,#{File.basename(target)} #{base_ldflags(target)}"
@@ -31,10 +33,10 @@ module WXRuby3
 
           def check_rpath_patch
             unless @rpath_patch
-              if system('which patchelf > /dev/null 2>&1')
+              if system('command -v patchelf > /dev/null')
                 @rpath_patch = 'patchelf --set-rpath'
               else
-                STDERR.puts 'Installation of binary gem with-wxwin requires an installed version of either the patchelf utility.'
+                STDERR.puts 'Installation of binary gem with-wxwin requires an installed version of the patchelf utility.'
                 return false
               end
             end
@@ -48,6 +50,26 @@ module WXRuby3
             end
             false
           end
+
+          def check_tool_pkgs
+            pkg_deps = super
+            # need g++ to build wxRuby3 extensions in any case
+            pkg_deps << 'g++' unless system('command -v g++>/dev/null')
+            # do we need to build wxWidgets?
+            if get_config('with-wxwin') && get_cfg_string('wxwin').empty?
+              pkg_deps << 'patchelf' unless system('command -v patchelf>/dev/null')
+              pkg_deps << 'make' unless system('command -v make>/dev/null')
+              pkg_deps << 'git' unless system('command -v git>/dev/null')
+            end
+            pkg_deps
+          end
+
+          def install_prerequisites
+            pkg_deps = check_tool_pkgs
+            PkgManager.install(pkg_deps)
+            []
+          end
+
         end
       end
 

data/rakelib/lib/config/macosx.rb

@@ -7,6 +7,7 @@
 ###
 
 require_relative './unixish'
+require_relative 'pkgman/macosx'
 
 module WXRuby3
 
@@ -53,6 +54,21 @@ module WXRuby3
             true
           end
 
+          def check_tool_pkgs
+            pkg_deps = super
+            # need g++ to build wxRuby3 extensions in any case
+            pkg_deps << 'gcc' unless system('command -v g++>/dev/null')
+            # need this to build anything (like wxRuby3 extensions itself)
+            pkg_deps << 'xcode' unless system('command -v install_name_tool>/dev/null')
+            pkg_deps
+          end
+
+          def install_prerequisites
+            pkg_deps = check_tool_pkgs
+            PkgManager.install(pkg_deps)
+            []
+          end
+
           def get_wx_libs
             wx_libset = ::Set.new
             lib_list = wx_config("--libs all").split(' ')