wxruby3 0.9.5 → 0.9.8

data/rakelib/lib/config.rb

@@ -9,6 +9,9 @@
 require 'rbconfig'
 require 'fileutils'
 require 'json'
+require 'open3'
+require 'monitor'
+require 'plat4m'
 
 module FileUtils
   # add convenience methods
@@ -65,7 +68,8 @@ module WXRuby3
     'sodir' => '$siterubyverarch',
   }
 
-  CFG_KEYS.concat(%w{wxwin wxxml wxwininstdir with-wxwin with-debug swig doxygen})
+  CFG_KEYS.concat(%w{wxwin wxxml wxwininstdir with-wxwin with-debug swig doxygen git})
+  WXW_SYS_KEY = 'with-system-wxwin'
   CONFIG.merge!({
                   'wxwin' => ENV['WXWIN'] || '',
                   'wxxml' => ENV['WXXML'] || '',
@@ -73,14 +77,16 @@ module WXRuby3
                   'with-wxwin' => !!ENV['WITH_WXWIN'],
                   'with-debug' => ((ENV['WXRUBY_DEBUG'] || '') == '1'),
                   'swig' => ENV['WXRUBY_SWIG'] || 'swig',
-                  'doxygen' => ENV['WXRUBY_DOXYGEN'] || 'doxygen'
+                  'doxygen' => ENV['WXRUBY_DOXYGEN'] || 'doxygen',
+                  'git' => ENV['WXRUBY_GIT'] || 'git'
                 })
+  CONFIG['autoinstall'] = (ENV['WXRUBY_AUTOINSTALL'] != '0') if ENV['WXRUBY_AUTOINSTALL']
   BUILD_CFG = '.wxconfig'
 
   # Ruby 2.5 is the minimum version for wxRuby3
   __rb_ver = RUBY_VERSION.split('.').collect {|v| v.to_i}
   if (__rb_major = __rb_ver.shift) < 2 || (__rb_major == 2 && __rb_ver.shift < 5)
-    STDERR.puts 'ERROR: wxRuby3 requires Ruby >= 2.5.0!'
+    $stderr.puts 'ERROR: wxRuby3 requires Ruby >= 2.5.0!'
     exit(1)
   end
 
@@ -111,38 +117,186 @@ module WXRuby3
 
   module Config
 
-    def do_run(*cmd, capture: nil)
-      output = nil
-      if capture
-        env_bup = exec_env.keys.inject({}) do |h, ev|
-          h[ev] = ENV[ev] ? ENV[ev].dup : nil
-          h
+    def self.command_to_s(*cmd)
+      txt = if ::Hash === cmd.first
+              cmd = cmd.dup
+              env = cmd.shift
+              env.collect { |k, v| "#{k}=#{v}" }.join(' ') << ' '
+            else
+              ''
+            end
+      txt << cmd.join(' ')
+    end
+
+    def run_silent?
+      !!ENV['WXRUBY_RUN_SILENT']
+    end
+
+    def silent_log_name
+      ENV['WXRUBY_RUN_SILENT'] || 'silent_run.log'
+    end
+
+    def log_progress(msg)
+      run_silent? ? silent_runner.log(msg) : $stdout.puts(msg)
+    end
+
+    class SilentRunner < Monitor
+
+      PROGRESS_CH = '.|/-\\|/-\\|'
+
+      def initialize
+        super
+        @cout = 0
+        @incremental = false
+      end
+
+      def incremental(f=true)
+        synchronize do
+          @cout = 0
+          @incremental = !!f
         end
-        case capture
-        when :out
-          # default
-        when :no_err
-          # redirect stderr to null sink
-          cmd << '2> ' << (windows? ? 'NULL' : '/dev/null')
-        when :err, :all
-          cmd << '2>&1'
+      end
+
+      def run(*cmd, **kwargs)
+        synchronize do
+          @cout = 0 unless @incremental
         end
-        begin
-          # setup ENV for child execution
-          ENV.merge!(Config.instance.exec_env)
-          output = `#{cmd.join(' ')}`
-        ensure
-          # restore ENV
-          env_bup.each_pair do |k,v|
-            if v
-              ENV[k] = v
-            else
-              ENV.delete(k)
+        output = nil
+        verbose = kwargs.delete(:verbose)
+        capture = kwargs.delete(:capture)
+        if (Config.instance.verbose? && verbose != false) || !capture
+          txt = Config.command_to_s(*cmd)
+          if Config.instance.verbose? && verbose != false
+            $stdout.puts txt
+          end
+          if !capture
+            silent_log { |f| f.puts txt }
+          end
+        end
+        if capture
+          if capture == :out || capture == :no_err
+            kwargs[:err] = (Config.instance.windows? ? 'NULL' : '/dev/null') if capture == :no_err
+            Open3.popen2(*cmd, **kwargs) do |_ins, os, tw|
+              output = silent_runner(os)
+              tw.value
+            end
+          else
+            Open3.popen2e(*cmd, **kwargs) do |_ins, eos, tw|
+              output = silent_runner(eos)
+              tw.value
+            end
+          end
+          output.join
+        else
+          rc = silent_log do |fout|
+            Open3.popen2e(*cmd, **kwargs) do |_ins, eos, tw|
+              silent_runner(eos, fout)
+              v = tw.value.exitstatus
+              fout.puts "-> Exit code: #{v}"
+              v
             end
           end
+          rc
+        end
+      end
+
+      def log(msg)
+        silent_log { |f| f.puts(msg) }
+      end
+
+      private
+
+      def silent_runner(os, output=[])
+        synchronize do
+          if @incremental
+            @cout += 1
+            $stdout.print "#{PROGRESS_CH[@cout%10]}\b"
+            $stdout.flush
+          end
+        end
+        os.each do |ln|
+          synchronize do
+            unless @incremental
+              @cout += 1
+              $stdout.print "#{PROGRESS_CH[@cout%10]}\b"
+              $stdout.flush
+            end
+            output << ln
+          end
+        end
+        output
+      end
+
+      def silent_log(&block)
+        File.open(Config.instance.silent_log_name, 'a') do |fout|
+          block.call(fout)
+        end
+      end
+
+    end
+
+    def silent_runner
+      @silent_runner ||= SilentRunner.new
+    end
+    private :silent_runner
+
+    def do_silent_run(*cmd, **kwargs)
+      silent_runner.run(*cmd, **kwargs)
+    end
+    private :do_silent_run
+
+    def do_silent_run_step(*cmd, **kwargs)
+      silent_runner.run_one(*cmd, **kwargs)
+    end
+    private :do_silent_run_step
+
+    def set_silent_run_incremental
+      silent_runner.incremental
+    end
+
+    def set_silent_run_batched
+      silent_runner.incremental(false)
+    end
+
+    def do_run(*cmd, capture: nil)
+      output = nil
+      if run_silent?
+        output = do_silent_run(exec_env, *cmd, capture: capture)
+        unless capture
+          fail "Command failed with status (#{rc}): #{Config.command_to_s(*cmd)}" unless output == 0
         end
       else
-        Rake.sh(exec_env, *cmd, verbose: verbose?)
+        if capture
+          env_bup = exec_env.keys.inject({}) do |h, ev|
+            h[ev] = ENV[ev] ? ENV[ev].dup : nil
+            h
+          end
+          case capture
+          when :out
+            # default
+          when :no_err
+            # redirect stderr to null sink
+            cmd << '2> ' << (windows? ? 'NULL' : '/dev/null')
+          when :err, :all
+            cmd << '2>&1'
+          end
+          begin
+            # setup ENV for child execution
+            ENV.update(Config.instance.exec_env)
+            output = `#{cmd.join(' ')}`
+          ensure
+            # restore ENV
+            env_bup.each_pair do |k,v|
+              if v
+                ENV[k] = v
+              else
+                ENV.delete(k)
+              end
+            end
+          end
+        else
+          Rake.sh(exec_env, *cmd, verbose: verbose?)
+        end
       end
       output
     end
@@ -182,24 +336,32 @@ module WXRuby3
     def expand(cmd)
       `#{cmd}`
     end
-    private :expand
 
