wxruby3 0.9.0.pre.rc.1-x64-mingw-ucrt → 0.9.0.pre.rc.3-x64-mingw-ucrt

data/rakelib/lib/config/macosx.rb

@@ -3,4 +3,123 @@
 # Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
-raise "MacOSX platform is unsupported as yet."
+require_relative './unixish'
+
+module WXRuby3
+
+  module Config
+
+    module Platform
+
+      def self.included(base)
+        base.class_eval do
+          include Config::UnixLike
+
+          def debug_command(*args)
+            args.unshift(FileUtils::RUBY)
+            args.unshift('--')
+            args.unshift('lldb')
+            args.join(' ')
+          end
+
+          def dll_mask
+            "{#{dll_ext},dylib}"
+          end
+
+          def get_rpath_origin
+            "@loader_path"
+          end
+
+          def check_rpath_patch
+            # no need to check anything; install_name_tool is part of XCode cmdline tools
+            # and without these we couldn't build anything
+            true
+          end
+
+          def patch_rpath(shlib, *rpath)
+            # don't leave old rpath-s behind
+            sh("install_name_tool -delete_rpath '@loader_path/../lib' #{shlib} 2>/dev/null", verbose: false) { |_,_| }
+            # add deployment rpath-s
+            sh("install_name_tool #{rpath.collect {|rp| "-add_rpath '#{rp}'"}.join(' ')} #{shlib} 2>/dev/null", verbose: false) { |_,_| }
+            true
+          end
+
+          def update_shlib_loadpaths(shlib, deplibs)
+            changes = deplibs.collect { |dl| "-change '#{dl}' '@rpath/#{File.basename(dl)}'"}
+            sh("install_name_tool #{changes.join(' ')} #{shlib} 2>/dev/null", verbose: false) { |_,_| }
+            true
+          end
+
+          def get_wx_libs
+            wx_libset = ::Set.new
+            lib_list = wx_config("--libs all").split(' ')
+            until lib_list.empty?
+              s = lib_list.shift
+              if s == '-framework'
+                wx_libset << "#{s} #{lib_list.shift}"
+              else
+                wx_libset << s
+              end
+            end
+            # some weird thing with this; at least sometimes '--libs all' will not output media library even if feature active
+            if features_set?('wxUSE_MEDIACTRL')
+              lib_list = wx_config("--libs media").split(' ')
+              until lib_list.empty?
+                s = lib_list.shift
+                if s == '-framework'
+                  wx_libset << "#{s} #{lib_list.shift}"
+                else
+                  wx_libset << s
+                end
+              end
+            end
+            wx_libset.collect { |s| s.dup }
+          end
+
+          def do_link(pkg)
+            objs = pkg.all_obj_files.collect { |o| File.join('..', o) }.join(' ') + ' '
+            sh "cd lib && #{WXRuby3.config.ld} #{WXRuby3.config.ldflags(pkg.lib_target)} #{objs} " +
+                 "#{WXRuby3.config.libs} #{WXRuby3.config.link_output_flag}#{pkg.lib_target}"
+          end
+
+          private
+
+          def wx_configure
+            bash('./configure --disable-sys-libs --without-liblzma --prefix=`pwd`/install --disable-tests --without-subdirs --disable-debug_info')
+          end
+
+          def wx_make
+            bash('make -j$(sysctl -n hw.logicalcpu) && make install')
+          end
+        end
+      end
+
+      def init_platform
+        init_unix_platform
+
+        @dll_pfx = 'lib'
+
+        if @wx_version
+          @cpp.sub!(/-std=gnu\+\+11/, '-std=gnu++14')
+          @ld.sub!(/-o\s*\Z/, '')
+
+          @extra_cflags.concat %w[-Wno-unused-function -Wno-conversion-null -Wno-sometimes-uninitialized
+                                  -Wno-overloaded-virtual -Wno-deprecated-copy]
+          @extra_cflags << ' -Wno-deprecated-declarations' unless @no_deprecated
+
+          # create a .dylib binary
+          @extra_ldflags << '-dynamic -bundle'
+
+          unless @wx_path.empty?
+            libdirs = @wx_libs.select {|s| s.start_with?('-L')}.collect {|s| s.sub(/^-L/,'')}
+            @exec_env['DYLD_LIBRARY_PATH'] = "#{ENV['DYLD_LIBRARY_PATH']}:#{dest_dir}:#{libdirs.join(':')}"
+          end
+        end
+      end
+      private :init_platform
+
+    end
+
+  end
+
+end

data/rakelib/lib/config/mingw.rb

@@ -21,8 +21,8 @@ module WXRuby3
     module Platform
 
       def self.included(base)
-        base.include Config::UnixLike
         base.class_eval do
+          include Config::UnixLike
 
           attr_reader :rescomp
 
@@ -52,6 +52,10 @@ module WXRuby3
 
           private
 
+          def wx_make
+            bash('make && make install')
+          end
+
           def wx_generate_xml
             chdir(File.join(ext_path, 'wxWidgets', 'docs', 'doxygen')) do
               sh({ 'WX_SKIP_DOXYGEN_VERSION_CHECK' => '1' }, 'regen.bat xml')
