Merge pull request #292 from mcorino/develop

fix release issues and improve tests

.github/workflows/linux.yml

@@ -261,6 +261,10 @@ jobs:
           bundle exec rake binpkg
         fi
 
+    - name: Clean wxRuby3 build artifacts
+      if: matrix.wxr_type != 'develop'
+      run: bundle exec rake clean
+
     - name: Install wxRuby3 gem
       if: matrix.wxr_type != 'develop'
       run: |

.github/workflows/mac.yml

@@ -303,6 +303,10 @@ jobs:
       if: matrix.wxw_type == 'develop' && matrix.wxr_type == 'binpkg'
       run: rm -rf $WXWIDGETS_ROOT
 
+    - name: Clean wxRuby3 build artifacts
+      if: matrix.wxr_type != 'develop'
+      run: bundle exec rake clean
+
     - name: Install wxRuby3 gem
       if: matrix.wxr_type != 'develop'
       run: |

.github/workflows/msw.yml

@@ -190,6 +190,10 @@ jobs:
             bundle exec rake binpkg
           }
 
+      - name: Clean wxRuby3 build artifacts
+        if: matrix.wxr_type != 'develop'
+        run: bundle exec rake clean
+
       - name: Install wxRuby3 gem
         if: matrix.wxr_type != 'develop'
         run: |

lib/wx/version.rb

@@ -3,5 +3,5 @@
 # This software is released under the MIT license.
 
 module Wx
-  WXRUBY_VERSION    = '1.1.0'
+  WXRUBY_VERSION    = '1.1.1'
 end

rakelib/lib/config/macosx.rb

@@ -46,6 +46,19 @@ def patch_rpath(shlib, *rpath)
           end
           protected :patch_rpath
 
+          # add deployment lookup paths for wxruby shared libraries
+          # and make loadpath for initializer dylibs relative
+          def update_shlib_loadpaths(shlib)
+            # in case of a .bundle library
+            if /\.bundle\Z/ =~ shlib
+              # change the full path of the complementary initializer .dylib to a path relative to any rpath-s
+              dylib = "lib#{File.basename(shlib, '.bundle')}.dylib"
+              dylib_path = File.expand_path(File.join(Config.instance.dest_dir, dylib))
+              sh("install_name_tool -change #{dylib_path} '@rpath/#{dylib}' #{shlib}")
+            end
+            super
+          end
+
           # add Ruby library path for wxruby shared libraries
           def update_shlib_ruby_libpath(shlib)
             # fix lookup for the Ruby shared library
@@ -136,7 +149,8 @@ def do_shlib_link(pkg)
 
           def do_link(pkg)
             sh "cd lib && " +
-                 "#{WXRuby3.config.ld} #{WXRuby3.config.ldflags(pkg.lib_target)} #{File.join('..', pkg.init_obj_file)} #{pkg.shlib_target} " +
+                 "#{WXRuby3.config.ld} #{WXRuby3.config.ldflags(pkg.lib_target)} #{File.join('..', pkg.init_obj_file)} " +
+                    "-L. -l#{pkg.libname} " +
                     "#{WXRuby3.config.libs} #{WXRuby3.config.link_output_flag}#{pkg.lib_target}",
                fail_on_error: true
           end