-    def sh(*cmd, **kwargs)
-      Rake.sh(*cmd, **kwargs) { |ok,_| !!ok }
+    def sh(*cmd, fail_on_error: false, **kwargs)
+      if run_silent?
+        rc = do_silent_run(*cmd, **kwargs)
+        fail "Command failed with status (#{rc}): #{Config.command_to_s(*cmd)}" if fail_on_error && rc != 0
+        rc == 0
+      elsif fail_on_error
+        Rake.sh(*cmd, **kwargs)
+      else
+        Rake.sh(*cmd, **kwargs) { |ok,_| !!ok }
+      end
     end
-    private :sh
     alias :bash :sh
-    private :bash
 
     def test(*tests, **options)
       errors = 0
+      excludes = (ENV['WXRUBY_TEST_EXCLUDE'] || '').split(':')
       tests = Dir.glob(File.join(Config.instance.test_dir, '*.rb')) if tests.empty?
       tests.each do |test|
-        unless File.exist?(test)
-          test = File.join(Config.instance.test_dir, test)
-          test = Dir.glob(test+'.rb').shift || test unless File.exist?(test)
+        unless excludes.include?(File.basename(test, '.*'))
+          unless File.exist?(test)
+            test = File.join(Config.instance.test_dir, test)
+            test = Dir.glob(test+'.rb').shift || test unless File.exist?(test)
+          end
+          Rake.sh(Config.instance.exec_env, *make_ruby_cmd(test)) { |ok,status| errors += 1 unless ok }
         end
-        Rake.sh(Config.instance.exec_env, *make_ruby_cmd(test)) { |ok,status| errors += 1 unless ok }
       end
       fail "ERRORS: ##{errors} test scripts failed." if errors>0
     end
@@ -209,26 +371,60 @@ module WXRuby3
       Rake.sh(Config.instance.exec_env, *make_ruby_cmd('-x', irb_cmd), **options)
     end
 
-    def check_git
-      if expand("which git 2>/dev/null").chomp.empty?
-        STDERR.puts 'ERROR: Need GIT installed to run wxRuby3 bootstrap!'
-        exit(1)
-      end
+    def check_wx_config
+      false
+    end
+
+    def wx_config(_option)
+      nil
     end
 
-    def check_doxygen
-      if expand("which #{get_config('doxygen')} 2>/dev/null").chomp.empty?
-        STDERR.puts "ERROR: Cannot find #{get_config('doxygen')}. Need Doxygen installed to run wxRuby3 bootstrap!"
+    def check_tool_pkgs
+      []
+    end
+
+    def download_file(_url, _dest)
+      raise NoMethodError
+    end
+
+    def install_prerequisites
+      pkg_deps = check_tool_pkgs
+      if get_config('autoinstall') == false
+        $stderr.puts <<~__ERROR_TXT
+          ERROR: This system lacks installed versions of the following required software packages:
+            #{pkg_deps.join(', ')}
+            
+            Install these packages and try again.
+        __ERROR_TXT
         exit(1)
       end
+      pkg_deps
     end
 
-    def check_wx_config
-      false
+    # only called after src gem build
+    def cleanup_prerequisites
+      # noop
     end
 
-    def wx_config(_option)
-      nil
+    def wants_autoinstall?
+      flag = get_config('autoinstall')
+      if flag.nil?
+        $stdout.puts <<~__Q_TEXT
+
+          [ --- ATTENTION! --- ]
+          wxRuby3 requires some software packages to be installed before being able to continue building.
+          If you like these can be automatically installed next (if you are building the source gem the
+          software will be removed again after building finishes).
+          Do you want to have the required software installed now? [yN] : 
+        __Q_TEXT
+        answer = $stdin.gets(chomp: true).strip
+        while !answer.empty? && !%w[Y y N n].include?(answer)
+          $stdout.puts 'Please answer Y/y or N/n [Yn] : '
+          answer = $stdin.gets(chomp: true).strip
+        end
+        flag = %w[Y y].include?(answer)
+      end
+      flag
     end
 
     def get_config(key)
@@ -253,16 +449,22 @@ module WXRuby3
     def get_rpath_origin
       ''
     end
+    protected :get_rpath_origin
 
-    def check_rpath_patch
+    def patch_rpath(_shlib, *)
       true
     end
+    protected :patch_rpath
 
-    def patch_rpath(_shlib, *)
+    def update_shlib_loadpaths(_shlib)
       true
     end
 
