wxruby3 0.9.5 → 0.9.7

data/rakelib/lib/swig_runner.rb

@@ -43,24 +43,23 @@ module WXRuby3
         @swig_version
       end
 
-
       def check_swig
         begin
           @swig_version = `#{WXRuby3::Config.get_config('swig')} -version`[/\d+\.\d+\.\d+/]
         rescue Exception
-          STDERR.puts "ERROR: Could not run SWIG (#{WXRuby3::Config.get_config('swig')})"
+          $stderr.puts "ERROR: Could not run SWIG (#{WXRuby3::Config.get_config('swig')})"
           exit(1)
         end
 
-        # Very old versions put --version on STDERR, not STDOUT
+        # Very old versions put --version on $stderr, not $stdout
         unless @swig_version
-          STDERR.puts "Could not get version info from SWIG; " +
+          $stderr.puts "Could not get version info from SWIG; " +
                         "is a very old version installed?.\n"
           exit(1)
         end
 
         if @swig_version < SWIG_MINIMUM_VERSION
-          STDERR.puts "SWIG version #{@swig_version} is installed, " +
+          $stderr.puts "SWIG version #{@swig_version} is installed, " +
                         "minimum version required is #{SWIG_MINIMUM_VERSION}.\n"
           exit(1)
         end
@@ -72,11 +71,12 @@ module WXRuby3
         check_swig unless swig_state
         inc_paths = "-I#{config.wxruby_dir} -I#{config.swig_dir}/custom"
         inc_paths << " -I#{config.swig_dir}/custom/swig#{swig_major}"
-        sh "#{config.get_config('swig')} #{config.wx_cppflags.join(' ')} " +
-             "#{config.extra_cppflags.join(' ')} #{config.verbose_flag} #{inc_paths} " +
-             #"-w401 -w801 -w515 -c++ -ruby " +
-             "-w801 -c++ -ruby " +
-             "-o #{target} #{source}"
+        WXRuby3.config.sh "#{config.get_config('swig')} #{config.wx_cppflags.join(' ')} " +
+                            "#{config.extra_cppflags.join(' ')} #{config.verbose_flag} #{inc_paths} " +
+                            #"-w401 -w801 -w515 -c++ -ruby " +
+                            "-w801 -c++ -ruby " +
+                            "-o #{target} #{source}",
+                          fail_on_error: true
       end
 
     end
@@ -205,7 +205,7 @@ module WXRuby3
       end
 
       def self.run(pid, director, target)
-        puts "Processor.#{pid}: #{target}"
+        Config.instance.log_progress("Processor.#{pid}: #{target}")
         const_get(camelize(pid.to_s)).new(director, target).run
       end
 

data/rakelib/prepost.rake

@@ -23,16 +23,21 @@ namespace 'wxruby' do
 
   namespace 'post' do
 
-    task :srcgem => %w[gem:wxwin gem:install wxruby:doc] do
+    task :srcgem => %w[gem:wxwin gem:install] do
+      $stdout.print "Generating wxRuby3 reference documentation..." if WXRuby3.config.run_silent?
+      Rake::Task['wxruby:doc'].invoke
+      $stdout.puts 'done!' if WXRuby3.config.run_silent?
       # cleanup
-      rm_rf('rakelib')
-      rm_rf('ext/wxruby3')
-      rm_rf('ext/wxWidgets') if File.exist?('ext/wxWidgets')
+      rm_rf('rakelib', verbose: !WXRuby3.config.run_silent?)
+      rm_rf('ext/wxruby3', verbose: !WXRuby3.config.run_silent?)
+      WXRuby3.config.cleanup_bootstrap
+      File.open(File.join(WXRuby3::Config.wxruby_root, 'ext', 'wxruby.setup.done'), 'w') { |f| f << '1' }
     end
 
     task :bingem => 'gem:install' do
       # cleanup
       rm_rf('rakelib')
+      File.open(File.join(WXRuby3::Config.wxruby_root, 'ext', 'wxruby.setup.done'), 'w') { |f| f << '1' }
     end
 
     namespace 'gem' do

data/rakelib/yard/templates/default/fulldoc/html/css/wxruby3.css

@@ -77,3 +77,17 @@ div.wxrb-logo table td {
     font-weight: bold;
     font-size: 0.9em;
 }
+
+#filecontents {
+    margin-right: 340px;
+}
+
+#filecontents blockquote {
+    border-left: .5em solid #e0e0e0;
+    margin: 10px;
+    padding-left: 10px;
+}
+
+#toc {
+    position: fixed;
+}

data/rakelib/yard/templates/default/fulldoc/html/setup.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
 def init
-  # It seems YARD messes things up so that a number of classes are not properly
+  # It seems YARD messes things up so that a lot of classes, modules and constants are not properly
   # registered in their enclosing namespaces.
   # This hack makes sure that if that is the case we fix that here.
