rb_sys 0.9.43 → 0.9.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abede1c651510cc3d4995a424e634a9ce4afcccf1a83f85151c737ad7b578463
-  data.tar.gz: 17d3ea227ca871ae8fb1fc19a6964d57101747a8de0564b95caeda4b042ee8df
+  metadata.gz: 7fef5d02b379438417ecd1658633286c3451903001535fdefcd3ec23b0de9535
+  data.tar.gz: 74f2983457a17bac43455422d73cb7bb420b6cc907df16deb13d296dc8cd5b0f
 SHA512:
-  metadata.gz: fbbc55012efc13e0eb0ba2c3c578a96e1cca965cc8a8691e8c3e48b008c5603df73d80fbe493b6653582a0461fb7d9b3fbeb4fa8bcbe711c33468714631883de
-  data.tar.gz: e12945fed0147192dfdc4c8cbbaa01a34a734c358c3766970e285b563bf4b866216bb489a3075e89ab4f3860d5dce078db0ab291df126006de7718c156a7a280
+  metadata.gz: 3d9b8cb2f0fc06412e3517acf78058865f98b25727ec9f438c8dc4137e288173b601ed3cb30e7e2ed632e18e80f2f927efda3e61fb502361b8e937c3aee8819f
+  data.tar.gz: 1178a046893283fdcd29cd8613f0b87e3c5512572f3b0ff5c487a0135f4c19720f502305a86456c18d50dedfb42090a1a37cf68db009f3f4b8cb012d9af423d2

data/lib/rb_sys/cargo_builder.rb

@@ -10,7 +10,7 @@ module RbSys
 
       @spec = spec
       @runner = self.class.method(:run)
-      @profile = ENV.fetch("RB_SYS_CARGO_BUILD_PROFILE", :release).to_sym
+      @profile = ENV.fetch("RB_SYS_CARGO_PROFILE", :release).to_sym
       @env = {}
       @features = []
       @target = ENV["CARGO_BUILD_TARGET"] || ENV["RUST_TARGET"]
@@ -250,12 +250,12 @@ module RbSys
     end
 
     def write_deffile(dest_path)
-      dest_dir = File.dirname(final_extension_path(dest_path))
-      FileUtils.mkdir_p(dest_dir)
-      deffile_path = File.join(dest_dir, "#{spec.name}-#{RbConfig::CONFIG["arch"]}.def")
-      export_prefix = makefile_config("EXPORT_PREFIX") || ""
+      deffile_path = File.join(dest_path, "#{spec.name}-#{RbConfig::CONFIG["arch"]}.def")
 
       unless dry_run
+        FileUtils.mkdir_p(dest_dir)
+        export_prefix = makefile_config("EXPORT_PREFIX") || ""
+
         File.open(deffile_path, "w") do |f|
           f.puts "EXPORTS"
           f.puts "#{export_prefix.strip}Init_#{spec.name}"

data/lib/rb_sys/mkmf/config.rb

@@ -4,13 +4,14 @@ module RbSys
   module Mkmf
     # Config that delegates to CargoBuilder if needded
     class Config
-      attr_accessor :force_install_rust_toolchain, :clean_after_install, :target_dir, :auto_install_rust_toolchain
+      attr_accessor :force_install_rust_toolchain, :clean_after_install, :target_dir, :auto_install_rust_toolchain, :rubygems_clean_dirs
 
       def initialize(builder)
         @builder = builder
         @force_install_rust_toolchain = false
         @auto_install_rust_toolchain = true
         @clean_after_install = rubygems_invoked?
+        @rubygems_clean_dirs = ["./cargo-vendor"]
       end
 
       def cross_compiling?

data/lib/rb_sys/mkmf.rb

@@ -101,8 +101,9 @@ module RbSys
         RUSTLIB = $(RUSTLIBDIR)/$(SOEXT_PREFIX)$(TARGET_NAME).$(SOEXT)
 
         CLEANOBJS = $(RUSTLIBDIR) $(RB_SYS_BUILD_DIR)
-        DEFFILE = $(RUSTLIBDIR)/$(TARGET)-$(arch).def
+        DEFFILE = $(RB_SYS_CARGO_TARGET_DIR)/$(TARGET)-$(arch).def
         CLEANLIBS = $(DLLIB) $(RUSTLIB) $(DEFFILE)
+        RUBYGEMS_CLEAN_DIRS = $(CLEANOBJS) $(CLEANFILES) #{builder.rubygems_clean_dirs.join(" ")}
 
         #{base_makefile(srcdir)}
 
@@ -117,10 +118,6 @@ module RbSys
 
         FORCE: ;
 
-        $(RUSTLIBDIR):
-        \t$(ECHO) creating target directory \\($(@)\\)
-        \t$(Q) $(MAKEDIRS) $(RUSTLIBDIR)
-
         #{deffile_definition}
 
         #{optional_rust_toolchain(builder)}
@@ -138,7 +135,8 @@ module RbSys
         \t$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
 
         gemclean:
-        \t-$(Q)$(RM_RF) $(CLEANOBJS) $(CLEANFILES) 2> /dev/null || true
+        \t$(ECHO) Cleaning gem artifacts
+        \t-$(Q)$(RM_RF) $(RUBYGEMS_CLEAN_DIRS) 2> /dev/null || true
 
         install: #{builder.clean_after_install ? "install-so gemclean" : "install-so"}
 
@@ -199,9 +197,12 @@ module RbSys
       return unless defined?(EXPORT_PREFIX) && EXPORT_PREFIX
 
       @deffile_definition ||= <<~MAKE
-        $(DEFFILE): $(RUSTLIBDIR)
+        $(DEFFILE):
+        \t$(ECHO) creating target directory \\($(RUSTLIBDIR)\\)
+        \t$(Q) $(MAKEDIRS) $(RUSTLIBDIR)
         \t$(ECHO) generating $(@)
-        \t$(Q) ($(COPY) $(srcdir)/$(TARGET).def $@ 2> /dev/null) || (echo EXPORTS && echo $(TARGET_ENTRY)) > $@
+        \t$(ECHO) EXPORTS > $@
+        \t$(ECHO) $(TARGET_ENTRY) >> $@
       MAKE
     end
 

data/lib/rb_sys/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RbSys
-  VERSION = "0.9.43"
+  VERSION = "0.9.45"
 end

data.tar.gz.sig

@@ -1,2 +1 @@
-��)�V�x��J+Q�|�[�K
Sz���vS��6�HW�^��tu��9�ՋP
-@}�|����]�y��"��7���`r�x$Uq���J�lLûDv8�z��u��
+)�eR��MfW+�*3 �?��/�B���\J3�:8�4�
�%ǧֵȟ����?���7=���+�IZY��P��\��/��Y����Z!.�×p�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.43
+  version: 0.9.45
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -30,7 +30,7 @@ cert_chain:
   Rl+ASkq2/1i07TkBpCf+2hq66+h/hx+/Y/KrUzXfe0jtvil0WESkJT2kqRqHWNhD
   9GKBxaQlXokNDtWCm1/gl6cD8WRZ0N5S4ZGJT1FLLsA=
   -----END CERTIFICATE-----
-date: 2022-11-16 00:00:00.000000000 Z
+date: 2022-12-04 00:00:00.000000000 Z
 dependencies: []
 description:
 email: