wxruby3 0.9.5-x64-mingw-ucrt → 0.9.7-x64-mingw-ucrt

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(' ')

data/rakelib/lib/config/mingw.rb

@@ -8,6 +8,9 @@
 
 require_relative './unixish'
 
+require 'uri'
+
+
 if ENV['RI_DEVKIT'].nil?
   begin
     require 'devkit'
@@ -23,6 +26,13 @@ module WXRuby3
 
     module Platform
 
+      SWIG_URL = 'https://sourceforge.net/projects/swig/files/swigwin/swigwin-4.2.0/swigwin-4.2.0.zip/download'
+      SWIG_ZIP = 'swigwin-4.2.0.zip'
+
+      DOXYGEN_URL = 'https://www.doxygen.nl/files/doxygen-1.10.0.windows.x64.bin.zip'
+
+      GIT_URL = 'https://github.com/git-for-windows/git/releases/download/v2.43.0.windows.1/MinGit-2.43.0-64-bit.zip'
+
       def self.included(base)
         base.class_eval do
           include Config::UnixLike
@@ -65,20 +75,79 @@ module WXRuby3
             ftmp.unlink # cleanup
           end
 
-          private
-
-          def wx_make
-            bash('make && make install')
+          def check_tool_pkgs
+            pkg_deps = []
+            pkg_deps << 'doxygen' if expand("which #{get_cfg_string('doxygen')} 2>/dev/null").strip.empty?
+            pkg_deps << 'swig' if expand("which #{get_cfg_string('swig')} 2>/dev/null").strip.empty?
+            pkg_deps << 'git' if expand("which #{get_cfg_string('git')} 2>/dev/null").strip.empty?
+            pkg_deps
           end
 
-          def wx_generate_xml
-            chdir(File.join(ext_path, 'wxWidgets', 'docs', 'doxygen')) do
-              sh({ 'WX_SKIP_DOXYGEN_VERSION_CHECK' => '1' }, 'regen.bat xml')
+          def install_prerequisites
+            pkg_deps = super
+            unless pkg_deps.empty?
+              # autoinstall or not?
+              unless wants_autoinstall?
+                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
+              # if SWIG was not found in the PATH
+              if pkg_deps.include?('swig')
+                $stdout.print 'Installing SWIG...' if run_silent?
+                # download and install SWIG
+                fname = download_and_install(SWIG_URL, SWIG_ZIP, 'swig.exe')
+                $stdout.puts 'done!' if run_silent?
+                Config.instance.log_progress("Installed #{fname}")
+                set_config('swig', fname)
+                Config.save
+              end
+              # if doxygen was not found in the PATH
+              if pkg_deps.include?('doxygen')
+                $stdout.print 'Installing Doxygen...' if run_silent?
+                # download and install doxygen
+                fname = download_and_install(DOXYGEN_URL, File.basename(URI(DOXYGEN_URL).path), 'doxygen.exe', 'doxygen')
+                $stdout.puts 'done!' if run_silent?
+                Config.instance.log_progress("Installed #{fname}")
+                set_config('doxygen', fname)
+                Config.save
+              end
+              # if git was not found in the PATH
+              if pkg_deps.include?('git')
+                $stdout.print 'Installing Git...' if run_silent?
+                # download and install doxygen
+                fname = download_and_install(GIT_URL, File.basename(URI(GIT_URL).path), 'git.exe', 'git')
+                $stdout.puts 'done!' if run_silent?
+                Config.instance.log_progress("Installed #{fname}")
+                set_config('git', fname)
+                Config.save
+              end
             end
+            []
           end
 