@@ -107,6 +111,7 @@ module WXRuby3
 
           @ruby_ldflags.each { |flags| flags.sub!(' $(DEFFILE)', '') } # cleanup for older RubyInstaller versions
           @ruby_ldflags.each { |flags| flags.gsub!(/-s(\s|\Z)/, '') } if @debug_build # do not strip debug symbols for debug build
+          @ruby_ldflags << '-s' if @release_build  # strip debug symbols for release build
           @ruby_cppflags << RB_CONFIG['debugflags'] if @debug_build
           @ruby_cppflags.each { |flags| flags.gsub!(/-O\d/, '-O0') } if @debug_build # disable optimizations for debug build
 

data/rakelib/lib/config/unixish.rb

@@ -52,6 +52,10 @@ module WXRuby3
              "#{WXRuby3.config.libs} #{WXRuby3.config.link_output_flag}#{pkg.lib_target}"
       end
 
+      def get_rpath_origin
+        "$ORIGIN"
+      end
+
       private
 
       def wx_checkout
@@ -76,6 +80,14 @@ module WXRuby3
         end
       end
 
+      def wx_configure
+        bash('./configure --prefix=`pwd`/install --disable-tests --without-subdirs --disable-debug_info')
+      end
+
+      def wx_make
+        bash('make -j$(nproc) && make install')
+      end
+
       def wx_build
         # initialize submodules
         unless sh('git submodule update --init')
@@ -83,12 +95,12 @@ module WXRuby3
           exit(1)
         end
         # configure wxWidgets
-        unless bash('./configure --prefix=`pwd`/install --disable-tests --without-subdirs --disable-debug_info')
+        unless wx_configure
           STDERR.puts "ERROR: Failed to configure wxWidgets."
           exit(1)
         end
         # make and install wxWidgets
-        unless bash('make && make install')
+        unless wx_make
           STDERR.puts "ERROR: Failed to build wxWidgets libraries."
           exit(1)
         end
@@ -117,6 +129,16 @@ module WXRuby3
         get_cfg_string('wxxml')
       end
 
+      def get_wx_libs
+        wx_libset = ::Set.new
+        wx_libset.merge wx_config("--libs all").split(' ')
+        # some weird thing with this; at least sometimes '--libs all' will not output media library even if feature active
+        if features_set?('wxUSE_MEDIACTRL')
+          wx_libset.merge wx_config("--libs media").split(' ')
+        end
+        wx_libset.collect { |s| s.dup }
+      end
+
       def init_unix_platform
         # Allow specification of custom wxWidgets build (mostly useful for
         # static wxRuby3 builds)
@@ -155,13 +177,7 @@ module WXRuby3
 
           @cpp         = wx_config("--cxx")
           @ld          = wx_config("--ld")
-          wx_libset = ::Set.new
-          wx_libset.merge wx_config("--libs all").split(' ')
-          # some weird thing with this; at least sometimes '--libs all' will not output media library even if feature active
-          if features_set?('wxUSE_MEDIACTRL')
-            wx_libset.merge wx_config("--libs media").split(' ')
-          end
-          @wx_libs = wx_libset.collect { |s| s.dup }
+          @wx_libs     = get_wx_libs
 
           # remove all warning flags provided by Ruby config
           @ruby_cppflags = @ruby_cppflags.collect { |flags| flags.split(' ') }.flatten.
@@ -169,8 +185,7 @@ module WXRuby3
           @ruby_cppflags.concat %w[-Wall -Wextra -Wno-unused-parameter]   # only keep these
           # add include flags
           @ruby_cppflags.concat ['-I.', *@ruby_includes.collect { |inc| "-I#{inc}" }]
-          @ruby_ldflags << '-s' if @release_build                         # strip debug symbols for release build
-          @ruby_ldflags << "-Wl,-rpath,\\$ORIGIN/../lib"                  # add default rpath
+          @ruby_ldflags << "-Wl,-rpath,'#{get_rpath_origin}/../lib'"      # add default rpath
           @ruby_libs <<  "-L#{RB_CONFIG['libdir']}"                       # add ruby lib dir
           # add ruby defined shared ruby lib(s); not any other flags
           @ruby_libs.concat RB_CONFIG['LIBRUBYARG_SHARED'].split(' ').select { |s| s.start_with?('-l')}

data/rakelib/lib/config.rb

@@ -245,11 +245,19 @@ module WXRuby3
     def do_link(_pkg)
     end
 
+    def get_rpath_origin
+      ''
+    end
+
     def check_rpath_patch
       true
     end
 
-    def patch_rpath(_shlib, _rpath)
+    def patch_rpath(_shlib, *)
+      true
+    end
+
+    def update_shlib_loadpaths(_shlib, _deplibs)
       true
     end
 
@@ -389,11 +397,12 @@ module WXRuby3
             @rb_docgen_path = File.join(Config.wxruby_root, @rb_docgen_dir)
 
             # Extra swig helper files to be built
-            @helper_modules = if macosx?
-                                %w|RubyStockObjects Mac|
-                              else
-                                %w|RubyStockObjects|
-                              end
+            @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|