-  all_classes = Registry.all(:class)
-  all_classes.each do |c|
+  all_objects = Registry.all(:class, :constant, :module)
+  all_objects.each do |c|
     if (ns = c.namespace)
       unless ns.children.any? { |nsc| nsc.path == c.path }
-        ns.children << c # class missing from child list of enclosing namespace -> add here
+        ns.children << c # class/module/constant missing from child list of enclosing namespace -> add here
       end
     end
     if (ns = Registry[c.namespace.path])
       unless ns.children.any? { |nsc| nsc.path == c.path }
-        ns.children << c # class missing from child list of enclosing namespace -> add here
+        ns.children << c # class/module/constant missing from child list of enclosing namespace -> add here
       end
     end
   end

data/rakelib/yard/yard/relative_markdown_links.rb

@@ -31,12 +31,18 @@ module YARD # rubocop:disable Style/Documentation
           if fnames.include?(href.path)
             link.replace "{file:#{href} #{link.inner_html}}"
           elsif href.path.end_with?('_md.html') && (fname = fnames.find {|fnm| fnm.end_with?(href.path.sub(/_md.html\Z/, '.md')) })
-            link.replace "{file:#{fname} #{link.inner_html}}"
+            link.replace "{file:#{fname}#{href.fragment ? "##{fragment_to_yard(href.fragment)}" : ''} #{link.inner_html}}"
           end
         end
       end
       super(html.to_s)
     end
+
+    # this does not work with mixed case labels but is good enough for us
+    def fragment_to_yard(s)
+      s.start_with?('label-') ? s : "label-#{s.gsub('-', '+').capitalize}"
+    end
+
   end
 
   Templates::Template.extra_includes << RelativeMarkdownLinks

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.7
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-15 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -71,8 +71,7 @@ description: wxRuby3 is a Ruby library providing an extension for the wxWidgets
 email: mcorino@m2c-software.nl
 executables:
 - wxruby
-extensions:
-- ext/mkrf_conf_srcgem.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - ".yardopts"
@@ -96,7 +95,6 @@ files:
 - assets/logo.xcf
 - assets/repo-social-preview.png
 - bin/wxruby
-- ext/mkrf_conf_srcgem.rb
 - ext/wxruby3/include/wxRubyApp.h
 - ext/wxruby3/include/wxruby-ClientData.h
 - ext/wxruby3/include/wxruby-ComboPopup.h
@@ -398,13 +396,19 @@ files:
 - lib/wx/version.rb
 - lib/wx/wxruby/base.rb
 - lib/wx/wxruby/cmd/sampler.rb
+- lib/wx/wxruby/cmd/setup.rb
 - lib/wx/wxruby/cmd/test.rb
+- rakefile
+- rakelib/bin.rake
+- rakelib/bin.rb
 - rakelib/build.rake
 - rakelib/build.rb
 - rakelib/config.rake
 - rakelib/configure.rb
 - rakelib/doc.rake
 - rakelib/doc.rb
+- rakelib/gem.rake
+- rakelib/gem.rb
 - rakelib/install.rake
 - rakelib/install.rb
 - rakelib/lib/config.rb
@@ -413,6 +417,12 @@ files:
 - rakelib/lib/config/macosx.rb
 - rakelib/lib/config/mingw.rb
 - rakelib/lib/config/netbsd.rb
+- rakelib/lib/config/pkgman/arch.rb
+- rakelib/lib/config/pkgman/base.rb
+- rakelib/lib/config/pkgman/debian.rb
+- rakelib/lib/config/pkgman/macosx.rb
+- rakelib/lib/config/pkgman/rhel.rb
+- rakelib/lib/config/pkgman/suse.rb
 - rakelib/lib/config/unixish.rb
 - rakelib/lib/core/include/client_data.inc
 - rakelib/lib/core/include/enum.inc
@@ -788,7 +798,6 @@ files:
 - rakelib/lib/util/string.rb
 - rakelib/prepost.rake
 - rakelib/prepost.rb
-- rakelib/run.rake
 - rakelib/yard/templates/default/fulldoc/html/css/wxruby3.css
 - rakelib/yard/templates/default/fulldoc/html/full_list.erb
 - rakelib/yard/templates/default/fulldoc/html/setup.rb
@@ -1135,19 +1144,14 @@ metadata:
   source_code_uri: https://github.com/mcorino/wxRuby3
   documentation_uri: https://mcorino.github.io/wxRuby3
   homepage_uri: https://github.com/mcorino/wxRuby3
-post_install_message: |2
+post_install_message: |2+
 
-  wxRuby3 has been successfully installed including the 'wxruby' utility.
+  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'.
 
-  You can run the regression tests to verify the installation by executing:
+  Run 'wxruby setup -h' to see information on the available commandline options.
 