-    def update_shlib_loadpaths(_shlib, _deplibs)
+    def update_shlib_ruby_libpath(_shlib)
+      true
+    end
+
+    def update_shlib_wxwin_libpaths(_shlib, _deplibs)
       true
     end
 
@@ -304,15 +506,23 @@ module WXRuby3
       end
 
       def save
+        cfg = WXRuby3::CONFIG.dup
+        wxw_system = !!cfg.delete(WXW_SYS_KEY)
+        cfg['wxwin'] = '@system' if wxw_system
         File.open(build_cfg, 'w') do |f|
-          f << JSON.pretty_generate(WXRuby3::CONFIG)
+          f << JSON.pretty_generate(cfg)
         end
       end
 
       def load
         if File.file?(build_cfg)
           File.open(build_cfg, 'r') do |f|
-            WXRuby3::CONFIG.merge!(JSON.load(f.read))
+            cfg = JSON.load(f.read)
+            if cfg['wxwin'] == '@system'
+              cfg[WXW_SYS_KEY] = true
+              cfg.delete('wxwin')
+            end
+            WXRuby3::CONFIG.merge!(cfg)
           end
         end
       end
@@ -325,10 +535,8 @@ module WXRuby3
         case RUBY_PLATFORM
         when /mingw/
           :mingw
-        when /cygwin/
-          :cygwin
-        when /netbsd/
-          :netbsd
+        when /freebsd/
+          :freebsd
         when /darwin/
           :macosx
         when /linux/
@@ -341,22 +549,33 @@ module WXRuby3
       def create
         load # load the build config (if any)
         klass = Class.new do
-          include Config
-
           include FileUtils
 
+          include Config
+
           def initialize
             @ruby_exe = RB_CONFIG["ruby_install_name"]
 
-            @extmk = /extmk\.rb/ =~ $0
-            @platform = Config.platform
-            require File.join(File.dirname(__FILE__), 'config', @platform.to_s)
+            @sysinfo = Plat4m.current rescue nil
+            @platform = if @sysinfo
+                          case @sysinfo.os.id
+                          when :darwin
+                            :macosx
+                          when :windows
+                            RUBY_PLATFORM =~ /mingw/ ? :mingw : :unknown
+                          else
+                            @sysinfo.os.id
+                          end
+                        else
+                          :unknown
+                        end
+            require_relative File.join('config', @platform.to_s)
             self.class.include(WXRuby3::Config::Platform)
 
             init # initialize settings
           end
 
-          attr_reader :ruby_exe, :extmk, :platform, :helper_modules, :helper_inits, :include_modules, :verbosity
+          attr_reader :ruby_exe, :sysinfo, :platform, :helper_modules, :helper_inits, :include_modules, :verbosity
           attr_reader :release_build, :debug_build, :verbose_debug, :no_deprecate
           attr_reader :ruby_cppflags, :ruby_ldflags, :ruby_libs, :extra_cflags, :extra_cppflags, :extra_ldflags,
                       :extra_libs, :cpp_out_flag, :link_output_flag, :obj_ext, :dll_ext,
@@ -403,11 +622,6 @@ module WXRuby3
 
             # Extra swig helper files to be built
             @helper_modules = %w|RubyStockObjects|
-              # if macosx?
-              #                   %w|RubyStockObjects Mac|
-              #                 else
-              #                   %w|RubyStockObjects|
-              #                 end
             # helper to initialize on startup (stock objects can only be initialized after App creation)
             @helper_inits = @helper_modules - %w|RubyStockObjects|
 
@@ -431,8 +645,10 @@ module WXRuby3
             @ruby_includes = [ RB_CONFIG["rubyhdrdir"],
                                RB_CONFIG["sitehdrdir"],
                                RB_CONFIG["vendorhdrdir"],
-                               File.join(RB_CONFIG["rubyhdrdir"],
-                               RB_CONFIG['arch']) ].compact
+                               RB_CONFIG['rubyarchhdrdir'] ?
+                                 RB_CONFIG['rubyarchhdrdir'] :
+                                 File.join(RB_CONFIG["rubyhdrdir"], RB_CONFIG['arch'])
+                              ].compact
             @ruby_includes << File.join(@wxruby_path, 'include')
 
             @ruby_cppflags    = [RB_CONFIG["CFLAGS"]].compact