-          def respawn_rake(argv = ARGV)
-            Kernel.exec('rake', *argv)
+          # only called after src gem build
+          def cleanup_prerequisites
+            tmp_tool_root = File.join(ENV['HOME'].gsub("\\", '/'), '.wxruby3')
+            path = get_cfg_string('swig')
+            unless path.empty? || !path.start_with?(tmp_tool_root)
+              path = File.dirname(path) while File.dirname(path) != tmp_tool_root
+              rm_rf(path)
+            end
+            path = get_cfg_string('doxygen')
+            unless path.empty? || !path.start_with?(tmp_tool_root)
+              path = File.dirname(path) while File.dirname(path) != tmp_tool_root
+              rm_rf(path)
+            end
+            path = get_cfg_string('git')
+            unless path.empty? || !path.start_with?(tmp_tool_root)
+              path = File.dirname(path) while File.dirname(path) != tmp_tool_root
+              rm_rf(path)
+            end
           end
 
           def expand(cmd)
@@ -93,6 +162,61 @@ module WXRuby3
             super(*cmd, **kwargs)
           end
 
+          private
+
+          def download_and_install(url, zip, exe, unpack_to=nil)
+            # make sure the download destination exists
+            tmp_tool_root = File.join(ENV['HOME'].gsub("\\", '/'), '.wxruby3')
+            dest = unpack_to ? File.join(tmp_tool_root, unpack_to) : File.join(tmp_tool_root, File.basename(zip, '.*'))
+            mkdir(tmp_tool_root) unless File.directory?(tmp_tool_root)
+            # download
+            chdir(tmp_tool_root) do
+              unless sh("curl -L #{url} --output #{zip}")
+                STDERR.puts "ERROR: Failed to download installation package for #{exe}"
+                exit(1)
+              end
+              # unpack
+              unless sh("powershell Expand-Archive -LiteralPath '#{zip}' -DestinationPath #{dest} -Force")
+                STDERR.puts "ERROR: Failed to unpack installation package for #{exe}"
+                exit(1)
+              end
+              # cleanup
+              rm_f(zip)
+            end
+            # find executable
+            find_exe(dest, exe)
+          end
+
+          def find_exe(path, exe)
+            fp = Dir.glob(File.join(path, '*')).find { |p| File.file?(p) && File.basename(p) == exe }
+            unless fp
+              Dir.glob(File.join(path, '*')).each do |p|
+                fp = find_exe(p, exe) if File.directory?(p)
+                return fp if fp
+              end
+            end
+            fp
+          end
+
+          def wx_make
+            bash('make && make install')
+          end
+
+          def wx_generate_xml
+            doxygen = get_cfg_string("doxygen")
+            doxygen = nix_path(doxygen) unless doxygen == 'doxygen'
+            chdir(File.join(ext_path, 'wxWidgets', 'docs', 'doxygen')) do
+              unless bash({ 'DOXYGEN' => doxygen,  'WX_SKIP_DOXYGEN_VERSION_CHECK' => '1' }, './regen.sh', 'xml')
+                $stderr.puts 'ERROR: Failed to generate wxWidgets XML API specifications for parsing by wxRuby3.'
+                exit(1)
+              end
+            end
+          end
+
+          def respawn_rake(argv = ARGV)
+            Kernel.exec('rake', *argv)
+          end
+
           def nix_path(winpath)
             (winpath.nil? || winpath.empty?) ? '' : `cygpath -a -u #{winpath}`.strip
           end

data/rakelib/lib/config/pkgman/arch.rb

@@ -0,0 +1,53 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 buildtools platform pkg manager for Arch Linux type systems
+###
+
+module WXRuby3
+
+  module Config
+
+    module Platform
+
+      module PkgManager
+
+        PLATFORM_DEPS = %w[pkg-config gtk3 webkit2gtk gspell libunwind gstreamer curl libsecret libnotify libpng12]
+
+        class << self
+
+          private
+
+          def do_install(distro, pkgs)
+            run_pacman(make_install_cmd(pkgs))
+          end
+
+          def add_platform_pkgs(pkgs)
+            if pkgs.include?('g++')
+              pkgs.delete('g++')
+              pkgs << 'gcc'
+            end
+            # find pkgs we need
+            PLATFORM_DEPS.inject(pkgs) { |list, pkg| list << pkg unless system("pacman -Qq #{pkg} >/dev/null 2>&1"); list }
+          end
+
+          def run_pacman(cmd)
+            run("pacman -q --noconfirm #{cmd}")
+          end
+
+          def make_install_cmd(pkgs)
+            # create install command
+            "-S --needed #{ pkgs.join(' ') }"
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/rakelib/lib/config/pkgman/base.rb