-  $ ./wxruby test
-
-  The wxRuby3 sample selector can be run by executing:
-
-  $ ./wxruby sampler
-
-  Have fun using wxRuby3.
 rdoc_options:
 - "--exclude=\\.dll"
 - "--exclude=\\.so"
@@ -1167,7 +1171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: wxWidgets extension for Ruby

data/ext/mkrf_conf_srcgem.rb

@@ -1,67 +0,0 @@
-# Copyright (c) 2023 M.J.N. Corino, The Netherlands
-#
-# This software is released under the MIT license.
-
-###
-# wxRuby3 extension configuration file for source gem
-###
-
-# generate Rakefile with appropriate default task (all actual task in rakelib)
-File.open('../Rakefile', 'w') do |f|
-  f.puts <<EOF__
-###
-# wxRuby3 rake file
-# Copyright (c) M.J.N. Corino, The Netherlands
-###
-
-task :default => 'wxruby:build' do
-  Rake::Task['wxruby:post:srcgem'].invoke
-end
-EOF__
-end
-
-require 'rbconfig'
-if defined? ::RbConfig
-  RB_CONFIG = ::RbConfig
-else
-  RB_CONFIG = ::Config
-end unless defined? RB_CONFIG
-RB_CONFIG::MAKEFILE_CONFIG['TRY_LINK'] = "$(CXX) #{RB_CONFIG::MAKEFILE_CONFIG['OUTFLAG']}conftest#{$EXEEXT} $(INCFLAGS) $(CPPFLAGS) " \
-    "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
-require 'mkmf'
-if defined?(MakeMakefile)
-  MakeMakefile::COMMON_HEADERS.clear
-elsif defined?(COMMON_HEADERS)
-  COMMON_HEADERS.slice!(/./)
-end
-
-usage_txt =<<-__EOT
-Please make sure you have a valid build environment either by having a system provided wxWidgets 
-development package installed (>= 3.2.0) or provide the paths to a locally built and installed 
-wxWidgets release (>= 3.2.0) by setting the WXWIN environment variable (and optionally WXXML) 
-for the 'gem install' command.
-Installed versions of SWIG (>= 3.0.12) and (if no WXXML path is provided) doxygen and git are
-also required. 
-Checkout the documentation at https://github.com/mcorino/wxRuby3 for more information.
-__EOT
-
-wxwin = ENV['WXWIN']
-wxxml = ENV['WXXML']
-with_wxwin = !!ENV['WITH_WXWIN']
-
-# run configure with appropriate settings
-cfgargs = ''
-if wxwin || with_wxwin
-  cfgargs = ["--wxwin=#{wxwin}"]
-  cfgargs << "--wxxml=#{wxxml}" if wxxml
-  cfgargs << '--with-wxwin' if with_wxwin
-  cfgargs = "[#{cfgargs.join(',')}]"
-end
-Dir.chdir('..') do
-  puts "Running 'rake #{ARGV.join(' ')} configure#{cfgargs}'"
-  unless system("rake #{ARGV.join(' ')} configure#{cfgargs}")
-    puts 'Failed to configure wxRuby3'
-    puts usage_txt
-    exit(1)
-  end
-end

data/rakelib/run.rake

@@ -1,52 +0,0 @@
-# Copyright (c) 2023 M.J.N. Corino, The Netherlands
-#
-# This software is released under the MIT license.
-
-###
-# wxRuby3 rake file
-###
-
-require_relative './configure'
-
-namespace :wxruby do
-
-  task :run, [:app] => 'config:bootstrap' do |t, args|
-    Rake::Task[:build].invoke
-    WXRuby3.config.run args[:app]
-  end
-
-  task :debug, [:app] => 'config:bootstrap' do |t, args|
-    Rake::Task[:build].invoke
-    WXRuby3.config.debug args[:app]
-  end
-
-  task :test => 'config:bootstrap' do |t, args|
-    Rake::Task[:build].invoke
-    tests = args.extras - [':nodep']
-    tests << ENV['TEST'] if ENV['TEST']
-    WXRuby3.config.test *tests
-  end
-
-  task :irb => 'config:bootstrap' do |t, args|
-    Rake::Task[:build].invoke
-    WXRuby3.config.irb
-  end
-
-  task :exec => 'config:bootstrap' do |t, args|
-    WXRuby3.config.execute args.extras
-  end
-
-end
-
-desc "Run wxRuby tests"
-task :test => 'wxruby:test'
-
-task :tests => 'wxruby:test'
-
-desc 'Run wxRuby (sample) app'
-task :run, [:app] => 'wxruby:run'
-
-desc 'Debug wxRuby (sample) app'
-task :debug, [:app] => 'wxruby:debug'
-
-task :irb => 'wxruby:irb'