@@ -448,7 +664,7 @@ module WXRuby3
             @obj_ext          = RB_CONFIG["OBJEXT"]
             @dll_ext          = RB_CONFIG['DLEXT']
 
-            # Exclude certian classes from being built, even if they are present
+            # Exclude certain classes from being built, even if they are present
             # in the configuration of wxWidgets.
             if ENV['WXRUBY_EXCLUDED']
               ENV['WXRUBY_EXCLUDED'].split(",").each { |classname| exclude_module(classname) }
@@ -482,10 +698,9 @@ module WXRuby3
 
           def report
             if @debug_build
-              puts "Enabled DEBUG build"
-              puts "Enabled debugging output"
+              log_progress("Enabled DEBUG build")
             else
-              puts "Enabled RELEASE build"
+              log_progress("Enabled RELEASE build")
             end
           end
 
@@ -513,16 +728,12 @@ module WXRuby3
             @wx_abi_version || ''
           end
 
-          def cygwin?
-            @platform == :cygwin
-          end
-
           def mingw?
             @platform == :mingw
           end
 
-          def netbsd?
-            @platform == :netbsd
+          def freebsd?
+            @platform == :freebsd
           end
 
           def macosx?
@@ -534,7 +745,7 @@ module WXRuby3
           end
 
           def windows?
-            mingw? || cygwin?
+            mingw?
           end
 
           def ldflags(_target)
@@ -550,7 +761,7 @@ module WXRuby3
           end
 
           def do_bootstrap
-            check_doxygen
+            install_prerequisites
             # do we have a local wxWidgets tree already?
             unless File.directory?(File.join(ext_path, 'wxWidgets', 'docs', 'doxygen'))
               wx_checkout
@@ -567,6 +778,11 @@ module WXRuby3
             respawn_rake
           end
 
+          def cleanup_bootstrap
+            rm_rf(File.join(ext_path, 'wxWidgets'), verbose: !WXRuby3.config.run_silent?) if File.directory?(File.join(ext_path, 'wxWidgets'))
+            cleanup_prerequisites
+          end
+
           # Testing the relevant wxWidgets setup.h file to see what
           # features are supported.
 
@@ -638,10 +854,7 @@ module WXRuby3
       private :create
 
       def instance
-        unless @instance
-          @instance = create
-        end
-        @instance
+        @instance ||= create
       end
 
       def get_config(key)

data/rakelib/lib/core/package.rb

@@ -604,55 +604,53 @@ module WXRuby3
       def generate_core_doc
         script = <<~__SCRIPT
           require 'wx'
-          Wx::App.run do 
-            STDOUT.puts \<<~__HEREDOC
-              # ----------------------------------------------------------------------------
-              # This file is automatically generated by the WXRuby3 documentation 
-              # generator. Do not alter this file.
-              # ----------------------------------------------------------------------------
-  
-  
-              module Wx
-              
-                # wxRuby version string
-                Wx::WXRUBY_VERSION = '\#{Wx::WXRUBY_VERSION}'
-              
-                # wxRuby version release type (alpha, beta, rc)
-                Wx::WXRUBY_RELEASE_TYPE = '\#{Wx::WXRUBY_RELEASE_TYPE}'
-                # wxRuby major version number
-                Wx::WXRUBY_MAJOR = \#{Wx::WXRUBY_MAJOR}
-                # wxRuby minor version number
-                Wx::WXRUBY_MINOR = \#{Wx::WXRUBY_MINOR}
-                # wxRuby release number
-                Wx::WXRUBY_RELEASE = \#{Wx::WXRUBY_RELEASE}
-              
-                # Convenience string for WxWidgets version info
-                WXWIDGETS_VERSION = '\#{Wx::WXWIDGETS_VERSION}'
-              
-                # Integer constant reflecting the major version of the wxWidgets release used to build wxRuby
-                WXWIDGETS_MAJOR_VERSION = \#{Wx::WXWIDGETS_MAJOR_VERSION}
-              
-                # Integer constant reflecting the minor version of the wxWidgets release used to build wxRuby
-                WXWIDGETS_MINOR_VERSION = \#{Wx::WXWIDGETS_MINOR_VERSION}
-              
-                # Integer constant reflecting the release number of the wxWidgets release used to build wxRuby
-                WXWIDGETS_RELEASE_NUMBER = \#{Wx::WXWIDGETS_RELEASE_NUMBER}
-              
-                # Integer constant reflecting the sub-release number of the wxWidgets release used to build wxRuby
-                WXWIDGETS_SUBRELEASE_NUMBER = \#{Wx::WXWIDGETS_SUBRELEASE_NUMBER}
-              
-                # Integer constant reflecting the wxWidgets wxDEBUG_LEVEL
-                WXWIDGETS_DEBUG_LEVEL = \#{Wx::WXWIDGETS_DEBUG_LEVEL}
-
-                # Boolean constant indicating if wxRuby was build in debug (true) or release (false) mode
-                DEBUG = \#{Wx::DEBUG}
-              
-                # Platform id of the wxWidgets port used to build wxRuby
-                PLATFORM = '\#{Wx::PLATFORM}'
-              
-              end
-              __HEREDOC
-          end
+          STDOUT.puts \<<~__HEREDOC
+            # ----------------------------------------------------------------------------
+            # This file is automatically generated by the WXRuby3 documentation 
+            # generator. Do not alter this file.
+            # ----------------------------------------------------------------------------
+
+
+            module Wx
+            
+              # wxRuby version string
+              WXRUBY_VERSION = '\#{Wx::WXRUBY_VERSION}'
+            
+              # wxRuby version release type (alpha, beta, rc)
+              WXRUBY_RELEASE_TYPE = '\#{Wx::WXRUBY_RELEASE_TYPE}'
+              # wxRuby major version number
+              WXRUBY_MAJOR = \#{Wx::WXRUBY_MAJOR}
+              # wxRuby minor version number
+              WXRUBY_MINOR = \#{Wx::WXRUBY_MINOR}
+              # wxRuby release number
+              WXRUBY_RELEASE = \#{Wx::WXRUBY_RELEASE}
+            
+              # Convenience string for WxWidgets version info
+              WXWIDGETS_VERSION = '\#{Wx::WXWIDGETS_VERSION}'
+            
+              # Integer constant reflecting the major version of the wxWidgets release used to build wxRuby
+              WXWIDGETS_MAJOR_VERSION = \#{Wx::WXWIDGETS_MAJOR_VERSION}
+            
+              # Integer constant reflecting the minor version of the wxWidgets release used to build wxRuby
+              WXWIDGETS_MINOR_VERSION = \#{Wx::WXWIDGETS_MINOR_VERSION}
+            
+              # Integer constant reflecting the release number of the wxWidgets release used to build wxRuby
+              WXWIDGETS_RELEASE_NUMBER = \#{Wx::WXWIDGETS_RELEASE_NUMBER}
+            
+              # Integer constant reflecting the sub-release number of the wxWidgets release used to build wxRuby
+              WXWIDGETS_SUBRELEASE_NUMBER = \#{Wx::WXWIDGETS_SUBRELEASE_NUMBER}
+            
+              # Integer constant reflecting the wxWidgets wxDEBUG_LEVEL
+              WXWIDGETS_DEBUG_LEVEL = \#{Wx::WXWIDGETS_DEBUG_LEVEL}
+
+              # Boolean constant indicating if wxRuby was build in debug (true) or release (false) mode
+              DEBUG = \#{Wx::DEBUG}
+            
+              # Platform id of the wxWidgets port used to build wxRuby
+              PLATFORM = '\#{Wx::PLATFORM}'
+            
+            end
+            __HEREDOC
           __SCRIPT
         begin
           tmpfile = Tempfile.new('script')

data/rakelib/lib/director/aui_manager.rb

@@ -53,7 +53,7 @@ module WXRuby3
               m_actionWindow = NULL;
               m_hoverButton = NULL;
               m_art = new wxAuiDefaultDockArt;
-              m_hintWnd = NULL;
+              #{Config.instance.wx_version < '3.3.0' ? 'm_hintWnd = NULL;' : ''}
               m_flags = wxAUI_MGR_DEFAULT;
               m_hasMaximized = false;
               m_dockConstraintX = 0.3;