@@ -0,0 +1,169 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 buildtools platform pkg manager base
+###
+
+module WXRuby3
+
+  module Config
+
+    module Platform
+
+      module PkgManager
+
+        MIN_GENERIC_PKGS = %w[gtk3-devel patchelf g++ make git webkit2gtk3-devel gspell-devel gstreamer-devel gstreamer-plugins-base-devel libcurl-devel libsecret-devel libnotify-devel libSDL-devel zlib-devel]
+
+        class << self
+
+          def install(pkgs)
+            # do we need to install anything?
+            if !pkgs.empty? || builds_wxwidgets?
+              # determine the linux distro specs
+              distro = get_distro
+              begin
+                # load distro installation support
+                require_relative "./#{distro[:type]}"
+              rescue LoadError
+                # do we need to build wxWidgets?
+                pkgs.concat(MIN_GENERIC_PKGS) if builds_wxwidgets?
+                $stderr.puts <<~__ERROR_TXT
+                  ERROR: Do not know how to install required packages for distro type '#{distro[:type]}'.
+  
+                  Make sure the following packages (or equivalent) are installed and than try again with `WXRUBY_NO_AUTOINSTALL=1`:
+                  #{pkgs.join(', ')}
+                  __ERROR_TXT
+                exit(1)
+              end
+              # can we install?
+              unless no_autoinstall? || has_sudo? || is_root?
+                $stderr.puts 'ERROR: Cannot check for or install required packages. Please install sudo or run as root and try again.'
+                exit(1)
+              end
+              # do we need to build wxWidgets?
+              if builds_wxwidgets?
+                # add platform specific packages for wxWidgets
+                add_platform_pkgs(pkgs)
+              end
+              # do we actually have any packages to install?
+              unless pkgs.empty?
+                # autoinstall or not?
+                unless wants_autoinstall?
+                  $stderr.puts <<~__ERROR_TXT
+                    ERROR: This system may lack installed versions of the following required software packages:
+                      #{pkgs.join(', ')}
+                      
+                    Install these packages and try again.
+                    __ERROR_TXT
+                  exit(1)
+                end
+                # do the actual install
+                unless do_install(distro, pkgs)
+                  $stderr.puts <<~__ERROR_TXT
+                    ERROR: Failed to install all or some of the following required software packages:
+                    #{pkgs.join(', ')}
+                    
+                    Fix any problems or install these packages yourself and try again.
+                    __ERROR_TXT
+                  if WXRuby3.config.run_silent?
+                    $stderr.puts "For error details check #{WXRuby3.config.silent_log_name}"
+                  end
+                  exit(1)
+                end
+              end
+            end
+          end
+
+          private
+
+          def builds_wxwidgets?
+            Config.get_config('with-wxwin') && Config.get_cfg_string('wxwin').empty?
+          end
+
+          def no_autoinstall?
+            Config.get_config('autoinstall') == false
+          end
+
+          def wants_autoinstall?
+            WXRuby3.config.wants_autoinstall?
+          end
+
+          def has_sudo?
+            system('command -v sudo > /dev/null')
+          end
+
+          def is_root?
+            `id -u 2>/dev/null`.chomp == '0'
+          end
+
+          def run(cmd)
+            $stdout.print "Running #{cmd}..."
+            rc = WXRuby3.config.sh("#{is_root? ? '' : 'sudo '}#{cmd}")
+            $stderr.puts (rc ? 'done!' : 'FAILED!')
+            rc
+          end
+
+          def expand(cmd)
+            `#{is_root? ? '' : 'sudo '}#{cmd}`
+          end
+
+          def get_distro
+            if File.file?('/etc/os-release') # works with most (if not all) recent distro releases
+              data = File.readlines('/etc/os-release').reduce({}) do |hash, line|
+                val, var = line.split('=')
+                hash[val] = var.strip.gsub(/(\A")|("\Z)/, '')
+                hash
+              end
+              {
+                type: if data['ID_LIKE']
+                        data['ID_LIKE'].split.first.to_sym
+                      elsif File.file?('/etc/redhat-release')
+                        :rhel
+                      elsif File.file?('/etc/SUSE-brand') || File.file?('/etc/SuSE-release')
+                        :suse
+                      elsif File.file?('/etc/debian_version')
+                        :debian
+                      else
+                        data['ID'].to_sym
+                      end,
+                distro: data['ID'].downcase,
+                release: data['VERSION_ID']
+              }
+            elsif File.file?('/etc/redhat-release')
+              data = File.read('/etc/redhat-release').strip
+              {
+                type: :rhel,
+                distro: data.split.shift.downcase,
+                release: data =~ /\d+(\.\d+)*/ ? $~[0] : ''
+              }
+            elsif File.file?('/etc/SUSE-brand') || File.file?('/etc/SuSE-release')
+              data = File.readlines(File.file?('/etc/SUSE-brand') ? '/etc/SUSE-brand' : '/etc/SuSE-release')
+              {
+                type: :suse,
+                distro: data.shift.split.shift.downcase,
+                release: (data.find { |s| s.strip =~ /\AVERSION\s*=/ } || '').split('=').last || ''
+              }
+            elsif File.file?('/etc/debian_version')
+              {
+                type: :debian,
+                distro: 'generic',
+                release: File.read('/etc/debian_version').strip
+              }
+            else
+              {
+                type: :unknown
+              }
+            end
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/rakelib/lib/config/pkgman/debian.rb

@@ -0,0 +1,66 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 buildtools platform pkg manager for Debian type systems
+###
+
+module WXRuby3
+
+  module Config
+
+    module Platform
+
+      module PkgManager
+
+        PLATFORM_DEPS = %w[libgtk-3-dev libwebkit2gtk-4.0-dev libgspell-1-dev libunwind-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcurl4-openssl-dev libsecret-1-dev libnotify-dev]
+
+        class << self
+
+          private
+
+          def do_install(distro, pkgs)
+            run_apt(make_install_cmd(pkgs))
+          end
+
+          def add_platform_pkgs(pkgs)
+            # get architecture
+            arch = expand('dpkg --print-architecture').strip
+            # find pkgs we need
+            PLATFORM_DEPS.inject(pkgs) do |list, pkg|
+              list << pkg unless (system("dpkg-query -s \"#{pkg}:#{arch}\" >/dev/null 2>&1") ||
+                                    system("dpkg-query -s \"#{pkg}:all\" >/dev/null 2>&1") ||
+                                    (expand("dpkg-query -s \"#{pkg}\" 2>/dev/null").strip =~ /Architecture: (#{arch}|all)/))
+              list
+            end
+          end
+
+          def run_apt(cmd)
+            run("DEBIAN_FRONTEND=noninteractive apt-get -q -o=Dpkg::Use-Pty=0 #{cmd}")
+          end
+
+          def update_pkgs
+            run_apt('update')
+          end
+
+          def make_install_cmd(pkgs)
+            # update cache
+            update_pkgs
+            # get list of available packages
+            apt_cache = `apt-cache pkgnames`.chomp.split("\n").collect { |s| s.strip }
+            # remove un-installables
+            pkgs = pkgs.select { |pkg| apt_cache.include?(pkg) }
+            # create install command
+            "install -y #{ pkgs.join(' ') }"
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end