gem-ext-zig_builder 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfa1cdba6ede4366c9bbc5fd0973a1ff102e5284b25aafc5d18c6af6ab7d967e
-  data.tar.gz: 3fb02e99621c79b78df6a7fe8d61e08b316bbdefb97f10941116d4a198946995
+  metadata.gz: 55b4bf2fe202be13789c3afbc3fc71d515d49f56b08b92720cd882ebed52d13d
+  data.tar.gz: 7fee2a3b6f222b25ce72b95275cdb8be2b2c61ca0948a44ae12f4d5098649e77
 SHA512:
-  metadata.gz: 4e55584a1a5e0997645c978d21b308d0a3c0f69158eddfd7c84300d6f457a1f11e0c7d231eb41449f09d2f603fb745ca9cd1d38bd3e99e8fa43c5c6a820705db
-  data.tar.gz: 2e8f94cf078dd2b0a571feaa8a4f983eb485e09c730469820ffbc40066dda7bf9e2dd04c2e9e0b538891376ea9d304b13e271a70de058530d351ab04bf41daed
+  metadata.gz: 38802825ac0b746613ef0fba7447db7cda21879eaef100307689a083e3f05640ccea6adce95f2805b0d5ce2af2150fc1a21a06b1b769a0f2875c060a62cba970
+  data.tar.gz: 570fd46fc68606563c097b858e763ea92564d3189e6bba9f43971ea591403bd4561033fbe073afafd5318d16b2c5d095abf672a0e45119b0d30f7f949e6aaf54

data/lib/gem/ext/zig_builder/version.rb

@@ -2,7 +2,7 @@ module Gem
   module Ext
     class Builder; end
     class ZigBuilder < Builder
-      VERSION = '0.1.1'
+      VERSION = '0.2.1'
     end
   end
 end

data/lib/gem/ext/zig_builder.rb

@@ -4,6 +4,7 @@ require 'rubygems/ext/builder'
 require 'rubygems/command'
 require 'shellwords'
 require 'rbconfig'
+require 'tmpdir'
 
 class Gem::Ext::ZigBuilder < Gem::Ext::Builder
   module PatchBuilderLookup
@@ -13,23 +14,41 @@ class Gem::Ext::ZigBuilder < Gem::Ext::Builder
   end
 
   def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_dir=nil)
+    tmp_dir         = Dir.mktmpdir
+    dlext           = RbConfig::CONFIG['DLEXT']
+    target_vendor   = RbConfig::CONFIG['target_vendor']
+    pkg_config_path = "#{RbConfig::CONFIG['libdir']}/pkgconfig"
+    ruby_pc         = "#{File.basename(RbConfig::CONFIG['ruby_pc'], '.pc')}"
+
+    cmd = [].tap {|c|
+      c << 'zig' << 'build' << '-Doptimize=ReleaseSafe'
+      c << '--prefix-lib-dir' << tmp_dir
+      c << 'test' << 'install'
+    }
+
     # older versions of ruby do not support the 5th `env` argument to run,
     # so pollute the global ENV as a cheap workaround
-    ENV['PKG_CONFIG_PATH'] = "#{RbConfig::CONFIG['libdir']}/pkgconfig"
-    ENV['RUBY_PC'        ] = "#{File.basename(RbConfig::CONFIG['ruby_pc'], '.pc')}"
-
-    run(
-      [].tap {|c|
-        c << 'zig' << 'build' << '-Doptimize=ReleaseSafe'
-        c << '--prefix-lib-dir' << dest_path
-        c << 'test' << 'install'
-      },
-      results,
-      'zig',
-      extension_dir
-    )
+    ENV['PKG_CONFIG_PATH'] = pkg_config_path
+    ENV['RUBY_PC'        ] = ruby_pc
+
+    # even older versions of ruby do not support the 4th extension_dir arg
+    Dir.chdir(extension_dir ? extension_dir : '.') do
+      run(cmd, results, 'zig')
+    end
+
+    Dir.chdir tmp_dir do
+      if target_vendor == 'apple' && dlext == 'bundle'
+        Dir.glob('*.dylib').each do |dylib|
+          FileUtils.mv dylib, "#{File.basename(dylib, '.dylib')}.bundle"
+        end
+      end
+
+      FileUtils.mv Dir.glob("*.#{dlext}"), dest_path
+    end
 
     results
+  ensure
+    FileUtils.remove_entry tmp_dir if tmp_dir
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem-ext-zig_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Frank J. Cameron
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-08 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email: